diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-12 15:00:04 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-12 15:00:04 +0200 |
| commit | bdd477a0f800328a527f2fad92d1303441689341 (patch) | |
| tree | 11ca099bfb89ce81cd6cf88e8a92dd874b79b55d /app/assets/stylesheets/application.scss | |
| parent | cba6d62323eba2286f78e8aea12a5ecd26903728 (diff) | |
| download | gitlab-ce-bdd477a0f800328a527f2fad92d1303441689341.tar.gz | |
Re-organize GitLab css into 2 directories: framework and page specific css
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets/stylesheets/application.scss')
| -rw-r--r-- | app/assets/stylesheets/application.scss | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index d9ede637944..233e01cc06b 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -11,18 +11,10 @@ *= 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 'base/gl_bootstrap'; +@import "framework"; /** * NProgress load bar css @@ -32,24 +24,12 @@ /** * Font icons - * */ @import "font-awesome"; /** - * UI themes: - */ -@import "themes/**/*"; - -/** - * Generic css (forms, nav etc): - */ -@import "generic/**/*"; - -/** * Page specific styles (issues, projects etc): */ - @import "pages/**/*"; /** @@ -61,9 +41,3 @@ * Styles for JS behaviors. */ @import "behaviors.scss"; - -/** - * CI specific styles: - */ -@import "ci/**/*"; - |