summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Punt <koen@koenpunt.nl>2012-11-24 10:57:22 +0100
committerKoen Punt <koen@koenpunt.nl>2012-11-29 12:18:44 +0100
commit238c214ac9041da65437862115fe772f2d0ea7f3 (patch)
treec9d519b80ea8622467d4203adc4ed7172559a4b1
parentb825582eb16d7983798f3a35746a8352675d3f23 (diff)
downloadgitlab-ce-238c214ac9041da65437862115fe772f2d0ea7f3.tar.gz
Forgot to rename var
-rw-r--r--app/assets/stylesheets/mixins.scss22
-rw-r--r--app/assets/stylesheets/sections/header.scss9
2 files changed, 19 insertions, 12 deletions
diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss
index bdbd59911d5..3ee8d0f5b1d 100644
--- a/app/assets/stylesheets/mixins.scss
+++ b/app/assets/stylesheets/mixins.scss
@@ -12,11 +12,11 @@
@mixin box-shadow($shadow) {
- -webkit-box-shadow: $radius;
- -moz-box-shadow: $radius;
- -ms-box-shadow: $radius;
- -o-box-shadow: $radius;
- box-shadow: $radius;
+ -webkit-box-shadow: $shadow;
+ -moz-box-shadow: $shadow;
+ -ms-box-shadow: $shadow;
+ -o-box-shadow: $shadow;
+ box-shadow: $shadow;
}
@mixin border-radius($radius) {
@@ -27,6 +27,13 @@
border-radius: $radius;
}
+@mixin linear-gradient($from, $to) {
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from($from), to($to));
+ background-image: -webkit-linear-gradient($from, $to);
+ background-image: -moz-linear-gradient($from, $to);
+ background-image: -o-linear-gradient($from, $to);
+}
+
@mixin round-borders-bottom($radius) {
border-top: 1px solid #eaeaea;
@include border-radius(0 0 $radius $radius);
@@ -43,10 +50,7 @@
}
@mixin bg-gradient($from, $to) {
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from($from), to($to));
- background-image: -webkit-linear-gradient($from, $to);
- background-image: -moz-linear-gradient($from, $to);
- background-image: -o-linear-gradient($from, $to);
+ @include linear-gradient($from, $to);
}
@mixin bg-light-gray-gradient {
diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss
index 2d5a5dc9b48..4171c00ab8b 100644
--- a/app/assets/stylesheets/sections/header.scss
+++ b/app/assets/stylesheets/sections/header.scss
@@ -135,9 +135,12 @@ header {
@include border-radius(5px);
border: 1px solid rgba(255, 255, 255, 0.1);
border-bottom: 0;
- background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(255, 255, 255, 0.15)), to(rgba(0, 0, 0, 0.25))), -webkit-gradient(linear, left top, right bottom, color-stop(0, rgba(255, 255, 255, 0)), color-stop(0.5, rgba(255, 255, 255, 0.1)), color-stop(0.501, rgba(255, 255, 255, 0)), color-stop(1, rgba(255, 255, 255, 0)));
- background: -moz-linear-gradient(top, rgba(255, 255, 255, 0.15), rgba(0, 0, 0, 0.25)), -moz-linear-gradient(left top, rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.1) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0));
- background: linear-gradient(top, rgba(255, 255, 255, 0.15), rgba(0, 0, 0, 0.25)), linear-gradient(left top, rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.1) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0));
+ background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(255, 255, 255, 0.15)), to(rgba(0, 0, 0, 0.25))),
+ -webkit-gradient(linear, left top, right bottom, color-stop(0, rgba(255, 255, 255, 0)), color-stop(0.5, rgba(255, 255, 255, 0.1)), color-stop(0.501, rgba(255, 255, 255, 0)), color-stop(1, rgba(255, 255, 255, 0)));
+ background: -moz-linear-gradient(top, rgba(255, 255, 255, 0.15), rgba(0, 0, 0, 0.25)),
+ -moz-linear-gradient(left top, rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.1) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0));
+ background: linear-gradient(top, rgba(255, 255, 255, 0.15), rgba(0, 0, 0, 0.25)),
+ linear-gradient(left top, rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.1) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0));
-webkit-background-origin: border-box;
-moz-background-origin: border;
background-origin: border-box; } } }