8000 merged branch ruimarinho/exception_css_tweaks (PR #3827) · gbenoit79/symfony@5122d68 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5122d68

Browse files
fabpotfabpot
committed
merged branch ruimarinho/exception_css_tweaks (PR symfony#3827)
Commits ------- fad114b Tweaked the exceptions layout CSS in order to display the error message even when wrapped around <pre> tags Discussion ---------- Tweaked the exceptions layout CSS in order to display the error message even when wrapped around <pre> tags Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: ![Build status](https://secure.travis-ci.org/ruimarinho/symfony.png?branch=exception_css_tweaks) Fixes the following tickets: - Todo: - Ever been in a situation when you're debugging code wrapped around `<pre>` tags and that code throws an exception? If you're familiar with this screenshot, you have :-) ![Image](http://i.imgur.com/dwxdD.png) This PR is just a little tweak to the exceptions layout CSS in order to allow your to view the exception message. It also fixes a word break when messages are too long. ![Image 2](http://i.imgur.com/whxZv.png). The build is currently failing due to an unmerged patch from the 2.0 branch.
2 parents 0e525fc + fad114b commit 5122d68

File tree

2 files changed

+19
-13
lines changed

2 files changed

+19
-13
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ build: 56
7676
padding: 5px 4px;
7777
list-style-type: decimal;
7878
margin-left: 20px;
79+
white-space: break-word;
7980
}
8081
.sf-exceptionreset #logs .traces li.error {
8182
font-style: normal;
@@ -196,7 +197,7 @@ build: 56
196197
vertical-align: middle;
197198
}
198199

199-
.sf-exceptionreset .linked ul,
200+
.sf-exceptionreset .linked ul,
200201
.sf-exceptionreset .linked li {
201202
display: inline;
202203
}
@@ -210,16 +211,16 @@ build: 56
210211
padding: 10px 0;
211212
}
212213
.sf-exceptionreset ol li {
213-
list-style: decimal;
214-
margin-left: 20px;
214+
list-style: decimal;
215+
margin-left: 20px;
215216
padding: 2px;
216217
padding-bottom: 20px;
217218
}
218219
.sf-exceptionreset ol ol li {
219-
list-style-position: inside;
220-
margin-left: 0;
221-
white-space: nowrap;
222-
font-size: 12px;
220+
list-style-position: inside;
221+
margin-left: 0;
222+
white-space: nowrap;
223+
font-size: 12px;
223224
padding-bottom: 0;
224225
}
225226
.sf-exceptionreset li .selected {

‎src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception_layout.css

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ html {
33
}
44

55
body {
6-
font: 11px Verdana, Arial, sans-serif;
6+
font: 11px Verdana, Arial, sans-serif;
77
color: #333;
88
}
99

@@ -53,15 +53,15 @@ img {
5353
}
5454

5555
.search label {
56-
line-height: 28px;
56+
line-height: 28px;
5757
vertical-align: middle;
5858
}
5959

6060
.search input {
61-
width: 188px;
62-
margin-right: 10px;
63-
font-size: 12px;
64-
border: 1px solid #dadada;
61+
width: 188px;
62+
margin-right: 10px;
63+
font-size: 12px;
64+
border: 1px solid #dadada;
6565
background: #FFFFFF url(../images/input_bg.gif) repeat-x left top;
6666
padding: 5px 6px;
6767
color: #565656;
@@ -129,3 +129,8 @@ img {
129129
width: 970px;
130130
margin: 0 auto;
131131
}
132+
133+
pre {
134+
white-space: normal;
135+
font-family: Arial, Helvetica, sans-serif;
136+
}

0 commit comments

Comments
 (0)
0