aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-05 09:02:59 -0700
committerMark Otto <[email protected]>2013-08-05 09:02:59 -0700
commit41eef69e6f4d86b5a7ead7abb6d20f0bf6c5404c (patch)
treede36ffd168a002df1310ecb106aefa5f50e7430f /less
parent2ee9bea890bbb4b0f43e861fb4d57b3277628c09 (diff)
downloadbootstrap-41eef69e6f4d86b5a7ead7abb6d20f0bf6c5404c.tar.xz
bootstrap-41eef69e6f4d86b5a7ead7abb6d20f0bf6c5404c.zip
Fixes #8786 (part 2): new default button styles
Also relevant: http://www.youtube.com/watch?v=Ldyx3KHOFXw
Diffstat (limited to 'less')
-rw-r--r--less/buttons.less2
-rw-r--r--less/mixins.less1
-rw-r--r--less/variables.less18
3 files changed, 10 insertions, 11 deletions
diff --git a/less/buttons.less b/less/buttons.less
index 8fad99cc8..8cd44cb5f 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -28,7 +28,7 @@
&:hover,
&:focus {
- color: @btn-hover-color;
+ color: @btn-default-color;
text-decoration: none;
}
diff --git a/less/mixins.less b/less/mixins.less
index 47739d2f0..b31619521 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -372,6 +372,7 @@
&:focus,
&:active,
&.active {
+ color: @color;
background-color: darken(@background, 8%);
border-color: darken(@border, 12%);
}
diff --git a/less/variables.less b/less/variables.less
index 582457874..a333d45ea 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -96,32 +96,30 @@
// Buttons
// -------------------------
-@btn-default-color: #fff;
-@btn-default-bg: #474949;
-@btn-default-border: @btn-default-bg;
+@btn-default-color: #333;
+@btn-default-bg: #fff;
+@btn-default-border: #ccc;
-@btn-primary-color: @btn-default-color;
+@btn-primary-color: #fff;
@btn-primary-bg: @brand-primary;
@btn-primary-border: @btn-primary-bg;
-@btn-success-color: @btn-default-color;
+@btn-success-color: #fff;
@btn-success-bg: @brand-success;
@btn-success-border: @btn-success-bg;
-@btn-warning-color: @btn-default-color;
+@btn-warning-color: #fff;
@btn-warning-bg: @brand-warning;
@btn-warning-border: @btn-warning-bg;
-@btn-danger-color: @btn-default-color;
+@btn-danger-color: #fff;
@btn-danger-bg: @brand-danger;
@btn-danger-border: @btn-danger-bg;
-@btn-info-color: @btn-default-color;
+@btn-info-color: #fff;
@btn-info-bg: @brand-info;
@btn-info-border: @btn-info-bg;
-@btn-hover-color: @btn-default-color;
-
// Forms
// -------------------------