diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index c1787826..cfe51396 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -29,6 +29,6 @@ * *= require jquery-ui *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap - *= require_tree . + *= require_tree ./main *= require_self */ diff --git a/app/assets/stylesheets/fa/gl-fa.scss b/app/assets/stylesheets/fa/gl-fa.scss new file mode 100644 index 00000000..001bc336 --- /dev/null +++ b/app/assets/stylesheets/fa/gl-fa.scss @@ -0,0 +1,2 @@ +@import "font-awesome-sprockets"; +@import "font-awesome"; diff --git a/app/assets/stylesheets/bbb.scss b/app/assets/stylesheets/main/bbb.scss similarity index 100% rename from app/assets/stylesheets/bbb.scss rename to app/assets/stylesheets/main/bbb.scss diff --git a/app/assets/stylesheets/landing.scss b/app/assets/stylesheets/main/landing.scss similarity index 100% rename from app/assets/stylesheets/landing.scss rename to app/assets/stylesheets/main/landing.scss diff --git a/app/assets/stylesheets/sessions.scss b/app/assets/stylesheets/main/sessions.scss similarity index 100% rename from app/assets/stylesheets/sessions.scss rename to app/assets/stylesheets/main/sessions.scss diff --git a/app/assets/stylesheets/shared.scss b/app/assets/stylesheets/main/shared.scss similarity index 98% rename from app/assets/stylesheets/shared.scss rename to app/assets/stylesheets/main/shared.scss index b79a5f5e..0febf358 100644 --- a/app/assets/stylesheets/shared.scss +++ b/app/assets/stylesheets/main/shared.scss @@ -18,9 +18,6 @@ @import "bootstrap"; @import "bootstrap-social"; -@import "font-awesome-sprockets"; -@import "font-awesome"; - html, body { width: 100%; diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 01ef3e66..e56f0bfe 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -8,4 +8,4 @@ Rails.application.config.assets.version = '1.0' # Precompile additional assets. # 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 )