diff options
| -rw-r--r-- | app/assets/stylesheets/application.css | 10 | ||||
| -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: */ |