updated to 2.2.1

[bootswatch] / spruce / variables.less

diff --git a/spruce/variables.less b/spruce/variables.less
index c8fad35..d8afc16 100755 (executable)
--- a/spruce/variables.less
+++ b/spruce/variables.less
@@ -1,7 +1,5 @@
-//
+// Spruce 2.2.1
 // Variables
-// Swatch: Spruce
-// Version: 2.1.0
 // --------------------------------------------------
 
 
@@ -60,6 +58,23 @@
 @headingsColor:         #F5F3DC; // empty to use BS default, @textColor
 
 
+// Component sizing
+// -------------------------
+// Based on 14px font-size and 20px line-height
+
+@fontSizeLarge:         @baseFontSize * 1.25; // ~18px
+@fontSizeSmall:         @baseFontSize * 0.85; // ~12px
+@fontSizeMini:          @baseFontSize * 0.75; // ~11px
+
+@paddingLarge:          11px 19px; // 44px
+@paddingSmall:          2px 10px;  // 26px
+@paddingMini:           1px 6px;   // 24px
+
+@baseBorderRadius:      4px;
+@borderRadiusLarge:     6px;
+@borderRadiusSmall:     3px;
+
+
 // Tables
 // -------------------------
 @tableBackground:                   #C3C7AE; // overall background-color
@@ -67,60 +82,61 @@
 @tableBackgroundHover:              darken(#C3C7AE, 10%); // for hover
 @tableBorder:                       @headingsColor; // table and cell border
 
-
 // Buttons
 // -------------------------
 @btnBackground:                     @white;
 @btnBackgroundHighlight:            darken(@white, 10%);
 @btnBorder:                         darken(@white, 20%);
 
-@btnPrimaryBackground:              @linkColor;
-@btnPrimaryBackgroundHighlight:     spin(@btnPrimaryBackground, 15%);
+@btnPrimaryBackground:              lighten(@blueDark, 10%);
+@btnPrimaryBackgroundHighlight:     lighten(@blueDark, 5%);
 
 @btnInfoBackground:                 #5bc0de;
 @btnInfoBackgroundHighlight:        #2f96b4;
 
-@btnSuccessBackground:              #62c462;
-@btnSuccessBackgroundHighlight:     #51a351;
+@btnSuccessBackground:              lighten(@blue, 10%);
+@btnSuccessBackgroundHighlight:     lighten(@blue, 5%);
 
 @btnWarningBackground:              lighten(@orange, 15%);
 @btnWarningBackgroundHighlight:     @orange;
 
-@btnDangerBackground:               #ee5f5b;
-@btnDangerBackgroundHighlight:      #bd362f;
+@btnDangerBackground:               lighten(@red, 5%);
+@btnDangerBackgroundHighlight:      @red;
 
-@btnInverseBackground:              @gray;
-@btnInverseBackgroundHighlight:     @grayDarker;
+@btnInverseBackground:              @yellow;
+@btnInverseBackgroundHighlight:     darken(@yellow, 5%);
 
 
 // Forms
 // -------------------------
 @inputBackground:               @white;
 @inputBorder:                   #ccc;
-@inputBorderRadius:             3px;
+@inputBorderRadius:             @baseBorderRadius;
 @inputDisabledBackground:       @grayLighter;
 @formActionsBackground:         transparent;
+@inputHeight:                   @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
+
 
 // Dropdowns
 // -------------------------
-@dropdownBackground:            @white;
+@dropdownBackground:            @headingsColor;
 @dropdownBorder:                rgba(0,0,0,.2);
 @dropdownDividerTop:            transparent;
 @dropdownDividerBottom:         @bodyBackground;
 
 @dropdownLinkColor:             @grayDark;
-
 @dropdownLinkColorHover:        @white;
-@dropdownLinkBackgroundHover:   rgba(0, 0, 0, 0.1);
-
 @dropdownLinkColorActive:       @dropdownLinkColorHover;
+
 @dropdownLinkBackgroundActive:  @dropdownLinkBackgroundHover;
+@dropdownLinkBackgroundHover:   darken(@bodyBackground, 10%);
 
 
 
 // COMPONENT VARIABLES
 // --------------------------------------------------
 
+
 // Z-index master list
 // -------------------------
 // Used for a bird's eye view of components dependent on the z-axis
@@ -149,18 +165,24 @@
 @hrBorder:                @linkColor;
 
 
+// Horizontal forms & lists
+// -------------------------
+@horizontalComponentOffset:       180px;
+
+
 // Wells
 // -------------------------
-@wellBackground:                  darken(#90A38F, 10%);
+@wellBackground:                  darken(@bodyBackground, 10%);
 
 
 // Navbar
 // -------------------------
 @navbarCollapseWidth:             979px;
+@navbarCollapseDesktopWidth:      @navbarCollapseWidth + 1;
 
 @navbarHeight:                    50px;
-@navbarBackground:                @blueDark;
 @navbarBackgroundHighlight:       @navbarBackground;
+@navbarBackground:                @blueDark;
 @navbarBorder:                    darken(@navbarBackground, 5%);
 
 @navbarText:                      @grayLight;
@@ -194,14 +216,14 @@
 
 // Pagination
 // -------------------------
-@paginationBackground:                darken(#90A38F, 10%);
+@paginationBackground:                darken(@bodyBackground, 10%);
 @paginationBorder:                    transparent;
 @paginationActiveBackground:          #A2CDB5;
 
 
 // Hero unit
 // -------------------------
-@heroUnitBackground:              darken(#90A38F, 10%);
+@heroUnitBackground:              darken(@bodyBackground, 10%);
 @heroUnitHeadingColor:            @headingsColor;
 @heroUnitLeadColor:               inherit;