diff options
| author | Mario "Kuroir" Ricalde <kuroir@gmail.com> | 2013-01-16 02:45:18 -0600 |
|---|---|---|
| committer | Mario "Kuroir" Ricalde <kuroir@gmail.com> | 2013-01-16 02:45:18 -0600 |
| commit | 9c23099b8f93e0ace47caba051204eb6624b8c95 (patch) | |
| tree | 62ecbdf36f3aca3b3a9ce5bf1c849771ec9df96e /app/assets | |
| parent | 6635621faeebbc8dd744e0ad71741f9e82aed1f8 (diff) | |
Updates Rails to 3.2.9
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/application.css.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/vendor/fancy-buttons/_fancy-buttons.scss | 12 |
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) { |