2.2.2 -> 2.3.0

[bootswatch] / amelia / variables.less

diff --git a/amelia/variables.less b/amelia/variables.less
index fde6fdb..c5c3c62 100755 (executable)
--- a/amelia/variables.less
+++ b/amelia/variables.less
@@ -1,10 +1,9 @@
-// Variables.less
-// Variables to customize the look and feel of Bootstrap
-// Swatch: Amelia
-// Version: 2.0.4
-// -----------------------------------------------------
+// Amelia 2.3.0
+// Variables
+// --------------------------------------------------
+
 
-// GLOBAL VALUES
+// Global values
 // --------------------------------------------------
 
 
@@ -12,7 +11,7 @@
 // -------------------------
 @black:                 #000;
 @grayDarker:            #111;
-@grayDark:              #333;
+@grayDark:              #444;
 @gray:                  #555;
 @grayLight:             #aaa;
 @grayLighter:           #ddd;
@@ -24,7 +23,7 @@
 @blue:                  #00BCE1;
 @blueDark:              #1269B0;
 @green:                 #48CA3B;
-@red:                   #E51925;
+@red:                   #AD1D28;
 @yellow:                #DEBB27;
 @orange:                #DF6E1E;
 @pink:                  #FFBCB9;
@@ -59,6 +58,23 @@
 @headingsColor:         inherit; // 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:          20px 24px; // 58px
+@paddingSmall:          8px 12px;  // 34px
+@paddingMini:           4px 8px;   // 28px
+
+@baseBorderRadius:      0;
+@borderRadiusLarge:     6px;
+@borderRadiusSmall:     3px;
+
+
 // Tables
 // -------------------------
 @tableBackground:                   lighten(#147E88, 10%); // overall background-color
@@ -66,7 +82,6 @@
 @tableBackgroundHover:              rgba(255, 255, 255, 0.4); // for hover
 @tableBorder:                       lighten(#147E88, 12%); // table and cell border
 
-
 // Buttons
 // -------------------------
 @btnBackground:                     @grayLighter;
@@ -74,7 +89,7 @@
 @btnBorder:                         rgba(0, 0, 0, 0);
 
 @btnPrimaryBackground:              @navbarBackground;
-@btnPrimaryBackgroundHighlight:     spin(@btnPrimaryBackground, 15%);
+@btnPrimaryBackgroundHighlight:     @navbarBackground;
 
 @btnInfoBackground:                 @purple;
 @btnInfoBackgroundHighlight:        @purple;
@@ -96,25 +111,32 @@
 // -------------------------
 @inputBackground:               @white;
 @inputBorder:                   transparent;
-@inputBorderRadius:             0;
+@inputBorderRadius:             @baseBorderRadius;
 @inputDisabledBackground:       @grayLighter;
 @formActionsBackground:         transparent;
+@inputHeight:                   @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
+
 
 // Dropdowns
 // -------------------------
 @dropdownBackground:            @white;
 @dropdownBorder:                rgba(0,0,0,.2);
-@dropdownLinkColor:             @bodyBackground;
-@dropdownLinkColorHover:        @white;
-@dropdownLinkBackgroundHover:   rgba(0, 57, 59, 0.9);
 @dropdownDividerTop:            #e5e5e5;
 @dropdownDividerBottom:         @white;
 
+@dropdownLinkColor:             @grayDark;
+@dropdownLinkColorHover:        @white;
+@dropdownLinkColorActive:       @white;
+
+@dropdownLinkBackgroundActive:  @red;
+@dropdownLinkBackgroundHover:   @red;
+
 
 
 // COMPONENT VARIABLES
 // --------------------------------------------------
 
+
 // Z-index master list
 // -------------------------
 // Used for a bird's eye view of components dependent on the z-axis
@@ -143,11 +165,25 @@
 @hrBorder:                transparent;
 
 
+// Horizontal forms & lists
+// -------------------------
+@horizontalComponentOffset:       180px;
+
+
+// Wells
+// -------------------------
+@wellBackground:                  #3CB9C6;
+
+
 // Navbar
 // -------------------------
+@navbarCollapseWidth:             979px;
+@navbarCollapseDesktopWidth:      @navbarCollapseWidth + 1;
+
 @navbarHeight:                    50px;
-@navbarBackground:                #AD1D28;
-@navbarBackgroundHighlight:       #AD1D28;
+@navbarBackgroundHighlight:       @red;
+@navbarBackground:                @red;
+@navbarBorder:                    darken(@navbarBackground, 12%);
 
 @navbarText:                      @white;
 @navbarLinkColor:                 @white;
@@ -156,12 +192,34 @@
 @navbarLinkBackgroundHover:       lighten(@navbarBackground, 10%);
 @navbarLinkBackgroundActive:      lighten(@navbarBackground, 10%);
 
-@navbarSearchBackground:          rgba(0, 0, 0, 0);
-@navbarSearchBackgroundFocus:     lighten(@navbarBackground, 25%);
-@navbarSearchBorder:              darken(@navbarSearchBackground, 30%);
-@navbarSearchPlaceholderColor:    @textColor;
 @navbarBrandColor:                @navbarLinkColor;
 
+// Inverted navbar
+@navbarInverseBackground:                @yellow;
+@navbarInverseBackgroundHighlight:       @yellow;
+@navbarInverseBorder:                    rgba(0, 0, 0, 0.1);
+
+@navbarInverseText:                      @white;
+@navbarInverseLinkColor:                 @white;
+@navbarInverseLinkColorHover:            @white;
+@navbarInverseLinkColorActive:           @white;
+@navbarInverseLinkBackgroundHover:       rgba(255, 255, 255, 0.2);
+@navbarInverseLinkBackgroundActive:      rgba(255, 255, 255, 0.2);
+
+@navbarInverseSearchBackground:          lighten(@navbarInverseBackground, 25%);
+@navbarInverseSearchBackgroundFocus:     @white;
+@navbarInverseSearchBorder:              @navbarInverseBackground;
+@navbarInverseSearchPlaceholderColor:    @white;
+
+@navbarInverseBrandColor:                @navbarInverseLinkColor;
+
+
+// Pagination
+// -------------------------
+@paginationBackground:                #3CB9C6;
+@paginationBorder:                    transparent;
+@paginationActiveBackground:          rgba(255, 255, 255, 0.4);
+
 
 // Hero unit
 // -------------------------
@@ -189,10 +247,28 @@
 @infoBorder:              darken(spin(@infoBackground, -10), 7%);
 
 
+// Tooltips and popovers
+// -------------------------
+@tooltipColor:            #fff;
+@tooltipBackground:       #000;
+@tooltipArrowWidth:       5px;
+@tooltipArrowColor:       @tooltipBackground;
+
+@popoverBackground:       #fff;
+@popoverArrowWidth:       10px;
+@popoverArrowColor:       #fff;
+@popoverTitleBackground:  @navbarBackground;
+
+// Special enhancement for popovers
+@popoverArrowOuterWidth:  @popoverArrowWidth + 1;
+@popoverArrowOuterColor:  rgba(0,0,0,.25);
+
+
 
 // GRID
 // --------------------------------------------------
 
+
 // Default 940px grid
 // -------------------------
 @gridColumns:             12;
@@ -200,7 +276,26 @@
 @gridGutterWidth:         20px;
 @gridRowWidth:            (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
 
+// 1200px min
+@gridColumnWidth1200:     70px;
+@gridGutterWidth1200:     30px;
+@gridRowWidth1200:        (@gridColumns * @gridColumnWidth1200) + (@gridGutterWidth1200 * (@gridColumns - 1));
+
+// 768px-979px
+@gridColumnWidth768:      42px;
+@gridGutterWidth768:      20px;
+@gridRowWidth768:         (@gridColumns * @gridColumnWidth768) + (@gridGutterWidth768 * (@gridColumns - 1));
+
+
 // Fluid grid
 // -------------------------
-@fluidGridColumnWidth:    6.382978723%;
-@fluidGridGutterWidth:    2.127659574%;
+@fluidGridColumnWidth:    percentage(@gridColumnWidth/@gridRowWidth);
+@fluidGridGutterWidth:    percentage(@gridGutterWidth/@gridRowWidth);
+
+// 1200px min
+@fluidGridColumnWidth1200:     percentage(@gridColumnWidth1200/@gridRowWidth1200);
+@fluidGridGutterWidth1200:     percentage(@gridGutterWidth1200/@gridRowWidth1200);
+
+// 768px-979px
+@fluidGridColumnWidth768:      percentage(@gridColumnWidth768/@gridRowWidth768);
+@fluidGridGutterWidth768:      percentage(@gridGutterWidth768/@gridRowWidth768);