Move all css to application.css for precompilation.

judy-zz · Feb 10, 2014 · 34f7bca · 34f7bca
1 parent 447f153
commit 34f7bca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/app/assets/stylesheets/application.css b/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
  */
diff --git a/app/views/layouts/application.html.haml b/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