lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

reorganize stylesheet directory structure

Browse Source
This commit is contained in:
Zachary Chai
2017-02-09 11:26:49 -05:00
parent abe532afcf
commit 6c374bd0c0
7 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/application.css
View File

@@ -29,6 +29,6 @@
* *
*= require jquery-ui *= require jquery-ui
*= require dataTables/bootstrap/3/jquery.dataTables.bootstrap *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
*= require_tree . *= require_tree ./main
*= require_self *= require_self
*/ */

2
app/assets/stylesheets/fa/gl-fa.scss Normal file
View File

@@ -0,0 +1,2 @@
@import "font-awesome-sprockets";
@import "font-awesome";

0
app/assets/stylesheets/bbb.scss → app/assets/stylesheets/main/bbb.scss
View File

0
app/assets/stylesheets/landing.scss → app/assets/stylesheets/main/landing.scss
View File

0
app/assets/stylesheets/sessions.scss → app/assets/stylesheets/main/sessions.scss
View File

3
app/assets/stylesheets/shared.scss → app/assets/stylesheets/main/shared.scss
View File

@@ -18,9 +18,6 @@
@import "bootstrap"; @import "bootstrap";
@import "bootstrap-social"; @import "bootstrap-social";
@import "font-awesome-sprockets";
@import "font-awesome";
html, body { html, body {
width: 100%; width: 100%;

2
config/initializers/assets.rb
View File

@@ -8,4 +8,4 @@ Rails.application.config.assets.version = '1.0'
# Precompile additional assets. # Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added. # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
# Rails.application.config.assets.precompile += %w( search.js ) Rails.application.config.assets.precompile += %w( fa/gl-fa.css )