vendor/frameworks/twitter/bootstrap/variables.less in less-rails-bootstrap-2.0.6 vs vendor/frameworks/twitter/bootstrap/variables.less in less-rails-bootstrap-2.0.7
- old
+ new
@@ -5,78 +5,168 @@
// GLOBAL VALUES
// --------------------------------------------------
-// Links
-@linkColor: #08c;
-@linkColorHover: darken(@linkColor, 15%);
// Grays
+// -------------------------
@black: #000;
@grayDarker: #222;
@grayDark: #333;
@gray: #555;
@grayLight: #999;
@grayLighter: #eee;
@white: #fff;
+
// Accent colors
+// -------------------------
@blue: #049cdb;
@blueDark: #0064cd;
@green: #46a546;
@red: #9d261d;
@yellow: #ffc40d;
@orange: #f89406;
@pink: #c3325f;
@purple: #7a43b6;
+
+// Scaffolding
+// -------------------------
+@bodyBackground: @white;
+@textColor: @grayDark;
+
+
+// Links
+// -------------------------
+@linkColor: #08c;
+@linkColorHover: darken(@linkColor, 15%);
+
+
// Typography
+// -------------------------
@baseFontSize: 13px;
@baseFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif;
@baseLineHeight: 18px;
-@textColor: @grayDark;
+@altFontFamily: Georgia, "Times New Roman", Times, serif;
+@headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily
+@headingsFontWeight: bold; // instead of browser default, bold
+@headingsColor: inherit; // empty to use BS default, @textColor
+
+
+// Tables
+// -------------------------
+@tableBackground: transparent; // overall background-color
+@tableBackgroundAccent: #f9f9f9; // for striping
+@tableBackgroundHover: #f5f5f5; // for hover
+@tableBorder: #ddd; // table and cell border
+
+
// Buttons
-@primaryButtonBackground: @linkColor;
+// -------------------------
+@btnBackground: @white;
+@btnBackgroundHighlight: darken(@white, 10%);
+@btnBorder: darken(@white, 20%);
+@btnPrimaryBackground: @linkColor;
+@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%);
+@btnInfoBackground: #5bc0de;
+@btnInfoBackgroundHighlight: #2f96b4;
+@btnSuccessBackground: #62c462;
+@btnSuccessBackgroundHighlight: #51a351;
+
+@btnWarningBackground: lighten(@orange, 15%);
+@btnWarningBackgroundHighlight: @orange;
+
+@btnDangerBackground: #ee5f5b;
+@btnDangerBackgroundHighlight: #bd362f;
+
+@btnInverseBackground: @gray;
+@btnInverseBackgroundHighlight: @grayDarker;
+
+
+// Forms
+// -------------------------
+@inputBackground: @white;
+@inputBorder: #ccc;
+@inputDisabledBackground: @grayLighter;
+
+
+// Dropdowns
+// -------------------------
+@dropdownBackground: @white;
+@dropdownBorder: rgba(0,0,0,.2);
+@dropdownLinkColor: @grayDark;
+@dropdownLinkColorHover: @white;
+@dropdownLinkBackgroundHover: @linkColor;
+
+
+
+
// COMPONENT VARIABLES
// --------------------------------------------------
// Z-index master list
+// -------------------------
// Used for a bird's eye view of components dependent on the z-axis
// Try to avoid customizing these :)
@zindexDropdown: 1000;
@zindexPopover: 1010;
@zindexTooltip: 1020;
@zindexFixedNavbar: 1030;
@zindexModalBackdrop: 1040;
@zindexModal: 1050;
+
// Sprite icons path
+// -------------------------
@iconSpritePath: asset-url("twitter/bootstrap/glyphicons-halflings.png");
@iconWhiteSpritePath: asset-url("twitter/bootstrap/glyphicons-halflings-white.png");
+
// Input placeholder text color
+// -------------------------
@placeholderText: @grayLight;
+
// Hr border color
+// -------------------------
@hrBorder: @grayLighter;
+
// Navbar
+// -------------------------
@navbarHeight: 40px;
@navbarBackground: @grayDarker;
@navbarBackgroundHighlight: @grayDark;
-@navbarLinkBackgroundHover: transparent;
@navbarText: @grayLight;
@navbarLinkColor: @grayLight;
@navbarLinkColorHover: @white;
+@navbarLinkColorActive: @navbarLinkColorHover;
+@navbarLinkBackgroundHover: transparent;
+@navbarLinkBackgroundActive: @navbarBackground;
+@navbarSearchBackground: lighten(@navbarBackground, 25%);
+@navbarSearchBackgroundFocus: @white;
+@navbarSearchBorder: darken(@navbarSearchBackground, 30%);
+@navbarSearchPlaceholderColor: #ccc;
+
+
+// Hero unit
+// -------------------------
+@heroUnitBackground: @grayLighter;
+@heroUnitHeadingColor: inherit;
+@heroUnitLeadColor: inherit;
+
+
// Form states and alerts
+// -------------------------
@warningText: #c09853;
@warningBackground: #fcf8e3;
@warningBorder: darken(spin(@warningBackground, -10), 3%);
@errorText: #b94a48;
@@ -91,17 +181,21 @@
@infoBackground: #d9edf7;
@infoBorder: darken(spin(@infoBackground, -10), 7%);
+
// GRID
// --------------------------------------------------
// Default 940px grid
+// -------------------------
@gridColumns: 12;
@gridColumnWidth: 60px;
@gridGutterWidth: 20px;
@gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
+
// Fluid grid
+// -------------------------
@fluidGridColumnWidth: 6.382978723%;
@fluidGridGutterWidth: 2.127659574%;