aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorGosha Arinich <me@goshakkk.name>2013-01-03 10:55:56 +0300
committerGosha Arinich <me@goshakkk.name>2013-01-03 17:21:35 +0300
commitd7d45785e506d68b9612fc597b4758b44750941d (patch)
treee2277db09b25a347d4fd9fe0141c6a06e6306a15 /actionpack
parentef61504c6ea4c282cf85ab54797ff708ec6031c9 (diff)
downloadrails-d7d45785e506d68b9612fc597b4758b44750941d.tar.gz
rails-d7d45785e506d68b9612fc597b4758b44750941d.tar.bz2
rails-d7d45785e506d68b9612fc597b4758b44750941d.zip
fix env toggling, improve error page styling
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb2
-rw-r--r--actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb20
2 files changed, 10 insertions, 12 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
index 4020d45cf3..fbb47f60a2 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
@@ -26,7 +26,7 @@
</div>
<div class="details">
- <div class="summary"><a href="#" onclick="s = document.getElementById('env_dump').style; s.display=='block' ? s.display = s.display == 'none' ? 'block' : 'none'; return false;">Toggle env dump</a></div>
+ <div class="summary"><a href="#" onclick="s = document.getElementById('env_dump').style; s.display = s.display == 'none' ? 'block' : 'none'; return false;">Toggle env dump</a></div>
<div id="env_dump" style="display:none"><pre><%= debug_hash @request.env.slice(*@request.class::ENV_METHODS) %></pre></div>
</div>
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
index 9be2b65ef4..ff33430532 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
@@ -5,7 +5,7 @@
<title>Action Controller: Exception caught</title>
<style>
body {
- background-color: #FFF;
+ background-color: #FAFAFA;
color: #333;
margin: 0px;
}
@@ -29,21 +29,18 @@
}
header {
- background: #980905;
- background: -webkit-linear-gradient(270deg, #980905, #C52F24);
- background: linear-gradient(270deg, #980905, #C52F24);
- color: #FFF;
- padding: 0.5em;
+ color: #F0F0F0;
+ background: #C52F24;
+ padding: 0.5em 1.5em;
}
h2 {
color: #C52F24;
- padding: 2px;
line-height: 25px;
}
.details {
- border: 1px solid #E5E5E5;
+ border: 1px solid #D0D0D0;
border-radius: 4px;
margin: 1em 0px;
display: block;
@@ -52,7 +49,7 @@
.summary {
padding: 8px 15px;
- border-bottom: 1px solid #E5E5E5;
+ border-bottom: 1px solid #D0D0D0;
display: block;
}
@@ -62,8 +59,9 @@
}
#container {
- margin: auto;
- width: 98%;
+ box-sizing: border-box;
+ width: 100%;
+ padding: 0 1.5em;
}
.source * {