aboutsummaryrefslogtreecommitdiff
path: root/assets/css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-12 21:23:28 -0700
committerMark Otto <[email protected]>2013-08-12 21:23:28 -0700
commit8bb7def26cac4d3166fbf2cc98f16c4151794676 (patch)
tree7021e3eb046cd0e1786f31ce9cb1dea3478097f4 /assets/css
parenteac61de138278aa1c0d70dfed7a9515c714b6ad9 (diff)
downloadbootstrap-8bb7def26cac4d3166fbf2cc98f16c4151794676.tar.xz
bootstrap-8bb7def26cac4d3166fbf2cc98f16c4151794676.zip
Navbar refactor
* Now responsive by default (fits better with mobile-first approach) * Requires `.nav-header` to group `.navbar-brand` and `.navbar-toggle` for proper mobile display. * Changed `.nav-collapse` to `.navbar-collapse` * Simplified examples in docs
Diffstat (limited to 'assets/css')
-rw-r--r--assets/css/docs.css19
1 files changed, 15 insertions, 4 deletions
diff --git a/assets/css/docs.css b/assets/css/docs.css
index 196fe1f2c..eda80dfd4 100644
--- a/assets/css/docs.css
+++ b/assets/css/docs.css
@@ -56,6 +56,9 @@ body {
.bs-docs-nav {
background-color: #563d7c;
}
+.bs-docs-nav .navbar-collapse {
+ border-color: #463265;
+}
.bs-docs-nav .navbar-brand {
color: #fff;
}
@@ -385,11 +388,10 @@ body {
}
/* Tweak display of the examples */
-.bs-example + .prettyprint,
.bs-example + .highlight {
- margin-top: 0;
- border-top-left-radius: 0;
- border-top-right-radius: 0;
+ margin: 0 -15px;
+ border-radius: 0;
+ border-width: 0 0 1px;
}
/* Tweak content of examples for optimum awesome */
@@ -796,6 +798,15 @@ input.focused {
border-radius: 4px 4px 0 0;
box-shadow: none;
}
+ .bs-example + .prettyprint,
+ .bs-example + .highlight {
+ margin-top: 0;
+ margin-left: 0;
+ margin-right: 0;
+ border-width: 1px;
+ border-bottom-left-radius: 4px;
+ border-bottom-right-radius: 4px;
+ }
.carbonad {
margin: 0 !important;