Commit 4f3d7048 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Move mixins and bootstrap css to base directory

parent 433b4c76
...@@ -11,12 +11,17 @@ ...@@ -11,12 +11,17 @@
*= require cal-heatmap *= require cal-heatmap
*/ */
@import "main/*";
@import "base/variables";
@import "base/mixins";
@import "base/layout";
/** /**
* Customized Twitter bootstrap * Customized Twitter bootstrap
*/ */
@import 'gl_bootstrap'; @import 'base/gl_variables';
@import 'base/gl_bootstrap';
/** /**
* NProgress load bar css * NProgress load bar css
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
* Twitter bootstrap with GitLab customizations/additions * Twitter bootstrap with GitLab customizations/additions
* *
*/ */
@import "gl_variables";
// Core variables and mixins // Core variables and mixins
@import "bootstrap/variables"; @import "bootstrap/variables";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment