summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Punt <koen@koenpunt.nl>2012-11-25 19:25:33 +0100
committerKoen Punt <koen@koenpunt.nl>2012-11-29 12:18:44 +0100
commitdf0bd0c212a76ed6ce4e0e90b8101a9a164c34fa (patch)
tree11a61b60330f0d2fc9df809a09336f6d341183fb
parent81175073a0604633bfec08b95c1ed19d054b48b5 (diff)
downloadgitlab-ce-df0bd0c212a76ed6ce4e0e90b8101a9a164c34fa.tar.gz
Removed bg-gradient, now directly using linear-gradient
-rw-r--r--app/assets/stylesheets/common.scss4
-rw-r--r--app/assets/stylesheets/gitlab_bootstrap/buttons.scss4
-rw-r--r--app/assets/stylesheets/mixins.scss4
3 files changed, 4 insertions, 8 deletions
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index c2194297009..4b7af54e4c4 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -374,12 +374,12 @@ p.time {
height: 100%;
}
.bar-success {
+ @include linear-gradient(#62C462, #51A351);
background-color: #468847;
- @include bg-gradient(#62C462, #51A351);
}
.bar-danger {
+ @include linear-gradient(#EE5F5B, #BD362F);
background-color: #B94A48;
- @include bg-gradient(#EE5F5B, #BD362F);
}
}
.upvotes {
diff --git a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
index a8d9e5c0929..bb2cfbb954d 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
@@ -1,5 +1,5 @@
.btn {
- @include bg-gradient(#f7f7f7, #d5d5d5);
+ @include linear-gradient(#f7f7f7, #d5d5d5);
border-color: #aaa;
&:hover {
@include bg-gray-gradient;
@@ -9,7 +9,7 @@
&.primary {
background: #2a79A3;
- @include bg-gradient(#47A7b7, #2585b5);
+ @include linear-gradient(#47A7b7, #2585b5);
border-color: #2A79A3;
color: #fff;
text-shadow: 0 1px 1px #268;
diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss
index c704de064f3..11a8535d257 100644
--- a/app/assets/stylesheets/mixins.scss
+++ b/app/assets/stylesheets/mixins.scss
@@ -34,10 +34,6 @@
background-image: -o-linear-gradient($from, $to);
}
-@mixin bg-gradient($from, $to) {
- @include linear-gradient($from, $to);
-}
-
@mixin bg-light-gray-gradient {
background: #f1f1f1;
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1));