aboutsummaryrefslogtreecommitdiff
path: root/docs/assets
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-05-09 16:41:35 -0700
committerMark Otto <[email protected]>2013-05-09 16:41:35 -0700
commit7b6352d2cf6f04b46918b1cc8bad50ff92fdbe07 (patch)
tree8173df6f06a749c55906f69788090df4edfa09c9 /docs/assets
parent3c72b1e9a0a56ad46fe7f330141ca18f6b348649 (diff)
downloadbootstrap-7b6352d2cf6f04b46918b1cc8bad50ff92fdbe07.tar.xz
bootstrap-7b6352d2cf6f04b46918b1cc8bad50ff92fdbe07.zip
Fix up navbar forms by using inline form as a mixin; fix docs for those
Diffstat (limited to 'docs/assets')
-rw-r--r--docs/assets/css/bootstrap.css14
-rw-r--r--docs/assets/css/docs.css1
2 files changed, 15 insertions, 0 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 236256f64..5e6eab48d 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3598,6 +3598,20 @@ button.close {
margin-bottom: 8px;
}
+.navbar-form input,
+.navbar-form select,
+.navbar-form textarea,
+.navbar-form .radio,
+.navbar-form .checkbox {
+ display: inline-block;
+}
+
+.navbar-form .radio,
+.navbar-form .checkbox {
+ margin-top: 0;
+ margin-bottom: 0;
+}
+
.navbar-nav > li > .dropdown-menu {
margin-top: 0;
border-top-right-radius: 0;
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 16645011f..fcbf723eb 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -252,6 +252,7 @@ body {
.bs-example > select:last-child,
.bs-example > textarea:last-child,
.bs-example > .table:last-child,
+.bs-example > .navbar:last-child
.bs-example > .jumbotron:last-child,
.bs-example > .alert:last-child,
.bs-example > .panel:last-child,