Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <otto@github.com>2012-12-20 11:12:38 +0400
committerMark Otto <otto@github.com>2012-12-20 11:12:38 +0400
commita27952efd0f25e99030a9384f66bcd602d6a1b37 (patch)
tree68a622fbd58715bdaab08c55e858f6f1bc9c3a1b /less
parent9b4e5746a4340855e86ed16e15331e10ac23a687 (diff)
Unfuck the fucked gradient with it's fucked mix() of background colors; nuke commented out code
Diffstat (limited to 'less')
-rw-r--r--less/mixins.less25
-rw-r--r--less/variables.less2
2 files changed, 2 insertions, 25 deletions
diff --git a/less/mixins.less b/less/mixins.less
index da430a2779..bdd8cf1e04 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -338,7 +338,7 @@
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@startColor),argb(@endColor))); // IE9 and down
}
.vertical(@startColor: #555, @endColor: #333) {
- background-color: mix(@startColor, @endColor, 60%);
+ background-color: @endColor;
background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+
@@ -405,29 +405,6 @@
// Button backgrounds
// ------------------
-/*.buttonBackground(@startColor, @endColor, @text-color: #fff, @textShadow: 0 -1px 0 rgba(0,0,0,.25)) {
- color: @text-color;
- text-shadow: @textShadow;
- #gradient > .vertical(@startColor, @endColor);
- border-color: @endColor @endColor darken(@endColor, 15%);
- border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
- .reset-filter();
-
- // in these cases the gradient won't cover the background, so we override
- &:hover, &:active, &.active, &.disabled, &[disabled] {
- color: @text-color;
- background-color: @endColor;
- }
-
- // IE8 can't handle box-shadow to show active, so we darken a bit ourselves
- &:active,
- &.active {
- background-color: darken(@endColor, 10%) e("\9");
- }
-}*/
-
-// Button backgrounds
-// ------------------
.buttonBackground(@background-start, @background-end, @text-color: #fff, @text-shadow: 0 -1px 0 rgba(0,0,0,.25)) {
color: @text-color;
text-shadow: @text-shadow;
diff --git a/less/variables.less b/less/variables.less
index 78ccca53f0..7daff461e6 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -76,7 +76,7 @@
// -------------------------
@btn-background: #fafafa;
-@btn-background-highlight: darken(@btn-background, 10%);
+@btn-background-highlight: #dadada;
@btn-background-primary: @link-color;
@btn-background-primary-highlight: spin(@btn-background-primary, 20%);