aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-07-29 00:30:15 -0700
committerMark Otto <[email protected]>2012-07-29 00:30:15 -0700
commita30045daef809edf5ed592ad842c04377898e444 (patch)
treec49b0ac07bccbb2b040230ed83fb88d757978166 /docs
parentfe6a4b0b5497a78a085e85125f4397a27b7737dc (diff)
downloadbootstrap-a30045daef809edf5ed592ad842c04377898e444.tar.xz
bootstrap-a30045daef809edf5ed592ad842c04377898e444.zip
reverse navbar styles to save code
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/css/bootstrap-responsive.css10
-rw-r--r--docs/assets/css/bootstrap.css378
-rw-r--r--docs/assets/css/docs.css6
-rw-r--r--docs/base-css.html5
-rw-r--r--docs/components.html9
-rw-r--r--docs/customize.html2
-rw-r--r--docs/extend.html2
-rw-r--r--docs/getting-started.html2
-rw-r--r--docs/index.html2
-rw-r--r--docs/javascript.html2
-rw-r--r--docs/scaffolding.html2
-rw-r--r--docs/templates/layout.mustache2
-rw-r--r--docs/templates/pages/base-css.mustache3
-rw-r--r--docs/templates/pages/components.mustache7
-rw-r--r--docs/upgrading.html2
15 files changed, 172 insertions, 262 deletions
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 2590aadf8..d62a5f68d 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -935,14 +935,14 @@
display: none;
}
.nav-collapse .nav .nav-header {
- color: #999999;
+ color: #555555;
text-shadow: none;
}
.nav-collapse .nav > li > a,
.nav-collapse .dropdown-menu a {
padding: 6px 15px;
font-weight: bold;
- color: #999999;
+ color: #555555;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
@@ -959,7 +959,7 @@
}
.nav-collapse .nav > li > a:hover,
.nav-collapse .dropdown-menu a:hover {
- background-color: #111111;
+ background-color: #f2f2f2;
}
.nav-collapse.in .btn-group {
padding: 0;
@@ -995,8 +995,8 @@
float: none;
padding: 10px 15px;
margin: 10px 0;
- border-top: 1px solid #111111;
- border-bottom: 1px solid #111111;
+ border-top: 1px solid #f2f2f2;
+ border-bottom: 1px solid #f2f2f2;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 700d92d78..adfba9b5d 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2614,8 +2614,6 @@ table .span24 {
border-right: 4px solid transparent;
border-left: 4px solid transparent;
content: "";
- opacity: 0.3;
- filter: alpha(opacity=30);
}
.dropdown .caret {
@@ -2623,17 +2621,6 @@ table .span24 {
margin-left: 2px;
}
-.dropdown a:focus .caret,
-.dropdown a:hover .caret,
-.open .caret {
- opacity: 1;
- filter: alpha(opacity=100);
-}
-
-.navbar .nav .open > a {
- color: #ffffff;
-}
-
.dropdown-menu {
position: absolute;
top: 100%;
@@ -2643,7 +2630,7 @@ table .span24 {
float: left;
min-width: 160px;
padding: 5px 0;
- margin: 1px 0 0;
+ margin: 2px 0 0;
list-style: none;
background-color: #ffffff;
border: 1px solid #ccc;
@@ -3029,6 +3016,10 @@ button.close {
box-sizing: border-box;
}
+.btn-block + .btn-block {
+ margin-top: 5px;
+}
+
.btn-primary.active,
.btn-warning.active,
.btn-danger.active,
@@ -3982,26 +3973,28 @@ input[type="submit"].btn.btn-mini {
*z-index: 2;
margin-bottom: 20px;
overflow: visible;
+ color: #555555;
}
.navbar-inner {
min-height: 40px;
padding-right: 20px;
padding-left: 20px;
- background-color: #1b1b1b;
- background-image: -moz-linear-gradient(top, #222222, #111111);
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));
- background-image: -webkit-linear-gradient(top, #222222, #111111);
- background-image: -o-linear-gradient(top, #222222, #111111);
- background-image: linear-gradient(to bottom, #222222, #111111);
+ background-color: #fafafa;
+ background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));
+ background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2);
+ background-image: -o-linear-gradient(top, #ffffff, #f2f2f2);
+ background-image: linear-gradient(to bottom, #ffffff, #f2f2f2);
background-repeat: repeat-x;
+ border: 1px solid #d4d4d4;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
- -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
- -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
- box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
+ -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+ -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+ box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
}
.navbar .container {
@@ -4012,36 +4005,32 @@ input[type="submit"].btn.btn-mini {
height: auto;
}
-.navbar {
- color: #999999;
-}
-
-.navbar .brand:hover {
- text-decoration: none;
-}
-
.navbar .brand {
display: block;
float: left;
- padding: 8px 20px 12px;
+ padding: 10px 20px 10px;
margin-left: -20px;
font-size: 20px;
font-weight: 200;
- line-height: 1;
- color: #999999;
+ color: #555555;
+ text-shadow: 0 1px 0 #ffffff;
}
-.navbar .navbar-text {
+.navbar .brand:hover {
+ text-decoration: none;
+}
+
+.navbar-text {
margin-bottom: 0;
line-height: 40px;
}
-.navbar .navbar-link {
- color: #999999;
+.navbar-link {
+ color: #555555;
}
-.navbar .navbar-link:hover {
- color: #ffffff;
+.navbar-link:hover {
+ color: #333333;
}
.navbar .btn,
@@ -4114,19 +4103,9 @@ input[type="submit"].btn.btn-mini {
font-size: 13px;
font-weight: normal;
line-height: 1;
- color: #ffffff;
- background-color: #515151;
- border: 1px solid #040404;
-webkit-border-radius: 15px;
-moz-border-radius: 15px;
border-radius: 15px;
- -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
- -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
- box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
- -webkit-transition: none;
- -moz-transition: none;
- -o-transition: none;
- transition: none;
}
.navbar-search .search-query:-moz-placeholder {
@@ -4141,19 +4120,6 @@ input[type="submit"].btn.btn-mini {
color: #cccccc;
}
-.navbar-search .search-query:focus,
-.navbar-search .search-query.focused {
- padding: 5px 15px;
- color: #333333;
- text-shadow: 0 1px 0 #ffffff;
- background-color: #ffffff;
- border: 0;
- outline: 0;
- -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
- -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
- box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-}
-
.navbar-fixed-top,
.navbar-fixed-bottom {
position: fixed;
@@ -4179,6 +4145,10 @@ input[type="submit"].btn.btn-mini {
.navbar-fixed-top {
top: 0;
+}
+
+.navbar-fixed-top .navbar-inner {
+ border-width: 0 0 1px;
-webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
-moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
@@ -4186,6 +4156,10 @@ input[type="submit"].btn.btn-mini {
.navbar-fixed-bottom {
bottom: 0;
+}
+
+.navbar-fixed-bottom .navbar-inner {
+ border-width: 1px 0 0;
-webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
-moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
@@ -4209,32 +4183,19 @@ input[type="submit"].btn.btn-mini {
.navbar .nav > li > a {
float: none;
- padding: 10px 15px 11px;
- line-height: 19px;
- color: #999999;
+ padding: 10px 15px 10px;
+ color: #555555;
text-decoration: none;
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ text-shadow: 0 1px 0 #ffffff;
}
.navbar .nav .dropdown-toggle .caret {
margin-top: 8px;
}
-.navbar .btn {
- display: inline-block;
- padding: 4px 10px 4px;
- margin: 5px 5px 6px;
- line-height: 20px;
-}
-
-.navbar .btn-group {
- padding: 5px 5px 6px;
- margin: 0;
-}
-
.navbar .nav > li > a:focus,
.navbar .nav > li > a:hover {
- color: #ffffff;
+ color: #333333;
text-decoration: none;
background-color: transparent;
}
@@ -4242,23 +4203,12 @@ input[type="submit"].btn.btn-mini {
.navbar .nav .active > a,
.navbar .nav .active > a:hover,
.navbar .nav .active > a:focus {
- color: #ffffff;
+ color: #555555;
text-decoration: none;
- background-color: #111111;
-}
-
-.navbar .divider-vertical {
- width: 1px;
- height: 40px;
- margin: 0 9px;
- overflow: hidden;
- background-color: #111111;
- border-right: 1px solid #222222;
-}
-
-.navbar .nav.pull-right {
- margin-right: 0;
- margin-left: 10px;
+ background-color: #e5e5e5;
+ -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
+ -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
+ box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
}
.navbar .btn-navbar {
@@ -4269,17 +4219,17 @@ input[type="submit"].btn.btn-mini {
margin-left: 5px;
color: #ffffff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
- background-color: #0e0e0e;
- *background-color: #040404;
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404));
- background-image: -webkit-linear-gradient(top, #151515, #040404);
- background-image: -o-linear-gradient(top, #151515, #040404);
- background-image: linear-gradient(to bottom, #151515, #040404);
- background-image: -moz-linear-gradient(top, #151515, #040404);
+ background-color: #ededed;
+ *background-color: #e5e5e5;
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5));
+ background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5);
+ background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5);
+ background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5);
+ background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5);
background-repeat: repeat-x;
- border-color: #040404 #040404 #000000;
+ border-color: #e5e5e5 #e5e5e5 #bfbfbf;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0);
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
@@ -4292,13 +4242,13 @@ input[type="submit"].btn.btn-mini {
.navbar .btn-navbar.disabled,
.navbar .btn-navbar[disabled] {
color: #ffffff;
- background-color: #040404;
- *background-color: #000000;
+ background-color: #e5e5e5;
+ *background-color: #d9d9d9;
}
.navbar .btn-navbar:active,
.navbar .btn-navbar.active {
- background-color: #000000 \9;
+ background-color: #cccccc \9;
}
.navbar .btn-navbar .icon-bar {
@@ -4356,26 +4306,23 @@ input[type="submit"].btn.btn-mini {
border-bottom: 0;
}
-.navbar .nav li.dropdown .dropdown-toggle .caret,
-.navbar .nav li.dropdown.open .caret {
- border-top-color: #ffffff;
- border-bottom-color: #ffffff;
-}
-
-.navbar .nav li.dropdown.active .caret {
- opacity: 1;
- filter: alpha(opacity=100);
-}
-
.navbar .nav li.dropdown.open > .dropdown-toggle,
.navbar .nav li.dropdown.active > .dropdown-toggle,
.navbar .nav li.dropdown.open.active > .dropdown-toggle {
- background-color: transparent;
+ color: #555555;
+ background-color: #e5e5e5;
}
-.navbar .nav li.dropdown.active > .dropdown-toggle:focus,
-.navbar .nav li.dropdown.active > .dropdown-toggle:hover {
- color: #ffffff;
+.navbar .nav li.dropdown > .dropdown-toggle .caret {
+ border-top-color: #555555;
+ border-bottom-color: #555555;
+}
+
+.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret {
+ border-top-color: #555555;
+ border-bottom-color: #555555;
}
.navbar .pull-right .dropdown-menu,
@@ -4396,150 +4343,109 @@ input[type="submit"].btn.btn-mini {
left: auto;
}
-/* Subnav navbar
--------------------------------------------------- */
-
-.navbar-subnav .navbar-inner {
- padding-right: 10px;
- padding-left: 10px;
- background-color: #f9f9f9;
- background-image: -webkit-linear-gradient(top, #ffffff, #f1f1f1);
- background-image: linear-gradient(to bottom, #ffffff, #f1f1f1);
- background-image: -moz-linear-gradient(top, #ffffff, #f1f1f1);
- background-image: -o-linear-gradient(top, #ffffff, #f1f1f1);
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f1f1f1));
- background-repeat: repeat-x;
- border: 1px solid #e5e5e5;
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff1f1f1', GradientType=0);
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
- box-shadow: none;
-}
-
-.navbar-subnav .divider-vertical {
- background-color: #f1f1f1;
- border-right-color: #ffffff;
+.navbar-inverse {
+ color: #999999;
}
-.navbar-subnav .nav > li > a {
- color: #0088cc;
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+.navbar-inverse .navbar-inner {
+ background-color: #1b1b1b;
+ background-image: -moz-linear-gradient(top, #222222, #111111);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));
+ background-image: -webkit-linear-gradient(top, #222222, #111111);
+ background-image: -o-linear-gradient(top, #222222, #111111);
+ background-image: linear-gradient(to bottom, #222222, #111111);
+ background-repeat: repeat-x;
+ border-color: #252525;
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
}
-.navbar-subnav .nav > li > a:hover {
- color: #005580;
+.navbar-inverse .brand,
+.navbar-inverse .nav > li > a {
+ color: #999999;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
}
-.navbar-subnav .nav > .active > a,
-.navbar-subnav .nav > .active > a:hover {
- color: #777;
- background-color: #eee;
- -webkit-box-shadow: -1px 0 0 rgba(255, 255, 255, 0.5), 1px 0 0 rgba(255, 255, 255, 0.5);
- -moz-box-shadow: -1px 0 0 rgba(255, 255, 255, 0.5), 1px 0 0 rgba(255, 255, 255, 0.5);
- box-shadow: -1px 0 0 rgba(255, 255, 255, 0.5), 1px 0 0 rgba(255, 255, 255, 0.5);
+.navbar-inverse .brand:hover,
+.navbar-inverse .nav > li > a:hover {
+ color: #ffffff;
}
-.navbar-subnav .nav li.dropdown .dropdown-toggle .caret,
-.navbar-subnav .nav li.dropdown.open .caret {
- border-top-color: #0088cc;
- border-bottom-color: #0088cc;
+.navbar-inverse .nav > li > a:focus,
+.navbar-inverse .nav > li > a:hover {
+ color: #ffffff;
+ background-color: transparent;
}
-.navbar-subnav .search-query {
- background-color: #fff;
- border-color: #ccc;
- -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.25);
- -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.25);
- box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.25);
+.navbar-inverse .nav .active > a,
+.navbar-inverse .nav .active > a:hover,
+.navbar-inverse .nav .active > a:focus {
+ color: #ffffff;
+ background-color: #111111;
}
-.navbar-subnav .search-query:focus,
-.navbar-subnav .search-query.focused {
- padding: 4px 9px;
- border: 1px solid rgba(82, 168, 236, 0.8);
- -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
- -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
- box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+.navbar-inverse .navbar-link {
+ color: #999999;
}
-.navbar-subnav .nav .open > a {
- color: #005580;
+.navbar-inverse .navbar-link:hover {
+ color: #ffffff;
}
-.navbar-subnav .btn-navbar {
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
color: #ffffff;
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
- background-color: #ededed;
- *background-color: #e4e4e4;
- background-image: -moz-linear-gradient(top, #f2f2f2, #e4e4e4);
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e4e4e4));
- background-image: -webkit-linear-gradient(top, #f2f2f2, #e4e4e4);
- background-image: -o-linear-gradient(top, #f2f2f2, #e4e4e4);
- background-image: linear-gradient(to bottom, #f2f2f2, #e4e4e4);
- background-repeat: repeat-x;
- border-color: #e4e4e4 #e4e4e4 #bebebe;
- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe4e4e4', GradientType=0);
- filter: progid:dximagetransform.microsoft.gradient(enabled=false);
- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 rgba(255, 255, 255, 0.25);
- -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 rgba(255, 255, 255, 0.25);
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 rgba(255, 255, 255, 0.25);
+ background-color: #111111;
}
-.navbar-subnav .btn-navbar:hover,
-.navbar-subnav .btn-navbar:active,
-.navbar-subnav .btn-navbar.active,
-.navbar-subnav .btn-navbar.disabled,
-.navbar-subnav .btn-navbar[disabled] {
- color: #ffffff;
- background-color: #e4e4e4;
- *background-color: #d7d7d7;
+.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
+ border-top-color: #999999;
+ border-bottom-color: #999999;
}
-.navbar-subnav .btn-navbar:active,
-.navbar-subnav .btn-navbar.active {
- background-color: #cbcbcb \9;
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret {
+ border-top-color: #ffffff;
+ border-bottom-color: #ffffff;
}
-.navbar .btn-navbar .icon-bar {
- background-color: #999;
- -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
- -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
- box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+.navbar-inverse .navbar-search .search-query {
+ color: #ffffff;
+ background-color: #515151;
+ border-color: #111111;
+ -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+ -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+ box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+ -webkit-transition: none;
+ -moz-transition: none;
+ -o-transition: none;
+ transition: none;
}
-.navbar-subnav-fixed {
- position: fixed;
- top: 40px;
- right: 0;
- left: 0;
- z-index: 1020;
- -webkit-box-shadow: inset 0 1px 0 #ffffff, 0 1px 10px rgba(0, 0, 0, 0.1);
- -moz-box-shadow: inset 0 1px 0 #ffffff, 0 1px 10px rgba(0, 0, 0, 0.1);
- box-shadow: inset 0 1px 0 #ffffff, 0 1px 10px rgba(0, 0, 0, 0.1);
+.navbar-inverse .navbar-search .search-query:-moz-placeholder {
+ color: #cccccc;
}
-.navbar-subnav-fixed .navbar-inner {
- 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);
+.navbar-inverse .navbar-search .search-query:-ms-input-placeholder {
+ color: #cccccc;
}
-.navbar-subnav-fixed .nav {
- float: none;
- max-width: 970px;
- padding: 0 1px;
- margin: 0 auto;
+.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder {
+ color: #cccccc;
}
-.navbar-subnav .nav > li:first-child > a,
-.navbar-subnav .nav > li:first-child > a:hover {
- -webkit-border-radius: 0;
- -moz-border-radius: 0;
- border-radius: 0;
+.navbar-inverse .navbar-search .search-query:focus,
+.navbar-inverse .navbar-search .search-query.focused {
+ padding: 5px 15px;
+ color: #333333;
+ text-shadow: 0 1px 0 #ffffff;
+ background-color: #ffffff;
+ border: 0;
+ outline: 0;
+ -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+ -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+ box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
}
.breadcrumb {
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index f7b79e2dd..6110e9302 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -13,7 +13,6 @@
body {
position: relative;
padding-top: 40px;
- font-size: 14px;
}
/* Code in headings */
@@ -29,10 +28,10 @@ h3 code {
body > .navbar-fixed-top {
font-size: 13px;
- -webkit-box-shadow: 0 5px 15px rgba(0,0,0,.15);
+/* -webkit-box-shadow: 0 5px 15px rgba(0,0,0,.15);
-moz-box-shadow: 0 5px 15px rgba(0,0,0,.15);
box-shadow: 0 5px 15px rgba(0,0,0,.15);
-}
+*/}
/* Change the docs' brand */
body > .navbar-fixed-top .brand {
@@ -598,6 +597,7 @@ h2 + .row {
z-index: 1;
padding: 0;
height: 90px;
+ overflow: hidden; /* cut the drop shadows off */
}
.bs-navbar-top-example .navbar-fixed-top,
.bs-navbar-bottom-example .navbar-fixed-bottom {
diff --git a/docs/base-css.html b/docs/base-css.html
index f827380ac..80bc8c9b0 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -31,7 +31,7 @@
<!-- Navbar
================================================== -->
- <div class="navbar navbar-fixed-top">
+ <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
@@ -1462,7 +1462,8 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
</pre>
<p>Create block level buttons&mdash;those that span the full width of a parent&mdash; by adding <code>.btn-block</code>.</p>
<div class="bs-docs-example">
- <div class="well" style="max-width: 400px; margin: 0 auto;">
+ <div class="well" style="max-width: 400px; margin: 0 auto 10px;">
+ <button type="button" class="btn btn-large btn-primary btn-block">Block level button</button>
<button type="button" class="btn btn-large btn-block">Block level button</button>
</div>
</div>
diff --git a/docs/components.html b/docs/components.html
index 719a9e874..8399b4297 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -31,7 +31,7 @@
<!-- Navbar
================================================== -->
- <div class="navbar navbar-fixed-top">
+ <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
@@ -1246,10 +1246,10 @@
<hr class="bs-docs-separator">
- <h2>Subnav variation</h2>
- <p>Modify the look of the navbar by adding <code>.navbar-subnav</code>. Perfect for a secondary nav, or just a replacement to the default dark navbar.</p>
+ <h2>Inverted variation</h2>
+ <p>Modify the look of the navbar by adding <code>.navbar-inverse</code>.</p>
<div class="bs-docs-example">
- <div class="navbar navbar-subnav" style="position: static;">
+ <div class="navbar navbar-inverse" style="position: static;">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".subnav-collapse">
@@ -1257,6 +1257,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
+ <a class="brand" href="#">Title</a>
<div class="nav-collapse subnav-collapse">
<ul class="nav">
<li class="active"><a href="#">Home</a></li>
diff --git a/docs/customize.html b/docs/customize.html
index 44e216f08..1abe9005b 100644
--- a/docs/customize.html
+++ b/docs/customize.html
@@ -31,7 +31,7 @@
<!-- Navbar
================================================== -->
- <div class="navbar navbar-fixed-top">
+ <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
diff --git a/docs/extend.html b/docs/extend.html
index 973e08175..1c1a7d9a1 100644
--- a/docs/extend.html
+++ b/docs/extend.html
@@ -31,7 +31,7 @@
<!-- Navbar
================================================== -->
- <div class="navbar navbar-fixed-top">
+ <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
diff --git a/docs/getting-started.html b/docs/getting-started.html
index b28a358f1..3cf303d2e 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -31,7 +31,7 @@
<!-- Navbar
================================================== -->
- <div class="navbar navbar-fixed-top">
+ <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
diff --git a/docs/index.html b/docs/index.html
index fd8218580..106dee0e9 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -31,7 +31,7 @@
<!-- Navbar
================================================== -->
- <div class="navbar navbar-fixed-top">
+ <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
diff --git a/docs/javascript.html b/docs/javascript.html
index 36299d776..846089da8 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -31,7 +31,7 @@
<!-- Navbar
================================================== -->
- <div class="navbar navbar-fixed-top">
+ <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 791208845..3c49eb2e3 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -31,7 +31,7 @@
<!-- Navbar
================================================== -->
- <div class="navbar navbar-fixed-top">
+ <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index 4c69e9fc5..6266446e1 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -43,7 +43,7 @@
<!-- Navbar
================================================== -->
- <div class="navbar navbar-fixed-top">
+ <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 248ffa042..39d8f4fc4 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1399,7 +1399,8 @@
</pre>
<p>{{_i}}Create block level buttons&mdash;those that span the full width of a parent&mdash; by adding <code>.btn-block</code>.{{/i}}</p>
<div class="bs-docs-example">
- <div class="well" style="max-width: 400px; margin: 0 auto;">
+ <div class="well" style="max-width: 400px; margin: 0 auto 10px;">
+ <button type="button" class="btn btn-large btn-primary btn-block">{{_i}}Block level button{{/i}}</button>
<button type="button" class="btn btn-large btn-block">{{_i}}Block level button{{/i}}</button>
</div>
</div>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 7ac31e219..7c9499947 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1175,10 +1175,10 @@
<hr class="bs-docs-separator">
- <h2>{{_i}}Subnav variation{{/i}}</h2>
- <p>{{_i}}Modify the look of the navbar by adding <code>.navbar-subnav</code>. Perfect for a secondary nav, or just a replacement to the default dark navbar.{{/i}}</p>
+ <h2>{{_i}}Inverted variation{{/i}}</h2>
+ <p>{{_i}}Modify the look of the navbar by adding <code>.navbar-inverse</code>.{{/i}}</p>
<div class="bs-docs-example">
- <div class="navbar navbar-subnav" style="position: static;">
+ <div class="navbar navbar-inverse" style="position: static;">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".subnav-collapse">
@@ -1186,6 +1186,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
+ <a class="brand" href="#">{{_i}}Title{{/i}}</a>
<div class="nav-collapse subnav-collapse">
<ul class="nav">
<li class="active"><a href="#">{{_i}}Home{{/i}}</a></li>
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 3ebd66ef5..2e390aaa6 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -31,7 +31,7 @@
<!-- Navbar
================================================== -->
- <div class="navbar navbar-fixed-top">
+ <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">