From 2d5ab9a2de88a5cb9c0e13d2c9024e8cc0719b4e Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sat, 20 Apr 2013 15:47:07 -0700
Subject: Make alerts use variables better

---
 less/variables.less | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'less/variables.less')

diff --git a/less/variables.less b/less/variables.less
index 37e602631..41aad04d5 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -277,6 +277,25 @@
 @modal-title-padding:         15px;
 @modal-title-line-height:     @line-height-base;
 
+// Alerts
+// -------------------------
+@alert-bg:                    @state-warning-bg;
+@alert-text:                  @state-warning-text;
+@alert-border:                @state-warning-border;
+@alert-border-radius:         @border-radius-base;
+
+@alert-success-bg:            @state-success-bg;
+@alert-success-text:          @state-success-text;
+@alert-success-border:        @state-success-border;
+
+@alert-danger-bg:             @state-danger-bg;
+@alert-danger-text:           @state-danger-text;
+@alert-danger-border:         @state-danger-border;
+
+@alert-info-bg:               @state-info-bg;
+@alert-info-text:             @state-info-text;
+@alert-info-border:           @state-info-border;
+
 
 // Progress bars
 // -------------------------
-- 
cgit v1.2.3


From 364f8330a159f9448833d88740e259219883d404 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 21 Apr 2013 18:29:06 -0700
Subject: Fixes #7648: Thumbnail caption should use @text-color variable. Also
 adds other thumbnail vars

---
 less/variables.less | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'less/variables.less')

diff --git a/less/variables.less b/less/variables.less
index 41aad04d5..59e91a0d2 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -346,6 +346,14 @@
 @panel-info-heading-bg:       @state-info-bg;
 
 
+// Thumbnails
+// -------------------------
+@thumbnail-caption-color:     @text-color;
+@thumbnail-bg:                @body-bg;
+@thumbnail-border:            #ddd;
+@thumbnail-border-radius:     @border-radius-base;
+
+
 // Wells
 // -------------------------
 @well-bg:                     #f5f5f5;
-- 
cgit v1.2.3


From e0d60b1325591a347d9e49e44be6d77401b07749 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 21 Apr 2013 19:35:36 -0700
Subject: Fixes #7617: lowercase and dash gray color vars

---
 less/variables.less | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'less/variables.less')

diff --git a/less/variables.less b/less/variables.less
index 59e91a0d2..1c19fd514 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -10,11 +10,11 @@
 // Grays
 // -------------------------
 
-@grayDarker:            #222;
-@grayDark:              #333;
-@gray:                  #555;
-@grayLight:             #999;
-@grayLighter:           #eee;
+@gray-darker:            lighten(#000, 13.5%); // #222
+@gray-dark:              lighten(#000, 20%);   // #333
+@gray:                   lighten(#000, 33.5%); // #555
+@gray-light:             lighten(#000, 60%);   // #999
+@gray-lighter:           lighten(#000, 93.5%); // #eee
 
 // Brand colors
 // -------------------------
@@ -29,7 +29,7 @@
 // -------------------------
 
 @body-bg:               #fff;
-@text-color:            @grayDark;
+@text-color:            @gray-dark;
 
 // Links
 // -------------------------
@@ -109,12 +109,12 @@
 // -------------------------
 
 @input-bg:                       #fff;
-@input-bg-disabled:              @grayLighter;
+@input-bg-disabled:              @gray-lighter;
 
 @input-border:                   #ccc;
 @input-border-radius:            @border-radius-base;
 
-@input-color-placeholder:        @grayLight;
+@input-color-placeholder:        @gray-light;
 
 @input-height-base:              (@line-height-base + 14px); // base line-height + 12px vertical padding + 2px top/bottom border
 @input-height-large:             (@line-height-base + 24px); // base line-height + 22px vertical padding + 2px top/bottom border
@@ -134,7 +134,7 @@
 @dropdown-link-active-color:     #fff;
 @dropdown-link-active-bg:        @component-active-bg;
 
-@dropdown-link-color:            @grayDark;
+@dropdown-link-color:            @gray-dark;
 @dropdown-link-hover-color:      #fff;
 @dropdown-link-hover-bg:         @dropdown-link-active-bg;
 
@@ -184,11 +184,11 @@
 @navbar-brand-hover-bg:            transparent;
 
 // Inverted navbar
-@navbar-inverse-text:                       @grayLight;
+@navbar-inverse-text:                       @gray-light;
 @navbar-inverse-bg:                         #222;
 
 // Inverted navbar links
-@navbar-inverse-link-color:                 @grayLight;
+@navbar-inverse-link-color:                 @gray-light;
 @navbar-inverse-link-hover-color:           #fff;
 @navbar-inverse-link-hover-bg:              transparent;
 @navbar-inverse-link-active-color:          @navbar-inverse-link-hover-color;
@@ -220,7 +220,7 @@
 // Jumbotron
 // -------------------------
 
-@jumbotron-bg:                   @grayLighter;
+@jumbotron-bg:                   @gray-lighter;
 @jumbotron-heading-color:        inherit;
 @jumbotron-lead-color:           inherit;
 
@@ -363,7 +363,7 @@
 // -------------------------
 
 // Hr border color
-@hr-border:                   @grayLighter;
+@hr-border:                   @gray-lighter;
 
 // Horizontal forms & lists
 @component-offset-horizontal: 180px;
-- 
cgit v1.2.3