summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-19 20:57:41 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-19 20:57:41 +0200
commit9b57bf78112017072ff3303946f9f2129a015cba (patch)
tree8edda12487096f15923a225f8724ee06ab3feee9
parent965102b3f654544adada3283dcd0fab92028f253 (diff)
downloadgitlab-ce-9b57bf78112017072ff3303946f9f2129a015cba.tar.gz
Remove main. Use application.scss instead
-rw-r--r--app/assets/stylesheets/application.css10
-rw-r--r--app/assets/stylesheets/application.scss (renamed from app/assets/stylesheets/main.scss)10
2 files changed, 10 insertions, 10 deletions
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
deleted file mode 100644
index a23d4532915..00000000000
--- a/app/assets/stylesheets/application.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
- * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
- * the top of the compiled file, but it's generally better to create a new file per style scope.
- *= require jquery.ui.gitlab
- *= require jquery.atwho
- *= require chosen
- *= require_self
- *= require main
-*/
diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/application.scss
index e74bc9d15cb..54690e73f81 100644
--- a/app/assets/stylesheets/main.scss
+++ b/app/assets/stylesheets/application.scss
@@ -1,3 +1,13 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require jquery.ui.gitlab
+ *= require jquery.atwho
+ *= require chosen
+ *= require_self
+*/
+
/**
* GitLab bootstrap:
*/