change textColor and muted from rgba to hex

[bootswatch] / amelia / variables.less

diff --git a/amelia/variables.less b/amelia/variables.less
index 92b44a0..6fdad28 100755 (executable)
--- a/amelia/variables.less
+++ b/amelia/variables.less
@@ -1,7 +1,5 @@
-//
+// Amelia 2.3.1
 // Variables
-// Swatch: Amelia
-// Version: 2.1.0
 // --------------------------------------------------
 
 
@@ -13,7 +11,7 @@
 // -------------------------
 @black:                 #000;
 @grayDarker:            #111;
-@grayDark:              #333;
+@grayDark:              #444;
 @gray:                  #555;
 @grayLight:             #aaa;
 @grayLighter:           #ddd;
@@ -25,7 +23,7 @@
 @blue:                  #00BCE1;
 @blueDark:              #1269B0;
 @green:                 #48CA3B;
-@red:                   #E51925;
+@red:                   #AD1D28;
 @yellow:                #DEBB27;
 @orange:                #DF6E1E;
 @pink:                  #FFBCB9;
@@ -35,7 +33,7 @@
 // Scaffolding
 // -------------------------
 @bodyBackground:        #003F4D;
-@textColor:             rgba(255, 255, 255, 0.9);
+@textColor:             #E1F0F0;
 
 
 // Links
@@ -60,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
@@ -67,7 +82,6 @@
 @tableBackgroundHover:              rgba(255, 255, 255, 0.4); // for hover
 @tableBorder:                       lighten(#147E88, 12%); // table and cell border
 
-
 // Buttons
 // -------------------------
 @btnBackground:                     @grayLighter;
@@ -75,7 +89,7 @@
 @btnBorder:                         rgba(0, 0, 0, 0);
 
 @btnPrimaryBackground:              @navbarBackground;
-@btnPrimaryBackgroundHighlight:     spin(@btnPrimaryBackground, 15%);
+@btnPrimaryBackgroundHighlight:     @navbarBackground;
 
 @btnInfoBackground:                 @purple;
 @btnInfoBackgroundHighlight:        @purple;
@@ -97,9 +111,11 @@
 // -------------------------
 @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
 // -------------------------
@@ -109,18 +125,18 @@
 @dropdownDividerBottom:         @white;
 
 @dropdownLinkColor:             @grayDark;
-
 @dropdownLinkColorHover:        @white;
-@dropdownLinkBackgroundHover:   @red;
+@dropdownLinkColorActive:       @white;
 
-@dropdownLinkColorActive:       @dropdownLinkColor;
 @dropdownLinkBackgroundActive:  @red;
+@dropdownLinkBackgroundHover:   @red;
 
 
 
 // COMPONENT VARIABLES
 // --------------------------------------------------
 
+
 // Z-index master list
 // -------------------------
 // Used for a bird's eye view of components dependent on the z-axis
@@ -146,7 +162,12 @@
 
 // Hr border color
 // -------------------------
-@hrBorder:                transparent;
+@hrBorder:                rgba(255, 255, 255, 0.3);
+
+
+// Horizontal forms & lists
+// -------------------------
+@horizontalComponentOffset:       180px;
 
 
 // Wells
@@ -157,10 +178,11 @@
 // Navbar
 // -------------------------
 @navbarCollapseWidth:             979px;
+@navbarCollapseDesktopWidth:      @navbarCollapseWidth + 1;
 
 @navbarHeight:                    50px;
-@navbarBackground:                #AD1D28;
-@navbarBackgroundHighlight:       #AD1D28;
+@navbarBackgroundHighlight:       @red;
+@navbarBackground:                @red;
 @navbarBorder:                    darken(@navbarBackground, 12%);
 
 @navbarText:                      @white;
@@ -208,20 +230,20 @@
 
 // Form states and alerts
 // -------------------------
-@warningText:             #c09853;
-@warningBackground:       #fcf8e3;
+@warningText:             @textColor;
+@warningBackground:       @orange;
 @warningBorder:           darken(spin(@warningBackground, -10), 3%);
 
-@errorText:               #b94a48;
-@errorBackground:         #f2dede;
+@errorText:               @textColor;
+@errorBackground:         @red;
 @errorBorder:             darken(spin(@errorBackground, -10), 3%);
 
-@successText:             #468847;
-@successBackground:       #dff0d8;
+@successText:             @textColor;
+@successBackground:       @green;
 @successBorder:           darken(spin(@successBackground, -10), 5%);
 
-@infoText:                #3a87ad;
-@infoBackground:          #d9edf7;
+@infoText:                @textColor;
+@infoBackground:          @purple;
 @infoBorder:              darken(spin(@infoBackground, -10), 7%);
 
 
@@ -235,7 +257,7 @@
 @popoverBackground:       #fff;
 @popoverArrowWidth:       10px;
 @popoverArrowColor:       #fff;
-@popoverTitleBackground:  darken(@popoverBackground, 3%);
+@popoverTitleBackground:  @navbarBackground;
 
 // Special enhancement for popovers
 @popoverArrowOuterWidth:  @popoverArrowWidth + 1;