Commit 9b57bf78112017072ff3303946f9f2129a015cba
1 parent
965102b3
Exists in
master
and in
4 other branches
Remove main. Use application.scss instead
Showing
3 changed files
with
47 additions
and
47 deletions
Show diff stats
app/assets/stylesheets/application.css
| ... | ... | @@ -1,10 +0,0 @@ |
| 1 | -/* | |
| 2 | - * This is a manifest file that'll automatically include all the stylesheets available in this directory | |
| 3 | - * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at | |
| 4 | - * the top of the compiled file, but it's generally better to create a new file per style scope. | |
| 5 | - *= require jquery.ui.gitlab | |
| 6 | - *= require jquery.atwho | |
| 7 | - *= require chosen | |
| 8 | - *= require_self | |
| 9 | - *= require main | |
| 10 | -*/ |
| ... | ... | @@ -0,0 +1,47 @@ |
| 1 | +/* | |
| 2 | + * This is a manifest file that'll automatically include all the stylesheets available in this directory | |
| 3 | + * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at | |
| 4 | + * the top of the compiled file, but it's generally better to create a new file per style scope. | |
| 5 | + *= require jquery.ui.gitlab | |
| 6 | + *= require jquery.atwho | |
| 7 | + *= require chosen | |
| 8 | + *= require_self | |
| 9 | +*/ | |
| 10 | + | |
| 11 | +/** | |
| 12 | + * GitLab bootstrap: | |
| 13 | + */ | |
| 14 | +@import "gitlab_bootstrap.scss"; | |
| 15 | + | |
| 16 | +@import "common.scss"; | |
| 17 | +@import "ref_select.scss"; | |
| 18 | + | |
| 19 | +@import "sections/header.scss"; | |
| 20 | +@import "sections/nav.scss"; | |
| 21 | +@import "sections/commits.scss"; | |
| 22 | +@import "sections/issues.scss"; | |
| 23 | +@import "sections/projects.scss"; | |
| 24 | +@import "sections/snippets.scss"; | |
| 25 | +@import "sections/votes.scss"; | |
| 26 | +@import "sections/merge_requests.scss"; | |
| 27 | +@import "sections/graph.scss"; | |
| 28 | +@import "sections/events.scss"; | |
| 29 | +@import "sections/themes.scss"; | |
| 30 | +@import "sections/tree.scss"; | |
| 31 | +@import "sections/notes.scss"; | |
| 32 | +@import "sections/profile.scss"; | |
| 33 | +@import "sections/login.scss"; | |
| 34 | +@import "sections/editor.scss"; | |
| 35 | + | |
| 36 | +@import "highlight/white.scss"; | |
| 37 | +@import "highlight/dark.scss"; | |
| 38 | + | |
| 39 | +/** | |
| 40 | + * UI themes: | |
| 41 | + */ | |
| 42 | +@import "themes/ui_basic.scss"; | |
| 43 | +@import "themes/ui_mars.scss"; | |
| 44 | +@import "themes/ui_modern.scss"; | |
| 45 | +@import "themes/ui_gray.scss"; | |
| 46 | +@import "themes/ui_color.scss"; | |
| 47 | + | ... | ... |
app/assets/stylesheets/main.scss
| ... | ... | @@ -1,37 +0,0 @@ |
| 1 | -/** | |
| 2 | - * GitLab bootstrap: | |
| 3 | - */ | |
| 4 | -@import "gitlab_bootstrap.scss"; | |
| 5 | - | |
| 6 | -@import "common.scss"; | |
| 7 | -@import "ref_select.scss"; | |
| 8 | - | |
| 9 | -@import "sections/header.scss"; | |
| 10 | -@import "sections/nav.scss"; | |
| 11 | -@import "sections/commits.scss"; | |
| 12 | -@import "sections/issues.scss"; | |
| 13 | -@import "sections/projects.scss"; | |
| 14 | -@import "sections/snippets.scss"; | |
| 15 | -@import "sections/votes.scss"; | |
| 16 | -@import "sections/merge_requests.scss"; | |
| 17 | -@import "sections/graph.scss"; | |
| 18 | -@import "sections/events.scss"; | |
| 19 | -@import "sections/themes.scss"; | |
| 20 | -@import "sections/tree.scss"; | |
| 21 | -@import "sections/notes.scss"; | |
| 22 | -@import "sections/profile.scss"; | |
| 23 | -@import "sections/login.scss"; | |
| 24 | -@import "sections/editor.scss"; | |
| 25 | - | |
| 26 | -@import "highlight/white.scss"; | |
| 27 | -@import "highlight/dark.scss"; | |
| 28 | - | |
| 29 | -/** | |
| 30 | - * UI themes: | |
| 31 | - */ | |
| 32 | -@import "themes/ui_basic.scss"; | |
| 33 | -@import "themes/ui_mars.scss"; | |
| 34 | -@import "themes/ui_modern.scss"; | |
| 35 | -@import "themes/ui_gray.scss"; | |
| 36 | -@import "themes/ui_color.scss"; | |
| 37 | - |