root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch 'UTGuy-master' into 2.1.1-wip

This commit is contained in:
Mark Otto 2012-08-21 13:07:11 -07:00
parent 8a2b9f4a5f e5060b8d92
commit 94f9f9de73
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
less/variables.less
View File

@ -57,7 +57,6 @@
@headingsFontWeight: bold; // instead of browser default, bold @headingsFontWeight: bold; // instead of browser default, bold
@headingsColor: inherit; // empty to use BS default, @textColor @headingsColor: inherit; // empty to use BS default, @textColor
// Tables // Tables
// ------------------------- // -------------------------
@tableBackground: transparent; // overall background-color @tableBackground: transparent; // overall background-color
@ -65,7 +64,6 @@
@tableBackgroundHover: #f5f5f5; // for hover @tableBackgroundHover: #f5f5f5; // for hover
@tableBorder: #ddd; // table and cell border @tableBorder: #ddd; // table and cell border
// Buttons // Buttons
// ------------------------- // -------------------------
@btnBackground: @white; @btnBackground: @white;
@ -107,12 +105,11 @@
@dropdownDividerBottom: @white; @dropdownDividerBottom: @white;
@dropdownLinkColor: @grayDark; @dropdownLinkColor: @grayDark;
@dropdownLinkColorHover: @white; @dropdownLinkColorHover: @white;
@dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive;
@dropdownLinkColorActive: @dropdownLinkColor; @dropdownLinkColorActive: @dropdownLinkColor;
@dropdownLinkBackgroundActive: @linkColor; @dropdownLinkBackgroundActive: @linkColor;
@dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive;
@ -157,8 +154,8 @@
@navbarCollapseWidth: 979px; @navbarCollapseWidth: 979px;
@navbarHeight: 40px; @navbarHeight: 40px;
@navbarBackground: darken(@navbarBackgroundHighlight, 5%);
@navbarBackgroundHighlight: #ffffff; @navbarBackgroundHighlight: #ffffff;
@navbarBackground: darken(@navbarBackgroundHighlight, 5%);
@navbarBorder: darken(@navbarBackground, 12%); @navbarBorder: darken(@navbarBackground, 12%);
@navbarText: @gray; @navbarText: @gray;