2 files changed, 28 insertions, 23 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
index bcab5959a0..9be2b65ef4 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
@@ -4,7 +4,11 @@
   <meta charset="utf-8" />
   <title>Action Controller: Exception caught</title>
   <style>
-    body { background-color: #fff; color: #333; margin: 0px}
+    body {
+      background-color: #FFF;
+      color: #333;
+      margin: 0px;
+    }
 
     body, p, ol, ul, td {
       font-family: helvetica, verdana, arial, sans-serif;
@@ -18,18 +22,17 @@
     }
 
     pre.box {
-      border: #eee solid 1px;
+      border: 1px solid #EEE;
       padding: 10px;
       margin: 0px;
       width: 958px;
     }
 
     header {
-      background: whiteSmoke;
-      filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#980905',endColorstr='#c52f24');
-      background: -webkit-gradient(linear,0% 0,0% 100%,from(#980905),to(#C52F24));
-      background: -moz-linear-gradient(270deg,#980905,#C52F24);
-      color: #fff;
+      background: #980905;
+      background: -webkit-linear-gradient(270deg, #980905, #C52F24);
+      background: linear-gradient(270deg, #980905, #C52F24);
+      color: #FFF;
       padding: 0.5em;
     }
 
@@ -41,8 +44,6 @@
 
     .details {
       border: 1px solid #E5E5E5;
-      -webkit-border-radius: 4px;
-      -moz-border-radius: 4px;
       border-radius: 4px;
       margin: 1em 0px;
       display: block;
@@ -84,7 +85,7 @@
     .source .data {
       font-size: 80%;
       overflow: auto;
-      background-color: #fff;
+      background-color: #FFF;
     }
 
     .info {
@@ -99,8 +100,12 @@
       text-align: right;
     }
 
+    .line {
+      padding-left: 10px;
+    }
+
     .line:hover {
-      background-color: #f6f6f6;
+      background-color: #F6F6F6;
     }
 
     .line.active {
@@ -109,7 +114,7 @@
 
     a { color: #980905; }
     a:visited { color: #666; }
-    a:hover { color: #C52F24;}
+    a:hover { color: #C52F24; }
   </style>
 </head>
 <body>
diff --git a/actionpack/test/template/record_tag_helper_test.rb b/actionpack/test/template/record_tag_helper_test.rb
index 1ba3e70d2c..9c49438f6a 100644
--- a/actionpack/test/template/record_tag_helper_test.rb
+++ b/actionpack/test/template/record_tag_helper_test.rb
@@ -25,33 +25,33 @@ class RecordTagHelperTest < ActionView::TestCase
 
   def test_content_tag_for
     expected = %(<li class="record_tag_post" id="record_tag_post_45"></li>)
-    actual = content_tag_for(:li, @post) { }
+    actual = content_tag_for(:li, @post)
     assert_dom_equal expected, actual
   end
 
   def test_content_tag_for_prefix
     expected = %(<ul class="archived_record_tag_post" id="archived_record_tag_post_45"></ul>)
-    actual = content_tag_for(:ul, @post, :archived) { }
+    actual = content_tag_for(:ul, @post, :archived)
     assert_dom_equal expected, actual
   end
 
   def test_content_tag_for_with_extra_html_options
     expected = %(<tr class="record_tag_post special" id="record_tag_post_45" style='background-color: #f0f0f0'></tr>)
-    actual = content_tag_for(:tr, @post, :class => "special", :style => "background-color: #f0f0f0") { }
+    actual = content_tag_for(:tr, @post, class: "special", style: "background-color: #f0f0f0")
     assert_dom_equal expected, actual
   end
 
   def test_content_tag_for_with_prefix_and_extra_html_options
     expected = %(<tr class="archived_record_tag_post special" id="archived_record_tag_post_45" style='background-color: #f0f0f0'></tr>)
-    actual = content_tag_for(:tr, @post, :archived, :class => "special", :style => "background-color: #f0f0f0") { }
+    actual = content_tag_for(:tr, @post, :archived, class: "special", style: "background-color: #f0f0f0")
     assert_dom_equal expected, actual
   end
 
   def test_block_not_in_erb_multiple_calls
     expected = %(<div class="record_tag_post special" id="record_tag_post_45">What a wonderful world!</div>)
-    actual = div_for(@post, :class => "special") { @post.body }
+    actual = div_for(@post, class: "special") { @post.body }
     assert_dom_equal expected, actual
-    actual = div_for(@post, :class => "special") { @post.body }
+    actual = div_for(@post, class: "special") { @post.body }
     assert_dom_equal expected, actual
   end
 
@@ -63,7 +63,7 @@ class RecordTagHelperTest < ActionView::TestCase
 
   def test_div_for_in_erb
     expected = %(<div class="record_tag_post special" id="record_tag_post_45">What a wonderful world!</div>)
-    actual = render_erb("<%= div_for(@post, :class => 'special') do %><%= @post.body %><% end %>")
+    actual = render_erb("<%= div_for(@post, class: 'special') do %><%= @post.body %><% end %>")
     assert_dom_equal expected, actual
   end
 
@@ -92,7 +92,7 @@ class RecordTagHelperTest < ActionView::TestCase
   end
 
   def test_content_tag_for_single_record_is_html_safe
-    result = div_for(@post, :class => "special") { @post.body }
+    result = div_for(@post, class: "special") { @post.body }
     assert result.html_safe?
   end
 
@@ -104,8 +104,8 @@ class RecordTagHelperTest < ActionView::TestCase
   end
 
   def test_content_tag_for_does_not_change_options_hash
-    options = { :class => "important" }
-    content_tag_for(:li, @post, options) { }
-    assert_equal({ :class => "important" }, options)
+    options = { class: "important" }
+    content_tag_for(:li, @post, options)
+    assert_equal({ class: "important" }, options)
   end
 end