Untitled

Index: app/models/theme.rb
===================================================================
--- app/models/theme.rb	(revision 2075)
+++ app/models/theme.rb	(revision 2076)
@@ -43,13 +43,6 @@
   def border_color
     handle_native(:border_color, "EFEFEF")
   end
-
-  # This will eventually become a first-class property and take over outer_background_color.
-  # For now we derive it from outer_background_color by prepending a # if it's a 6-digit hex code.
-  def outer_background
-    color = outer_background_color.strip
-    color.match('^[\dA-Fa-f]{6}$') ? "##{color}" : color
-  end

 private

Index: app/views/layouts/raw.erb
===================================================================
--- app/views/layouts/raw.erb	(revision 2075)
+++ app/views/layouts/raw.erb	(revision 2076)
@@ -2,8 +2,6 @@
 <head>
 	<%#= javascript_include_tag "prototype", "effects", "controls", "dragdrop", "application" %>
 	<%= stylesheet_link_tag "raw" %>
-	<%= yield :inline_styles %>
-</head>
 <body>
   <%= yield %>
 </body>
Index: app/views/layouts/application.erb
===================================================================
--- app/views/layouts/application.erb	(revision 2075)
+++ app/views/layouts/application.erb	(revision 2076)
@@ -19,7 +19,6 @@
 		<%#= active_scaffold_includes if @controller.class == MimiServiceController %>

 		<%= yield :head %>
-		<%= yield :inline_styles %>
 	</head>
 	<body class="application <%= yield :body_class %>">
 	<div id="masthead">
Index: app/views/promotion_styles/_theme.html.erb
===================================================================
--- app/views/promotion_styles/_theme.html.erb	(revision 2075)
+++ app/views/promotion_styles/_theme.html.erb	(revision 2076)
@@ -2,7 +2,7 @@

 <% unless theme.outer_background_color.blank? %>
 body<%= theme_class %> {
-  background: <%= theme.outer_background %>;
+  background-color: #<%= theme.outer_background_color %>;
   }
 <% end %>

Index: app/views/promotions/templates/_layout.erb
===================================================================
--- app/views/promotions/templates/_layout.erb	(revision 2075)
+++ app/views/promotions/templates/_layout.erb	(revision 2076)
@@ -2,7 +2,6 @@
 <%# end %>
 <%# Since this is used from an email, do not use partials inside it.  --Dave %>

-<% content_for :inline_styles do %>
 <style type="text/css">

 * #madmimi_outer_wrapper div,
@@ -312,7 +311,6 @@
 <%= yield :custom_styles %>

 </style>
-<% end %>

 <% content_for :body_class do %>madmimi_theme_<%= @promotion.grab_theme.id %><% end %>