rails 3.1 and designs (with bug)

This commit is contained in:
Matthew Fu committed 2011-07-12 16:00:57 +08:00
1 parent 7215b56f7e
commit f387139ae1
687 files changed
+137 -129308

No files matched your search

+2 -1
View File
@@ -1,3 +1,4 @@
<% content_for :sidebar do %>
<%= render 'admin/items/site_map_left_bar' %>
<% end -%>
@@ -21,4 +22,4 @@
}
</style> -->
<% end %>
<%= render "admin/#{@item._type.downcase.pluralize}/show" %>
<%= render "admin/#{@item._type.downcase.pluralize}/show" %>
+2 -2
View File
@@ -5,8 +5,8 @@
<title>R4</title>
<link rel="shortcut icon" href="/favicon.ico">
<%= yield :page_specific_link %>
<%= stylesheet_link_tag "easy", "main", "devise", :media => "screen, projection" %>
<%= stylesheet_link_tag "easyprint", :media => "print" %>
<%= stylesheet_link_tag "rulingcom/easy", :media => "screen, projection" %>
<%= stylesheet_link_tag "rulingcom/easyprint", :media => "print" %>
<%= javascript_include_tag :defaults %>
<!--[if IE]>
<%= stylesheet_link_tag "ie", :media => "screen, projection" %>
+1 -1
View File
@@ -44,4 +44,4 @@
"application", :cache => 'all' %>
<%= yield :page_specific_javascript %>
</body>
</html>
</html>
+3 -3
View File
@@ -5,9 +5,9 @@
<title>R4</title>
<link rel="shortcut icon" href="/favicon.ico">
<%= yield :page_specific_link %>
<%= stylesheet_link_tag "easy", "main", "devise", :media => "screen, projection" %>
<%= stylesheet_link_tag "easyprint", :media => "print" %>
<%= javascript_include_tag :defaults %>
<%= stylesheet_link_tag "rulingcom/easy", :media => "screen, projection" %>
<%= stylesheet_link_tag "rulingcom/easyprint", :media => "print" %>
<%= stylesheet_link_tag "application", :media => "screen, projection" %>
<!--[if IE]>
<%= stylesheet_link_tag "ie", :media => "screen, projection" %>
<![endif]-->