diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 47b4749c91..4aae825c59 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index eb85ca6c0a..57e32da35f 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 { diff --git a/less/responsive-navbar.less b/less/responsive-navbar.less index 4d2bc60c49..d49b8ae12d 100644 --- a/less/responsive-navbar.less +++ b/less/responsive-navbar.less @@ -26,56 +26,59 @@ padding-right: 10px; margin: 0 0 0 -5px; } + + // COLLAPSIBLE NAVBAR + // ------------------ // Nav collapse clears brand - .navbar .nav-collapse { + .nav-collapse { clear: both; } // Block-level the nav - .navbar .nav-collapse .nav { + .nav-collapse .nav { float: none; margin: 0 0 (@baseLineHeight / 2); } - .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: @navbarText; text-shadow: none; } // Nav and dropdown links in navbar - .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: @navbarLinkColor; .border-radius(3px); } // Buttons - .navbar .nav-collapse .btn { + .nav-collapse .btn { padding: 4px 10px 4px; font-weight: normal; .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: @navbarBackground; } // Buttons in the navbar - .navbar .nav-collapse.in .btn-group { + .nav-collapse.in .btn-group { margin-top: 5px; padding: 0; } // Dropdowns in the navbar - .navbar .nav-collapse .dropdown-menu { + .nav-collapse .dropdown-menu { position: static; top: auto; left: auto; @@ -89,11 +92,11 @@ .border-radius(0); .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; } // Forms in navbar @@ -111,20 +114,22 @@ float: none; margin-left: 0; } - // Static navbar - .navbar-static .navbar-inner { - padding-left: 10px; - padding-right: 10px; + // Hide everything in the navbar save .brand and toggle button */ + .nav-collapse, + .nav-collapse.collapse { + overflow: hidden; + height: 0; } // Navbar button .navbar .btn-navbar { display: block; } - // Hide everything in the navbar save .brand and toggle button */ - .nav-collapse, .nav-collapse.collapse { - overflow: hidden; - height: 0; + // STATIC NAVBAR + // ------------- + .navbar-static .navbar-inner { + padding-left: 10px; + padding-right: 10px; } }