diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-04-24 15:02:50 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-04-24 15:44:23 +0100 |
| commit | 0e59d5ac3f771c76b5a1d4f1a22b862f6e01ac35 (patch) | |
| tree | 2d2411dd6183de80e7b71dc78c50c9c441d0222e | |
| parent | 30b19128ac09677f0b355eecb98fa29432df4745 (diff) | |
Import, rather than require, custom.css
This means that it gets access to other functions e.g. in _utils.css
4 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/stylesheets/responsive/all.css b/app/assets/stylesheets/responsive/all.css index b43dd4071..4c935bed3 100644 --- a/app/assets/stylesheets/responsive/all.css +++ b/app/assets/stylesheets/responsive/all.css @@ -64,3 +64,5 @@ @import "_user_style"; @import "_user_layout"; + +@import "custom"; diff --git a/app/assets/stylesheets/responsive/application-ie8.css b/app/assets/stylesheets/responsive/application-ie8.css index 6fdc504ba..38cdf3b47 100644 --- a/app/assets/stylesheets/responsive/application-ie8.css +++ b/app/assets/stylesheets/responsive/application-ie8.css @@ -2,7 +2,6 @@ *= require_self *= require normalize *= require responsive/ie8 -*= require responsive/custom *= require jquery.ui.datepicker *= require jquery.ui.tabs */ diff --git a/app/assets/stylesheets/responsive/application-lte-ie7.css b/app/assets/stylesheets/responsive/application-lte-ie7.css index 7bb9a1c73..5b8802cd5 100644 --- a/app/assets/stylesheets/responsive/application-lte-ie7.css +++ b/app/assets/stylesheets/responsive/application-lte-ie7.css @@ -2,7 +2,6 @@ *= require_self *= require normalize *= require responsive/lte-ie7 -*= require responsive/custom *= require jquery.ui.datepicker *= require jquery.ui.tabs */ diff --git a/app/assets/stylesheets/responsive/application.css b/app/assets/stylesheets/responsive/application.css index 72fb256e6..0b5aa8d66 100644 --- a/app/assets/stylesheets/responsive/application.css +++ b/app/assets/stylesheets/responsive/application.css @@ -2,7 +2,6 @@ *= require_self *= require normalize *= require responsive/main -*= require responsive/custom *= require jquery.ui.datepicker *= require jquery.ui.tabs */ |