app/views/layouts/_head.html.erb in endymion-origami-0.1.3 vs app/views/layouts/_head.html.erb in endymion-origami-0.1.4

- old
+ new

@@ -13,11 +13,17 @@ <% if defined?(WIDTH) -%> <meta name = "viewport" content = "width = <%= WIDTH %>"/> <% end -%> <meta name="robots" content="index, follow" /> -<%= stylesheet_link_tag 'screen', :media => 'screen, projection' %> -<%= stylesheet_link_tag 'style', :media => 'screen, projection' %> -<%= stylesheet_link_tag 'print', :media => 'print' %> +<%= render :partial => 'layouts/stylesheets', :locals => { :layout => layout } %> +<% theme = THEME if defined?(THEME) + theme = @theme unless @theme.nil? + if theme.nil? -%> +<% else -%> +<%= stylesheet_link_tag "layouts/#{layout}" %> +<%= stylesheet_link_tag theme %> +<% end -%> <%= render :partial => 'layouts/javascript_includes' %> + </head> \ No newline at end of file