aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-04-23 10:06:35 -0700
committerMark Otto <[email protected]>2012-04-23 10:06:35 -0700
commit419e50e33974f7741c4e6b25772f2be65aa73240 (patch)
tree012d45ef5b9ddc236c4875cef063f84487eb98a2 /less
parent091a97c01c0dd9e725e42c6a1a6a19a74054d587 (diff)
downloadbootstrap-419e50e33974f7741c4e6b25772f2be65aa73240.tar.xz
bootstrap-419e50e33974f7741c4e6b25772f2be65aa73240.zip
fix up buttons after recess property order
Diffstat (limited to 'less')
-rw-r--r--less/button-groups.less1
-rw-r--r--less/buttons.less3
-rw-r--r--less/variables.less2
3 files changed, 5 insertions, 1 deletions
diff --git a/less/button-groups.less b/less/button-groups.less
index 7c6a02a67..023adcb5e 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 7b85dc216..2b5f24499 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 279c163f1..ca8e3ae40 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%);