aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-08-21 13:07:11 -0700
committerMark Otto <[email protected]>2012-08-21 13:07:11 -0700
commit94f9f9de73f0369094fd103bbde15ee9a4049c4c (patch)
tree54b835a7c20ca1937e2a8e9383d9b2505908b529
parent8a2b9f4a5f0f0c83c22ed364ca096ad191437117 (diff)
parente5060b8d92cc05c5fc19e8e0bb1b1d1d4e31b8e6 (diff)
downloadbootstrap-94f9f9de73f0369094fd103bbde15ee9a4049c4c.tar.xz
bootstrap-94f9f9de73f0369094fd103bbde15ee9a4049c4c.zip
Merge branch 'UTGuy-master' into 2.1.1-wip
-rw-r--r--less/variables.less9
1 files changed, 3 insertions, 6 deletions
diff --git a/less/variables.less b/less/variables.less
index a5c8cdd98..1b840a5dc 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -57,7 +57,6 @@
@headingsFontWeight: bold; // instead of browser default, bold
@headingsColor: inherit; // empty to use BS default, @textColor
-
// Tables
// -------------------------
@tableBackground: transparent; // overall background-color
@@ -65,7 +64,6 @@
@tableBackgroundHover: #f5f5f5; // for hover
@tableBorder: #ddd; // table and cell border
-
// Buttons
// -------------------------
@btnBackground: @white;
@@ -107,12 +105,11 @@
@dropdownDividerBottom: @white;
@dropdownLinkColor: @grayDark;
-
@dropdownLinkColorHover: @white;
-@dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive;
-
@dropdownLinkColorActive: @dropdownLinkColor;
+
@dropdownLinkBackgroundActive: @linkColor;
+@dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive;
@@ -157,8 +154,8 @@
@navbarCollapseWidth: 979px;
@navbarHeight: 40px;
-@navbarBackground: darken(@navbarBackgroundHighlight, 5%);
@navbarBackgroundHighlight: #ffffff;
+@navbarBackground: darken(@navbarBackgroundHighlight, 5%);
@navbarBorder: darken(@navbarBackground, 12%);
@navbarText: @gray;