From 419e50e33974f7741c4e6b25772f2be65aa73240 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 23 Apr 2012 10:06:35 -0700
Subject: [PATCH] fix up buttons after recess property order
---
docs/assets/css/bootstrap.css | 4 ++++
less/button-groups.less | 1 +
less/buttons.less | 3 +++
less/variables.less | 2 +-
4 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index cb7aa35168..1c2e91850b 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2694,6 +2694,10 @@ button.close {
color: rgba(255, 255, 255, 0.75);
}
+.btn {
+ border-color: #ccc;
+}
+
.btn-primary {
background-color: #0074cc;
*background-color: #0055cc;
diff --git a/less/button-groups.less b/less/button-groups.less
index 7c6a02a67e..023adcb5e6 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -41,6 +41,7 @@
-moz-border-radius-bottomleft: 4px;
border-bottom-left-radius: 4px;
}
+// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
.btn-group > .btn:last-child,
.btn-group > .dropdown-toggle {
-webkit-border-top-right-radius: 4px;
diff --git a/less/buttons.less b/less/buttons.less
index 7b85dc216e..2b5f24499b 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -131,6 +131,9 @@
// Set the backgrounds
// -------------------------
+.btn {
+ border-color: #ccc; // reset here as of 2.0.3 due to Recess property order
+}
.btn-primary {
.buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight);
}
diff --git a/less/variables.less b/less/variables.less
index 279c163f1a..ca8e3ae40f 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -71,7 +71,7 @@
// -------------------------
@btnBackground: @white;
@btnBackgroundHighlight: darken(@white, 10%);
-@btnBorder: darken(@white, 20%);
+@btnBorder: #ccc;
@btnPrimaryBackground: @linkColor;
@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%);
--
GitLab