deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove main. Use application.scss instead

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-12-19 20:57:41 +02:00
parent 965102b3f6
commit 9b57bf7811
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/stylesheets/application.css
View file

@ -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
*/

10
app/assets/stylesheets/main.scss → app/assets/stylesheets/application.scss
View file

@ -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: * GitLab bootstrap:
*/ */