From 4b81c0dff371edad2afd5df77c957265235e34b1 Mon Sep 17 00:00:00 2001 From: Bryan Petty Date: Thu, 5 Apr 2012 13:48:17 -0600 Subject: Changed .nav-collapse to clear both instead of left, and added compiled files. --- docs/assets/css/bootstrap-responsive.css | 49 +++++++++++++++++++------------- 1 file changed, 30 insertions(+), 19 deletions(-) (limited to 'docs/assets/css/bootstrap-responsive.css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index df663f69f..1e1488c62 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -619,27 +619,27 @@ margin: 0 0 0 -5px; } .navbar .nav-collapse { - clear: left; + clear: both; } - .navbar .nav { + .navbar .nav-collapse .nav { float: none; margin: 0 0 9px; } - .navbar .nav > li { + .navbar .nav-collapse .nav > li { float: none; } - .navbar .nav > li > a { + .navbar .nav-collapse .nav > li > a { margin-bottom: 2px; } - .navbar .nav > .divider-vertical { + .navbar .nav-collapse .nav > .divider-vertical { display: none; } - .navbar .nav .nav-header { + .navbar .nav-collapse .nav .nav-header { color: #999999; text-shadow: none; } - .navbar .nav > li > a, - .navbar .dropdown-menu a { + .navbar .nav-collapse .nav > li > a, + .navbar .nav-collapse .dropdown-menu a { padding: 6px 15px; font-weight: bold; color: #999999; @@ -647,14 +647,25 @@ -moz-border-radius: 3px; border-radius: 3px; } - .navbar .dropdown-menu li + li a { + .navbar .nav-collapse .btn { + padding: 4px 10px 4px; + font-weight: normal; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + } + .navbar .nav-collapse .dropdown-menu li + li a { margin-bottom: 2px; } - .navbar .nav > li > a:hover, - .navbar .dropdown-menu a:hover { + .navbar .nav-collapse .nav > li > a:hover, + .navbar .nav-collapse .dropdown-menu a:hover { background-color: #222222; } - .navbar .dropdown-menu { + .navbar .nav-collapse.in .btn-group { + margin-top: 5px; + padding: 0; + } + .navbar .nav-collapse .dropdown-menu { position: static; top: auto; left: auto; @@ -672,15 +683,15 @@ -moz-box-shadow: none; box-shadow: none; } - .navbar .dropdown-menu:before, - .navbar .dropdown-menu:after { + .navbar .nav-collapse .dropdown-menu:before, + .navbar .nav-collapse .dropdown-menu:after { display: none; } - .navbar .dropdown-menu .divider { + .navbar .nav-collapse .dropdown-menu .divider { display: none; } - .navbar-form, - .navbar-search { + .nav-collapse .navbar-form, + .nav-collapse .navbar-search { float: none; padding: 9px 15px; margin: 9px 0; @@ -690,7 +701,7 @@ -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); } - .navbar .nav.pull-right { + .navbar .nav-collapse .nav.pull-right { float: none; margin-left: 0; } @@ -698,7 +709,7 @@ padding-left: 10px; padding-right: 10px; } - .btn-navbar { + .navbar .btn-navbar { display: block; } .nav-collapse, -- cgit v1.2.3 From a6f27ebed440919aac6f62e73e6748bfecd00ab9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Apr 2012 23:06:00 -0700 Subject: ditch the .navbar in the selectors since it's the same specificity level, and thus superfluous --- docs/assets/css/bootstrap-responsive.css | 48 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'docs/assets/css/bootstrap-responsive.css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index eb85ca6c0..57e32da35 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -622,28 +622,28 @@ padding-right: 10px; margin: 0 0 0 -5px; } - .navbar .nav-collapse { + .nav-collapse { clear: both; } - .navbar .nav-collapse .nav { + .nav-collapse .nav { float: none; margin: 0 0 9px; } - .navbar .nav-collapse .nav > li { + .nav-collapse .nav > li { float: none; } - .navbar .nav-collapse .nav > li > a { + .nav-collapse .nav > li > a { margin-bottom: 2px; } - .navbar .nav-collapse .nav > .divider-vertical { + .nav-collapse .nav > .divider-vertical { display: none; } - .navbar .nav-collapse .nav .nav-header { + .nav-collapse .nav .nav-header { color: #999999; text-shadow: none; } - .navbar .nav-collapse .nav > li > a, - .navbar .nav-collapse .dropdown-menu a { + .nav-collapse .nav > li > a, + .nav-collapse .dropdown-menu a { padding: 6px 15px; font-weight: bold; color: #999999; @@ -651,25 +651,25 @@ -moz-border-radius: 3px; border-radius: 3px; } - .navbar .nav-collapse .btn { + .nav-collapse .btn { padding: 4px 10px 4px; font-weight: normal; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; } - .navbar .nav-collapse .dropdown-menu li + li a { + .nav-collapse .dropdown-menu li + li a { margin-bottom: 2px; } - .navbar .nav-collapse .nav > li > a:hover, - .navbar .nav-collapse .dropdown-menu a:hover { + .nav-collapse .nav > li > a:hover, + .nav-collapse .dropdown-menu a:hover { background-color: #222222; } - .navbar .nav-collapse.in .btn-group { + .nav-collapse.in .btn-group { margin-top: 5px; padding: 0; } - .navbar .nav-collapse .dropdown-menu { + .nav-collapse .dropdown-menu { position: static; top: auto; left: auto; @@ -687,11 +687,11 @@ -moz-box-shadow: none; box-shadow: none; } - .navbar .nav-collapse .dropdown-menu:before, - .navbar .nav-collapse .dropdown-menu:after { + .nav-collapse .dropdown-menu:before, + .nav-collapse .dropdown-menu:after { display: none; } - .navbar .nav-collapse .dropdown-menu .divider { + .nav-collapse .dropdown-menu .divider { display: none; } .nav-collapse .navbar-form, @@ -709,18 +709,18 @@ float: none; margin-left: 0; } - .navbar-static .navbar-inner { - padding-left: 10px; - padding-right: 10px; - } - .navbar .btn-navbar { - display: block; - } .nav-collapse, .nav-collapse.collapse { overflow: hidden; height: 0; } + .navbar .btn-navbar { + display: block; + } + .navbar-static .navbar-inner { + padding-left: 10px; + padding-right: 10px; + } } @media (min-width: 980px) { .nav-collapse.collapse { -- cgit v1.2.3