diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index ca0cb81d66..ec23b0fe01 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -1004,4 +1004,31 @@ height: auto !important; overflow: visible !important; } + .subnav-fixed { + position: fixed; + top: 40px; + right: 0; + left: 0; + z-index: 1020; + border-color: #d5d5d5; + border-width: 0 0 1px; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + filter: progid:dximagetransform.microsoft.gradient(enabled=false); + -webkit-box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1); + } + .subnav-fixed .nav { + max-width: 780px; + padding: 0 1px; + margin: 0 auto; + } + .subnav .nav > li:first-child > a, + .subnav .nav > li:first-child > a:hover { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + } } diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 8bb7b5d92a..e760daae8d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4172,122 +4172,48 @@ input[type="submit"].btn.btn-mini { left: auto; } -/* Subnav +/* Subnav navbar -------------------------------------------------- */ -/* Base -------------------------- */ - -.subnav { - width: 100%; +.navbar-subnav { height: 36px; - background-color: #f2f2f2; - background-image: -moz-linear-gradient(top, #f5f5f5, #eeeeee); - background-image: -ms-linear-gradient(top, #f5f5f5, #eeeeee); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#eeeeee)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #eeeeee); - background-image: -o-linear-gradient(top, #f5f5f5, #eeeeee); - background-image: linear-gradient(top, #f5f5f5, #eeeeee); +} + +.navbar-subnav .navbar-inner { + min-height: 36px; + padding: 0; + background-color: #f5f5f5; + background-image: -moz-linear-gradient(top, #f9f9f9, #eeeeee); + background-image: -ms-linear-gradient(top, #f9f9f9, #eeeeee); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f9f9f9), to(#eeeeee)); + background-image: -webkit-linear-gradient(top, #f9f9f9, #eeeeee); + background-image: -o-linear-gradient(top, #f9f9f9, #eeeeee); + background-image: linear-gradient(top, #f9f9f9, #eeeeee); background-repeat: repeat-x; border: 1px solid #e5e5e5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffeeeeee', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff9f9f9', endColorstr='#ffeeeeee', GradientType=0); + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } -/* Nav links -------------------------- */ - -.subnav .nav { - margin-bottom: 0; +.navbar-subnav .nav > li > a { + color: #0088cc; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); } -.subnav .nav > li { - float: left; +.navbar-subnav .nav > li > a:hover { + color: #005580; } -.subnav .nav > li > a { - padding: 9px 12px; - line-height: 18px; - border-right: 1px solid #e5e5e5; - border-left: 1px solid #f5f5f5; +.navbar-subnav .nav li.dropdown .dropdown-toggle .caret, +.navbar-subnav .nav li.dropdown.open .caret { + border-top-color: #0088cc; + border-bottom-color: #0088cc; } -.subnav .nav > .active > a, -.subnav .nav > .active > a:hover { - padding-left: 13px; - color: #777; - background-color: #e9e9e9; - border-left: 0; - border-right-color: #ddd; - -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.05); -} - -.subnav .nav > li:first-child > a, -.subnav .nav > li:first-child > a:hover { - padding-left: 12px; - border-left: 0; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.subnav .nav > li:last-child > a { - border-right: 0; -} - -/* Reposition the dropdown carets */ - -.subnav .nav .dropdown-toggle .caret { - margin-top: 7px; -} - -.nav .active .dropdown-toggle .caret { - border-top-color: #777; - border-bottom-color: #777; -} - -/* Dropdown menus get matching border-radius */ - -.subnav .dropdown-menu { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} - -/* Fixed subnav on scroll, but only for 980px and up (sorry IE!) */ - -@media (min-width: 980px) { - .subnav-fixed { - position: fixed; - top: 40px; - right: 0; - left: 0; - z-index: 1020; - border-color: #d5d5d5; - border-width: 0 0 1px; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - filter: progid:dximagetransform.microsoft.gradient(enabled=false); - -webkit-box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1); - } - .subnav-fixed .nav { - max-width: 780px; - padding: 0 1px; - margin: 0 auto; - } - .subnav .nav > li:first-child > a, - .subnav .nav > li:first-child > a:hover { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - } +.navbar-subnav .nav .open > a { + color: #005580; } .breadcrumb { diff --git a/docs/base-css.html b/docs/base-css.html index df2407f8b6..4136399340 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -80,15 +80,17 @@

Base CSS

On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.

-
- +
+
+ +
diff --git a/docs/components.html b/docs/components.html index 413a867b11..74dda4dc80 100644 --- a/docs/components.html +++ b/docs/components.html @@ -80,33 +80,35 @@

Components

Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.

-
- +
+
+ +
diff --git a/docs/download.html b/docs/download.html index db76ef796a..865e84143f 100644 --- a/docs/download.html +++ b/docs/download.html @@ -80,13 +80,15 @@

Customize and download

Download the full repository or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.

-
- +
+
+ +
diff --git a/docs/javascript.html b/docs/javascript.html index 7ad28533a1..8f07b58d81 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -80,21 +80,24 @@

Javascript for Bootstrap

Bring Bootstrap's components to life—now with 12 custom jQuery plugins. -

- +
+
+ +
@@ -1512,6 +1515,28 @@ $('.carousel').carousel({ + + +
+
+

+ Affix + Make an element stick in place +

+
+ +

...

+

...

+
+ +
+
+...
+
+
+ +