Commit bdd477a0 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Re-organize GitLab css into 2 directories: framework and page specific css

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent cba6d623
...@@ -11,18 +11,10 @@ ...@@ -11,18 +11,10 @@
*= require cal-heatmap *= require cal-heatmap
*/ */
@import "base/fonts";
@import "base/variables";
@import "base/mixins";
@import "base/layout";
/** /**
* Customized Twitter bootstrap * GitLab UI framework
*/ */
@import 'base/gl_variables'; @import "framework";
@import 'base/gl_bootstrap';
/** /**
* NProgress load bar css * NProgress load bar css
...@@ -32,24 +24,12 @@ ...@@ -32,24 +24,12 @@
/** /**
* Font icons * Font icons
*
*/ */
@import "font-awesome"; @import "font-awesome";
/**
* UI themes:
*/
@import "themes/**/*";
/**
* Generic css (forms, nav etc):
*/
@import "generic/**/*";
/** /**
* Page specific styles (issues, projects etc): * Page specific styles (issues, projects etc):
*/ */
@import "pages/**/*"; @import "pages/**/*";
/** /**
...@@ -61,9 +41,3 @@ ...@@ -61,9 +41,3 @@
* Styles for JS behaviors. * Styles for JS behaviors.
*/ */
@import "behaviors.scss"; @import "behaviors.scss";
/**
* CI specific styles:
*/
@import "ci/**/*";
@import "framework/fonts";
@import "framework/variables";
@import "framework/mixins";
@import "framework/layout";
@import 'framework/gl_variables';
@import 'framework/gl_bootstrap';
@import "framework/avatar.scss";
@import "framework/blocks.scss";
@import "framework/buttons.scss";
@import "framework/calendar.scss";
@import "framework/callout.scss";
@import "framework/common.scss";
@import "framework/files.scss";
@import "framework/filters.scss";
@import "framework/flash.scss";
@import "framework/forms.scss";
@import "framework/gfm.scss";
@import "framework/gitlab-theme.scss";
@import "framework/header.scss";
@import "framework/highlight.scss";
@import "framework/issue_box.scss";
@import "framework/jquery.scss";
@import "framework/lists.scss";
@import "framework/markdown_area.scss";
@import "framework/mobile.scss";
@import "framework/pagination.scss";
@import "framework/selects.scss";
@import "framework/sidebar.scss";
@import "framework/tables.scss";
@import "framework/timeline.scss";
@import "framework/typography.scss";
@import "framework/zen.scss";
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