Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-06-05 22:45:46 +0300
committerRobert Speicher <rspeicher@gmail.com>2015-06-14 00:58:16 +0300
commit658b42b1fa79c77b1acef67a645b36a2928a71bd (patch)
tree5baa871a6d41bfc3910f4196340ec27ae4e4bb10 /app/assets/stylesheets/application.scss
parent0c0c31ff34b3010c2c269ec56ef48dd305c6f74a (diff)
Consolidate theme stylesheets into one
Since they're all defined by a mixin, it didn't provide any benefit to have them in separate files. This also adds variables defining the basic color of each theme so we can re-use them in the previews.
Diffstat (limited to 'app/assets/stylesheets/application.scss')
-rw-r--r--app/assets/stylesheets/application.scss16
1 files changed, 8 insertions, 8 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 015ff2ce4ec..1a5f11df7d1 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -36,25 +36,25 @@
@import "font-awesome";
/**
+ * UI themes:
+ */
+@import "themes/**/*";
+
+/**
* Generic css (forms, nav etc):
*/
-@import "generic/*";
+@import "generic/**/*";
/**
* Page specific styles (issues, projects etc):
*/
-@import "pages/*";
+@import "pages/**/*";
/**
* Code highlight
*/
-@import "highlight/*";
-
-/**
- * UI themes:
- */
-@import "themes/*";
+@import "highlight/**/*";
/**
* Styles for JS behaviors.