From 965102b3f654544adada3283dcd0fab92028f253 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 19 Dec 2012 19:02:12 +0200
Subject: [PATCH] Move mixins and variables under gitlab bootstrap

---
 app/assets/stylesheets/gitlab_bootstrap.scss                | 6 +++---
 app/assets/stylesheets/{ => gitlab_bootstrap}/fonts.scss    | 0
 app/assets/stylesheets/{ => gitlab_bootstrap}/mixins.scss   | 0
 .../stylesheets/{ => gitlab_bootstrap}/variables.scss       | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename app/assets/stylesheets/{ => gitlab_bootstrap}/fonts.scss (100%)
 rename app/assets/stylesheets/{ => gitlab_bootstrap}/mixins.scss (100%)
 rename app/assets/stylesheets/{ => gitlab_bootstrap}/variables.scss (100%)

diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss
index d2efe1fa..f53e0e50 100644
--- a/app/assets/stylesheets/gitlab_bootstrap.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap.scss
@@ -8,15 +8,15 @@ $baseLineHeight: 18px !default;
 @import "bootstrap/responsive-1200px-min";
 
 @import "font-awesome";
-@import "variables.scss";
-@import "fonts.scss";
-@import "mixins.scss";
 
 /**
  * GitLab bootstrap.
  * Overrides some styles of twitter bootstrap.
  * Also give some common classes for GitLab app
  */
+@import "gitlab_bootstrap/variables.scss";
+@import "gitlab_bootstrap/fonts.scss";
+@import "gitlab_bootstrap/mixins.scss";
 @import "gitlab_bootstrap/common.scss";
 @import "gitlab_bootstrap/typography.scss";
 @import "gitlab_bootstrap/buttons.scss";
diff --git a/app/assets/stylesheets/fonts.scss b/app/assets/stylesheets/gitlab_bootstrap/fonts.scss
similarity index 100%
rename from app/assets/stylesheets/fonts.scss
rename to app/assets/stylesheets/gitlab_bootstrap/fonts.scss
diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss
similarity index 100%
rename from app/assets/stylesheets/mixins.scss
rename to app/assets/stylesheets/gitlab_bootstrap/mixins.scss
diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/gitlab_bootstrap/variables.scss
similarity index 100%
rename from app/assets/stylesheets/variables.scss
rename to app/assets/stylesheets/gitlab_bootstrap/variables.scss