aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-08-13 22:57:40 -0700
committerMark Otto <[email protected]>2012-08-13 22:57:40 -0700
commit97a23ef2e66919094ecfc517d9b5b9278a64441d (patch)
treea7bc3d947332591744e94a6f3164c86f96376920 /less
parent0040a780581d83b77a3a3b04070b94089ba833ad (diff)
downloadbootstrap-97a23ef2e66919094ecfc517d9b5b9278a64441d.tar.xz
bootstrap-97a23ef2e66919094ecfc517d9b5b9278a64441d.zip
fixes #4342: navbar vars not in use, render navbar dividers
Diffstat (limited to 'less')
-rw-r--r--less/navbar.less16
-rw-r--r--less/variables.less4
2 files changed, 15 insertions, 5 deletions
diff --git a/less/navbar.less b/less/navbar.less
index 0e027d2c3..4306047c7 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -76,6 +76,15 @@
}
}
+// Dividers in navbar
+// -------------------------
+.navbar .divider-vertical {
+ height: @navbarHeight;
+ margin: 0 9px;
+ border-left: 1px solid @navbarBackground;
+ border-right: 1px solid @navbarBackgroundHighlight;
+}
+
// Buttons in navbar
// -------------------------
.navbar .btn,
@@ -128,7 +137,6 @@
padding: 4px 14px;
#font > .sans-serif(13px, normal, 1);
.border-radius(15px); // redeclare because of specificity of the type attribute
- .placeholder(@navbarSearchPlaceholderColor);
}
}
@@ -373,6 +381,12 @@
}
}
+ // Dividers in navbar
+ .divider-vertical {
+ border-left-color: @navbarInverseBackground;
+ border-right-color: @navbarInverseBackgroundHighlight;
+ }
+
// Dropdowns
.nav li.dropdown.open > .dropdown-toggle,
.nav li.dropdown.active > .dropdown-toggle,
diff --git a/less/variables.less b/less/variables.less
index d4b44a2de..42b76df45 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -168,10 +168,6 @@
@navbarLinkBackgroundHover: transparent;
@navbarLinkBackgroundActive: darken(@navbarBackground, 5%);
-@navbarSearchBackground: lighten(@navbarBackground, 25%);
-@navbarSearchBackgroundFocus: @white;
-@navbarSearchBorder: darken(@navbarSearchBackground, 30%);
-@navbarSearchPlaceholderColor: #ccc;
@navbarBrandColor: @navbarLinkColor;
// Inverted navbar