First test for making the admin less bootstrapish.

Please update and tell me what you think about it.
McWild · Aug 1, 2013 · bcbf6bf · bcbf6bf
1 parent d7605ab
commit bcbf6bf
Show file tree

Hide file tree

Showing 5 changed files with 3,457 additions and 4,500 deletions.
diff --git a/less/buttons.less b/less/buttons.less
@@ -28,7 +28,7 @@
   // Hover/focus state
   &:hover,
   &:focus {
-    color: @grayDark;
+    color: #fff;
     text-decoration: none;
     background-position: 0 -15px;
 
@@ -160,6 +160,7 @@ input[type="button"] {
 // Info appears as a neutral blue
 .btn-info {
   .buttonBackground(@btnInfoBackground, @btnInfoBackgroundHighlight);
+  color: #fff
 }
 // Inverse appears as dark gray
 .btn-inverse {

diff --git a/less/labels-badges.less b/less/labels-badges.less
@@ -52,7 +52,7 @@ a {
 .label,
 .badge {
   // Important (red)
-  &-important         { background-color: @errorText; }
+  &-important         { background-color: @errorBackground; }
   &-important[href]   { background-color: darken(@errorText, 10%); }
   // Warnings (orange)
   &-warning           { background-color: @orange; }
@@ -61,8 +61,8 @@ a {
   &-success           { background-color: @successText; }
   &-success[href]     { background-color: darken(@successText, 10%); }
   // Info (turquoise)
-  &-info              { background-color: @infoText; }
-  &-info[href]        { background-color: darken(@infoText, 10%); }
+  &-info              { background-color: @infoBackground; }
+  &-info[href]        { background-color: darken(@infoBackground, 10%); }
   // Inverse (black)
   &-inverse           { background-color: @grayDark; }
   &-inverse[href]     { background-color: darken(@grayDark, 10%); }

diff --git a/less/variables.less b/less/variables.less
@@ -9,9 +9,9 @@
 
 // Grays
 // -------------------------
-@black:                 #000;
+@black:                 #fff;
 @grayDarker:            #222;
-@grayDark:              #333;
+@grayDark:              #668D96;
 @gray:                  #555;
 @grayLight:             #999;
 @grayLighter:           #eee;
@@ -23,7 +23,7 @@
 @blue:                  #049cdb;
 @blueDark:              #0064cd;
 @green:                 #46a546;
-@red:                   #9d261d;
+@red:                   #CA1100;
 @yellow:                #ffc40d;
 @orange:                #f89406;
 @pink:                  #c3325f;
@@ -38,7 +38,7 @@
 
 // Links
 // -------------------------
-@linkColor:             #08c;
+@linkColor:             #85A7AD;
 @linkColorHover:        darken(@linkColor, 15%);
 
 
@@ -48,9 +48,9 @@
 @serifFontFamily:       Georgia, "Times New Roman", Times, serif;
 @monoFontFamily:        Monaco, Menlo, Consolas, "Courier New", monospace;
 
-@baseFontSize:          14px;
+@baseFontSize:          13px;
 @baseFontFamily:        @sansFontFamily;
-@baseLineHeight:        20px;
+@baseLineHeight:        18px;
 @altFontFamily:         @serifFontFamily;
 
 @headingsFontFamily:    inherit; // empty to use BS default, @baseFontFamily
@@ -86,12 +86,12 @@
 // -------------------------
 @btnBackground:                     @white;
 @btnBackgroundHighlight:            darken(@white, 10%);
-@btnBorder:                         #ccc;
+@btnBorder:                         #E6E6E2;
 
-@btnPrimaryBackground:              @linkColor;
+@btnPrimaryBackground:              #5bc0de;
 @btnPrimaryBackgroundHighlight:     spin(@btnPrimaryBackground, 20%);
 
-@btnInfoBackground:                 #5bc0de;
+@btnInfoBackground:                 #4099FF;
 @btnInfoBackgroundHighlight:        #2f96b4;
 
 @btnSuccessBackground:              #62c462;
@@ -110,7 +110,7 @@
 // Forms
 // -------------------------
 @inputBackground:               @white;
-@inputBorder:                   #ccc;
+@inputBorder:                    #e6e6e2;
 @inputBorderRadius:             @baseBorderRadius;
 @inputDisabledBackground:       @grayLighter;
 @formActionsBackground:         #f5f5f5;
@@ -172,7 +172,7 @@
 
 // Wells
 // -------------------------
-@wellBackground:                  #f5f5f5;
+@wellBackground:                  #EEF7F8;
 
 
 // Navbar
@@ -195,13 +195,13 @@
 @navbarBrandColor:                @navbarLinkColor;
 
 // Inverted navbar
-@navbarInverseBackground:                #111111;
-@navbarInverseBackgroundHighlight:       #222222;
-@navbarInverseBorder:                    #252525;
+@navbarInverseBackground:                #3D5459;
+@navbarInverseBackgroundHighlight:       #35474B;
+@navbarInverseBorder:                    #35474B;
 
-@navbarInverseText:                      @grayLight;
-@navbarInverseLinkColor:                 @grayLight;
-@navbarInverseLinkColorHover:            @white;
+@navbarInverseText:                      #9EB0B3;
+@navbarInverseLinkColor:                 #9EB0B3;
+@navbarInverseLinkColorHover:            #d7dfe0;
 @navbarInverseLinkColorActive:           @navbarInverseLinkColorHover;
 @navbarInverseLinkBackgroundHover:       transparent;
 @navbarInverseLinkBackgroundActive:      @navbarInverseBackground;
@@ -234,17 +234,17 @@
 @warningBackground:       #fcf8e3;
 @warningBorder:           darken(spin(@warningBackground, -10), 3%);
 
-@errorText:               #b94a48;
-@errorBackground:         #f2dede;
-@errorBorder:             darken(spin(@errorBackground, -10), 3%);
+@errorText:               #ffffff;
+@errorBackground:         #FF5040;
+@errorBorder:             #CA1100;
 
 @successText:             #468847;
 @successBackground:       #dff0d8;
 @successBorder:           darken(spin(@successBackground, -10), 5%);
 
-@infoText:                #3a87ad;
-@infoBackground:          #d9edf7;
-@infoBorder:              darken(spin(@infoBackground, -10), 7%);
+@infoText:                @grayDark;
+@infoBackground:          #EEF7F8;
+@infoBorder:              darken(spin(@infoBackground, -10), 3%);
 
 
 // Tooltips and popovers

diff --git a/less/wells.less b/less/wells.less
@@ -9,13 +9,14 @@
   padding: 19px;
   margin-bottom: 20px;
   background-color: @wellBackground;
-  border: 1px solid darken(@wellBackground, 7%);
-  .border-radius(@baseBorderRadius);
   .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
   blockquote {
     border-color: #ddd;
     border-color: rgba(0,0,0,.15);
   }
+  li a {
+    color: #3D5459;
+  }
 }
 
 // Sizes