summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorspag <spag@golwen.net>2013-01-16 10:31:18 +0100
committerspag <spag@golwen.net>2013-01-16 10:31:18 +0100
commit1de09183010a7f021455ce69877b78051d5c4bf1 (patch)
tree736f546009b2d85dcd470e044576442e464b93b1 /app/assets/stylesheets
parent473e6c52eff0576829138b59b99f83917ff6b0e9 (diff)
parent8e16b8a24341fd579d97ce47512951a3d14250c1 (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/application.css.scss2
-rw-r--r--app/assets/stylesheets/vendor/fancy-buttons/_fancy-buttons.scss12
2 files changed, 4 insertions, 10 deletions
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index 32e54f4..2aabd17 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -114,4 +114,4 @@ a.button { margin:10px 0;}
@import "app/layouts/conference";
// Compatibility.. oh jeez.
- @import "app/shared/ie"; \ No newline at end of file
+ @import "app/shared/ie";
diff --git a/app/assets/stylesheets/vendor/fancy-buttons/_fancy-buttons.scss b/app/assets/stylesheets/vendor/fancy-buttons/_fancy-buttons.scss
index 2e85caf..7676dc8 100644
--- a/app/assets/stylesheets/vendor/fancy-buttons/_fancy-buttons.scss
+++ b/app/assets/stylesheets/vendor/fancy-buttons/_fancy-buttons.scss
@@ -1,9 +1,3 @@
-@import "compass/css3/gradient";
-@import "compass/css3/border-radius";
-@import "compass/css3/opacity";
-@import "compass/css3/text-shadow";
-@import "compass/css3/box-shadow";
-@import "compass/css3/background-clip";
@import "fancy-gradient";
$fb-gradient-style: glossy !default;
@@ -60,19 +54,19 @@ $fb-line-height: 1.2em !default;
@mixin fancy-button-matte($color: $fb-color, $font-size: $fb-font-size, $radius: $fb-radius, $border-width: $fb-border-width) {
@include fancy-button-structure($font-size, $radius, $border-width);
- @include fancy-button-colors-matte($color);
+ @include fancy-button-colors-matte($color);
}
@mixin fancy-button-custom($color: $fb-color, $font-size: $fb-font-size, $radius: $fb-radius, $border-width: $fb-border-width) {
@include fancy-button-structure($font-size, $radius, $border-width);
- @include fancy-button-colors-custom($color, $font-size, $radius, $border-width);
+ @include fancy-button-colors-custom($color, $font-size, $radius, $border-width);
}
@mixin fancy-button-colors-matte($color: $fb-color, $hover: 0, $active: 0) {
$fb-current-style: $fb-gradient-style;
$fb-gradient-style: matte;
@include fancy-button-colors($color, $hover, $active);
- $fb-gradient-style: $fb-current-style;
+ $fb-gradient-style: $fb-current-style;
}
@mixin fancy-button-colors-custom($color: $fb-color, $hover: 0, $active: 0) {