Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-07 11:29:25 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-07 11:29:25 +0300
commit4f3d704845c1ead8d39f49b04812305a8f8ab93a (patch)
tree5371a39373d761e66c6cff38d714cea04732e1fc /app/assets/stylesheets/application.scss
parent433b4c76fc7d23d03811fa05e1589e3a8a788e82 (diff)
Move mixins and bootstrap css to base directory
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 2f9f09b4c6f..015ff2ce4ec 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -11,12 +11,17 @@
*= require cal-heatmap
*/
-@import "main/*";
+
+@import "base/variables";
+@import "base/mixins";
+@import "base/layout";
+
/**
* Customized Twitter bootstrap
*/
-@import 'gl_bootstrap';
+@import 'base/gl_variables';
+@import 'base/gl_bootstrap';
/**
* NProgress load bar css