summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/application.scss
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-31 14:58:52 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-31 14:58:52 +0200
commitda587351cf74b952043e58050a2cc09c62b4f835 (patch)
tree4989e2af9c127d3f49070f1005ec64010d189e90 /app/assets/stylesheets/application.scss
parentda41efcfa5df54469805fa7bf1e178d5f8330bd0 (diff)
downloadgitlab-ce-da587351cf74b952043e58050a2cc09c62b4f835.tar.gz
refactor scss pt3
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets/stylesheets/application.scss')
-rw-r--r--app/assets/stylesheets/application.scss9
1 files changed, 7 insertions, 2 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";