Permalink
Browse files

Move all css to application.css for precompilation.

  • Loading branch information...
1 parent 447f153 commit 34f7bcad370964446199998bbf96c0015fa6c7ec @judy committed Feb 10, 2014
Showing with 5 additions and 6 deletions.
  1. +5 −1 app/assets/stylesheets/application.css
  2. +0 −5 app/views/layouts/application.html.haml
View
6 app/assets/stylesheets/application.css
@@ -9,5 +9,9 @@
* compiled file, but it's generally better to create a new file per style scope.
*
*= require_self
- *= require_tree .
+ *= require bootstrap.min
+ *= require bootstrap-responsive.min
+ *= require colorbox
+ *= require font-awesome.min
+ *= require main
*/
View
5 app/views/layouts/application.html.haml
@@ -6,12 +6,7 @@
%meta{content: "IE=edge", "http-equiv" => "X-UA-Compatible"}/
%meta{content: "A hackerspace/makerspace located in State College, PA.", name: "description"}/
%meta{content: "width=device-width, initial-scale=1", name: "viewport"}/
- = stylesheet_link_tag "bootstrap.min", media: "screen", "data-turbolinks-track" => true
- = stylesheet_link_tag "bootstrap-responsive.min", media: "screen", "data-turbolinks-track" => true
- = stylesheet_link_tag "colorbox", media: "all", "data-turbolinks-track" => true
= stylesheet_link_tag "http://fonts.googleapis.com/css?family=Open+Sans:400,800,700,300,600,400italic&subset=latin,cyrillic"
- = stylesheet_link_tag "main", media: "all", "data-turbolinks-track" => true
- = stylesheet_link_tag "font-awesome.min", media: "all", "data-turbolinks-track" => true
= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true
= csrf_meta_tags
%body

0 comments on commit 34f7bca

Please sign in to comment.