Add @btn-color variable and use in buttons and carets; fixes dropup caret as well

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 01c603b26b9cf95b91dd77b43429f4332ac127b0..66002d292d09c764af22e9fc614b39c5f5d9c71b 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1679,7 +1679,7 @@ input[type="button"].btn-block {
 }
 
 .btn {
-  color: #fff;
+  color: #ffffff;
   background-color: #a7a9aa;
   border-color: #a7a9aa;
 }
@@ -3245,9 +3245,12 @@ button.close {
 
 */
 
-.caret {
-  border-top-color: #fff;
-  border-bottom-color: #fff;
+.btn .caret {
+  border-top-color: #ffffff;
+}
+
+.dropup .btn .caret {
+  border-bottom-color: #ffffff;
 }
 
 .btn-group {
@@ -3344,19 +3347,10 @@ button.close {
   margin-left: 0;
 }
 
-.btn-large .caret {
-  margin-top: 6px;
-}
-
 .btn-large .caret {
   border-width: 5px;
 }
 
-.btn-mini .caret,
-.btn-small .caret {
-  margin-top: 8px;
-}
-
 .dropup .btn-large .caret {
   border-bottom-width: 5px;
 }

diff --git a/less/button-groups.less b/less/button-groups.less
index 43bf73ca11e3c2c40f75683052f1681da0c9b93e..340b342e709be339384f9d78685ff7e17bc11f0f 100644 (file)
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -3,9 +3,11 @@
 // --------------------------------------------------
 
 // Button carets
-.caret {
-  border-top-color: #fff;
-  border-bottom-color: #fff;
+.btn .caret {
+  border-top-color: @btn-color;
+}
+.dropup .btn .caret {
+  border-bottom-color: @btn-color;
 }
 
 // Make the div behave like a button
@@ -104,16 +106,9 @@
   margin-left: 0;
 }
 // Carets in other button sizes
-.btn-large .caret {
-  margin-top: 6px;
-}
 .btn-large .caret {
   border-width: 5px;
 }
-.btn-mini .caret,
-.btn-small .caret {
-  margin-top: 8px;
-}
 // Upside down carets for .dropup
 .dropup .btn-large .caret {
   border-bottom-width: 5px;

diff --git a/less/buttons.less b/less/buttons.less
index f825bd4295a1fa71772885de2baf1067af65c3f9..80d19494dd7ca68b36b5c79efbf7ea50b812131e 100644 (file)
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -115,7 +115,7 @@ input[type="button"] {
 // --------------------------------------------------
 
 .btn {
-  color: #fff;
+  color: @btn-color;
   background-color: @btn-background;
   border-color: @btn-border;
   &:hover,

diff --git a/less/variables.less b/less/variables.less
index 53de5a6acef674cea41b85e495ab90e7c44ab6db..1f8b8ae59d8eae030e69b3d73394a16138aa81e5 100644 (file)
--- a/less/variables.less
+++ b/less/variables.less
@@ -82,6 +82,7 @@
 // Buttons
 // -------------------------
 
+@btn-color:                          #fff;
 @btn-background:                     #a7a9aa;
 @btn-border:                         @btn-background;