From da587351cf74b952043e58050a2cc09c62b4f835 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 31 Dec 2013 14:58:52 +0200
Subject: [PATCH] refactor scss pt3

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/application.scss                 | 9 +++++++--
 app/assets/stylesheets/generic.scss                     | 3 ---
 app/assets/stylesheets/{generic => main}/fonts.scss     | 0
 app/assets/stylesheets/{generic => main}/mixins.scss    | 0
 app/assets/stylesheets/{generic => main}/variables.scss | 3 +++
 5 files changed, 10 insertions(+), 5 deletions(-)
 rename app/assets/stylesheets/{generic => main}/fonts.scss (100%)
 rename app/assets/stylesheets/{generic => main}/mixins.scss (100%)
 rename app/assets/stylesheets/{generic => main}/variables.scss (71%)

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
similarity index 100%
rename from app/assets/stylesheets/generic/fonts.scss
rename to app/assets/stylesheets/main/fonts.scss
diff --git a/app/assets/stylesheets/generic/mixins.scss b/app/assets/stylesheets/main/mixins.scss
similarity index 100%
rename from app/assets/stylesheets/generic/mixins.scss
rename to app/assets/stylesheets/main/mixins.scss
diff --git a/app/assets/stylesheets/generic/variables.scss b/app/assets/stylesheets/main/variables.scss
similarity index 71%
rename from app/assets/stylesheets/generic/variables.scss
rename to 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
  */
-- 
GitLab