diff options
| author | Mark Otto <[email protected]> | 2012-01-08 13:21:44 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-08 13:21:44 -0800 |
| commit | cb9be7bd0cde19b3b401d2dcdfb6162dd00b5ab5 (patch) | |
| tree | efdfe38dfa890565116a6f6566d2ee3e269cbb36 /lib | |
| parent | 1ef9cbc6e4b2a002eea4515f3779318f2ee60666 (diff) | |
| download | bootstrap-cb9be7bd0cde19b3b401d2dcdfb6162dd00b5ab5.tar.xz bootstrap-cb9be7bd0cde19b3b401d2dcdfb6162dd00b5ab5.zip | |
clean up dup css in responsive, fix navbar dropdown caret
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/navs.less | 6 | ||||
| -rw-r--r-- | lib/responsive.less | 16 | ||||
| -rw-r--r-- | lib/scaffolding.less | 10 |
3 files changed, 17 insertions, 15 deletions
diff --git a/lib/navs.less b/lib/navs.less index dee482aea..65d459da9 100644 --- a/lib/navs.less +++ b/lib/navs.less @@ -182,11 +182,13 @@ .pills .dropdown-menu { .border-radius(4px); } -.nav .dropdown-toggle .caret { +.tabs .dropdown-toggle .caret, +.pills .dropdown-toggle .caret { border-top-color: @linkColor; margin-top: 6px; } -.nav .dropdown-toggle:hover .caret { +.tabs .dropdown-toggle:hover .caret, +.pills .dropdown-toggle:hover .caret { border-top-color: @linkColorHover; } .nav .open .dropdown-toggle { diff --git a/lib/responsive.less b/lib/responsive.less index e87b8495f..5131aa625 100644 --- a/lib/responsive.less +++ b/lib/responsive.less @@ -67,7 +67,6 @@ .opacity(100); content: "↓"; } - .nav:hover > li { display: block; } @@ -76,13 +75,6 @@ } } - // Resize modals - .modal { - width: auto; - margin: 0; - &.fade.in { top: auto; } - } - // Remove the horizontal form styles .horizontal-form .control-group > label { float: none; @@ -110,10 +102,12 @@ left: 20px; right: 20px; width: auto; - .close { - padding: 10px; - } + &.fade.in { top: auto; } } + .modal-header .close { + padding: 10px; + } + } diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 7432e849b..a1f41ab66 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -39,8 +39,14 @@ body { .sidebar-right { padding-right: @fluidSidebarWidth + 40; } // Float the sidebars accordingly -.sidebar-left .fluid-sidebar { float: left; margin-left: (@fluidSidebarWidth + 20) * -1; } -.sidebar-right .fluid-sidebar { float: right; margin-right: (@fluidSidebarWidth + 20) * -1; } +.sidebar-left .fluid-sidebar { + float: left; + margin-left: (@fluidSidebarWidth + 20) * -1; +} +.sidebar-right .fluid-sidebar { + float: right; + margin-right: (@fluidSidebarWidth + 20) * -1; +} // The main content area .fluid-content { |