1 files changed, 58 insertions, 18 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..e0509f56f4 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: #FAFAFA;
+      color: #333;
+      margin: 0px;
+    }
 
     body, p, ol, ul, td {
       font-family: helvetica, verdana, arial, sans-serif;
@@ -18,31 +22,31 @@
     }
 
     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;
-      padding: 0.5em;
+      color: #F0F0F0;
+      background: #C52F24;
+      padding: 0.5em 1.5em;
+    }
+
+    h1 {
+      margin: 0.2em 0;
+      line-height: 1.1em;
+      font-size: 2em;
     }
 
     h2 {
       color: #C52F24;
-      padding: 2px;
       line-height: 25px;
     }
 
     .details {
-      border: 1px solid #E5E5E5;
-      -webkit-border-radius: 4px;
-      -moz-border-radius: 4px;
+      border: 1px solid #D0D0D0;
       border-radius: 4px;
       margin: 1em 0px;
       display: block;
@@ -51,7 +55,7 @@
 
     .summary {
       padding: 8px 15px;
-      border-bottom: 1px solid #E5E5E5;
+      border-bottom: 1px solid #D0D0D0;
       display: block;
     }
 
@@ -61,8 +65,9 @@
     }
 
     #container {
-      margin: auto;
-      width: 98%;
+      box-sizing: border-box;
+      width: 100%;
+      padding: 0 1.5em;
     }
 
     .source * {
@@ -84,7 +89,7 @@
     .source .data {
       font-size: 80%;
       overflow: auto;
-      background-color: #fff;
+      background-color: #FFF;
     }
 
     .info {
@@ -99,18 +104,53 @@
       text-align: right;
     }
 
+    .line {
+      padding-left: 10px;
+    }
+
     .line:hover {
-      background-color: #f6f6f6;
+      background-color: #F6F6F6;
     }
 
     .line.active {
       background-color: #FFCCCC;
     }
 
+    .hidden {
+      display: none;
+    }
+
     a { color: #980905; }
     a:visited { color: #666; }
-    a:hover { color: #C52F24;}
+    a.trace-frames { color: #666; }
+    a:hover { color: #C52F24; }
+    a.trace-frames.selected { color: #C52F24 }
+
+    <%= yield :style %>
   </style>
+
+  <script>
+    var toggle = function(id) {
+      var s = document.getElementById(id).style;
+      s.display = s.display == 'none' ? 'block' : 'none';
+      return false;
+    }
+    var show = function(id) {
+      document.getElementById(id).style.display = 'block';
+    }
+    var hide = function(id) {
+      document.getElementById(id).style.display = 'none';
+    }
+    var toggleTrace = function() {
+      return toggle('blame_trace');
+    }
+    var toggleSessionDump = function() {
+      return toggle('session_dump');
+    }
+    var toggleEnvDump = function() {
+      return toggle('env_dump');
+    }
+  </script>
 </head>
 <body>