Download as
Browse Code »

Commit 2f726a11e673d1784a2887a287d5c52ec62fa720

Authored by Dmitriy Zaporozhets
2 parents 6d4f5cd9 6b068dcc
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge pull request #6775 from cirosantilli/glob-include-sass-dirs 

Include SASS in subdirectories with glob.
Showing 1 changed file with 5 additions and 50 deletions   Show diff stats
app/assets/stylesheets/application.scss
  Diff comments   View file @2f726a1
... ... @@ -12,10 +12,7 @@
12 12 *= require nprogress-bootstrap
13 13 */
14 14  
15   -@import "main/variables.scss";
16   -@import "main/mixins.scss";
17   -@import "main/fonts.scss";
18   -@import "main/layout.scss";
  15 +@import "main/*";
19 16  
20 17 /**
21 18 * Customized Twitter bootstrap
... ... @@ -31,64 +28,22 @@
31 28 /**
32 29 * Generic css (forms, nav etc):
33 30 */
34   -@import "generic/avatar.scss";
35   -@import "generic/common.scss";
36   -@import "generic/typography.scss";
37   -@import "generic/buttons.scss";
38   -@import "generic/blocks.scss";
39   -@import "generic/ui_box.scss";
40   -@import "generic/issue_box.scss";
41   -@import "generic/files.scss";
42   -@import "generic/lists.scss";
43   -@import "generic/flash.scss";
44   -@import "generic/forms.scss";
45   -@import "generic/selects.scss";
46   -@import "generic/highlight.scss";
47   -@import "generic/jquery.scss";
  31 +@import "generic/*";
48 32  
49 33 /**
50 34 * Page specific styles (issues, projects etc):
51 35 */
52   -@import "sections/header.scss";
53   -@import "sections/nav.scss";
54   -@import "sections/commits.scss";
55   -@import "sections/diff.scss";
56   -@import "sections/issues.scss";
57   -@import "sections/projects.scss";
58   -@import "sections/snippets.scss";
59   -@import "sections/votes.scss";
60   -@import "sections/merge_requests.scss";
61   -@import "sections/graph.scss";
62   -@import "sections/events.scss";
63   -@import "sections/themes.scss";
64   -@import "sections/tree.scss";
65   -@import "sections/notes.scss";
66   -@import "sections/profile.scss";
67   -@import "sections/login.scss";
68   -@import "sections/editor.scss";
69   -@import "sections/admin.scss";
70   -@import "sections/wiki.scss";
71   -@import "sections/wall.scss";
72   -@import "sections/dashboard.scss";
73   -@import "sections/stat_graph.scss";
74   -@import "sections/groups.scss";
  36 +@import "sections/*";
75 37  
76 38 /**
77 39 * Code highlight
78 40 */
79   -@import "highlight/white.scss";
80   -@import "highlight/dark.scss";
81   -@import "highlight/solarized_dark.scss";
82   -@import "highlight/monokai.scss";
  41 +@import "highlight/*";
83 42  
84 43 /**
85 44 * UI themes:
86 45 */
87   -@import "themes/ui_basic.scss";
88   -@import "themes/ui_mars.scss";
89   -@import "themes/ui_modern.scss";
90   -@import "themes/ui_gray.scss";
91   -@import "themes/ui_color.scss";
  46 +@import "themes/*";
92 47  
93 48 /**
94 49 * Styles for JS behaviors.
... ...