diff options
| -rw-r--r-- | app/assets/stylesheets/application.scss | 9 | ||||
| -rw-r--r-- | app/assets/stylesheets/generic.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/main/fonts.scss (renamed from app/assets/stylesheets/generic/fonts.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/main/mixins.scss (renamed from app/assets/stylesheets/generic/mixins.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/main/variables.scss (renamed from app/assets/stylesheets/generic/variables.scss) | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 2f732b2adda..d91eec4f4f8 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -9,8 +9,9 @@ *= require_self */ -/** Override bootstrap variables **/ -$font-size-base: 13px !default; +@import "main/variables.scss"; +@import "main/mixins.scss"; +@import "main/fonts.scss"; /** * Twitter bootstrap: @@ -28,6 +29,10 @@ $font-size-base: 13px !default; */ @import "generic.scss"; + +/** + * Unrefactored css + */ @import "common.scss"; diff --git a/app/assets/stylesheets/generic.scss b/app/assets/stylesheets/generic.scss index 4f7716113e0..4c59358ced4 100644 --- a/app/assets/stylesheets/generic.scss +++ b/app/assets/stylesheets/generic.scss @@ -1,6 +1,3 @@ -@import "generic/variables.scss"; -@import "generic/fonts.scss"; -@import "generic/mixins.scss"; @import "generic/avatar.scss"; @import "generic/nav.scss"; @import "generic/common.scss"; diff --git a/app/assets/stylesheets/generic/fonts.scss b/app/assets/stylesheets/main/fonts.scss index 8cc9986415c..8cc9986415c 100644 --- a/app/assets/stylesheets/generic/fonts.scss +++ b/app/assets/stylesheets/main/fonts.scss diff --git a/app/assets/stylesheets/generic/mixins.scss b/app/assets/stylesheets/main/mixins.scss index e637b645b55..e637b645b55 100644 --- a/app/assets/stylesheets/generic/mixins.scss +++ b/app/assets/stylesheets/main/mixins.scss diff --git a/app/assets/stylesheets/generic/variables.scss b/app/assets/stylesheets/main/variables.scss index aeabe7ad2e8..86b207f02cc 100644 --- a/app/assets/stylesheets/generic/variables.scss +++ b/app/assets/stylesheets/main/variables.scss @@ -1,3 +1,6 @@ +/** Override bootstrap variables **/ +$font-size-base: 13px !default; + /** * General Colors */ |