Skip to content

Commit 0b03d1a

Browse files
committed
merged branch Tobion/patch-3 (PR #2415)
Commits ------- ae342c7 unified toolbar.css a7e4e70 unified profiler.css 09fe09e unified and corrected exception_layout.css 3a1674b unified and corrected exception.css Discussion ---------- Unified and corrected CSS markup Unified (spaces, braces, quotes, indention) and corrected (missing semicolon) the CSS markup. Did not change any semantic, only markup! @fabpot: New pull based on symfony:2.0 and changed formatting style as agreed in #2405
2 parents 9185af9 + ba982ac commit 0b03d1a

File tree

2 files changed

+186
-263
lines changed

2 files changed

+186
-263
lines changed

Resources/public/css/exception.css

Lines changed: 130 additions & 177 deletions
Original file line numberDiff line numberDiff line change
@@ -8,266 +8,219 @@ build: 56
88
.sf-exceptionreset html{color:#000;background:#FFF;}.sf-exceptionreset body,.sf-exceptionreset div,.sf-exceptionreset dl,.sf-exceptionreset dt,.sf-exceptionreset dd,.sf-exceptionreset ul,.sf-exceptionreset ol,.sf-exceptionreset li,.sf-exceptionreset h1,.sf-exceptionreset h2,.sf-exceptionreset h3,.sf-exceptionreset h4,.sf-exceptionreset h5,.sf-exceptionreset h6,.sf-exceptionreset pre,.sf-exceptionreset code,.sf-exceptionreset form,.sf-exceptionreset fieldset,.sf-exceptionreset legend,.sf-exceptionreset input,.sf-exceptionreset textarea,.sf-exceptionreset p,.sf-exceptionreset blockquote,.sf-exceptionreset th,.sf-exceptionreset td{margin:0;padding:0;}.sf-exceptionreset table{border-collapse:collapse;border-spacing:0;}.sf-exceptionreset fieldset,.sf-exceptionreset img{border:0;}.sf-exceptionreset address,.sf-exceptionreset caption,.sf-exceptionreset cite,.sf-exceptionreset code,.sf-exceptionreset dfn,.sf-exceptionreset em,.sf-exceptionreset strong,.sf-exceptionreset th,.sf-exceptionreset var{font-style:normal;font-weight:normal;}.sf-exceptionreset li{list-style:none;}.sf-exceptionreset caption,.sf-exceptionreset th{text-align:left;}.sf-exceptionreset h1,.sf-exceptionreset h2,.sf-exceptionreset h3,.sf-exceptionreset h4,.sf-exceptionreset h5,.sf-exceptionreset h6{font-size:100%;font-weight:normal;}.sf-exceptionreset q:before,.sf-exceptionreset q:after{content:'';}.sf-exceptionreset abbr,.sf-exceptionreset acronym{border:0;font-variant:normal;}.sf-exceptionreset sup{vertical-align:text-top;}.sf-exceptionreset sub{vertical-align:text-bottom;}.sf-exceptionreset input,.sf-exceptionreset textarea,.sf-exceptionreset select{font-family:inherit;font-size:inherit;font-weight:inherit;}.sf-exceptionreset input,.sf-exceptionreset textarea,.sf-exceptionreset select{*font-size:100%;}.sf-exceptionreset legend{color:#000;}
99

1010
.sf-exceptionreset html,
11-
.sf-exceptionreset body
12-
{
13-
width:100%;
14-
min-height:100%;
15-
_height:100%;
16-
margin:0;
17-
padding:0;
18-
}
19-
.sf-exceptionreset body
20-
{
21-
font: 1em "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;;
22-
text-align:left;
23-
background-color:#efefef;
24-
}
25-
.sf-exceptionreset abbr
26-
{
11+
.sf-exceptionreset body {
12+
width: 100%;
13+
min-height: 100%;
14+
_height: 100%;
15+
margin: 0;
16+
padding: 0;
17+
}
18+
.sf-exceptionreset body {
19+
font: 1em "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
20+
text-align: left;
21+
background-color: #efefef;
22+
}
23+
24+
.sf-exceptionreset abbr {
2725
border-bottom: 1px dotted #000;
2826
cursor: help;
2927
}
30-
.sf-exceptionreset p
31-
{
32-
font-size:14px;
33-
line-height:20px;
34-
color:#868686;
35-
padding-bottom:20px
28+
29+
.sf-exceptionreset p {
30+
font-size: 14px;
31+
line-height: 20px;
32+
color: #868686;
33+
padding-bottom: 20px;
3634
}
3735

38-
.sf-exceptionreset strong
39-
{
40-
color:#313131;
41-
font-weight:bold;
36+
.sf-exceptionreset strong {
37+
color: #313131;
38+
font-weight: bold;
4239
}
4340

44-
.sf-exceptionreset a
45-
{
46-
color:#6c6159;
41+
.sf-exceptionreset a {
42+
color: #6c6159;
4743
}
48-
.sf-exceptionreset a img
49-
{
50-
border:none;
44+
.sf-exceptionreset a img {
45+
border: none;
5146
}
52-
.sf-exceptionreset a:hover
53-
{
54-
text-decoration:underline;
47+
.sf-exceptionreset a:hover {
48+
text-decoration: underline;
5549
}
5650

57-
.sf-exceptionreset em
58-
{
59-
font-style:italic;
51+
.sf-exceptionreset em {
52+
font-style: italic;
6053
}
6154

6255
.sf-exceptionreset h2,
63-
.sf-exceptionreset h3
64-
{
65-
font-weight:bold;
56+
.sf-exceptionreset h3 {
57+
font-weight: bold;
6658
}
67-
68-
.sf-exceptionreset h1
69-
{
70-
font-family:Georgia, "Times New Roman", Times, serif;
59+
.sf-exceptionreset h1 {
60+
font-family: Georgia, "Times New Roman", Times, serif;
7161
font-size: 20px;
72-
color:#313131;
62+
color: #313131;
7363
}
7464

75-
.sf-exceptionreset li
76-
{
77-
padding-bottom:10px;
65+
.sf-exceptionreset li {
66+
padding-bottom: 10px;
7867
}
7968

80-
.sf-exceptionreset .traces
81-
{
82-
padding-bottom:14px;
69+
.sf-exceptionreset .traces {
70+
padding-bottom: 14px;
8371
}
84-
85-
.sf-exceptionreset .traces li
86-
{
87-
font-size:12px;
88-
color:#868686;
72+
.sf-exceptionreset .traces li {
73+
font-size: 12px;
74+
color: #868686;
8975
padding: 5px 4px;
90-
list-style-type:decimal;
91-
margin-left:20px;
76+
list-style-type: decimal;
77+
margin-left: 20px;
9278
}
93-
94-
.sf-exceptionreset #logs .traces li.error
95-
{
96-
font-style:normal;
97-
color:#AA3333;
98-
background:#f9ecec;
79+
.sf-exceptionreset #logs .traces li.error {
80+
font-style: normal;
81+
color: #AA3333;
82+
background: #f9ecec;
9983
}
100-
10184
/* fix for Opera not liking empty <li> */
10285
.sf-exceptionreset .traces li:after {
103-
content: '\00A0'
86+
content: "\00A0";
10487
}
10588

106-
.sf-exceptionreset .trace
107-
{
108-
border:1px solid #D3D3D3;
109-
padding:10px;
110-
overflow:auto;
111-
margin:10px 0 20px;
89+
.sf-exceptionreset .trace {
90+
border: 1px solid #D3D3D3;
91+
padding: 10px;
92+
overflow: auto;
93+
margin: 10px 0 20px;
11294
}
11395

11496
.sf-exceptionreset .block,
115-
.sf-exceptionreset .block_exception
116-
{
117-
-moz-border-radius:16px;
118-
-webkit-border-radius:16px;
119-
border-radius:16px;
120-
margin-bottom:20px;
121-
}
122-
.sf-exceptionreset .block
123-
{
124-
background-color:#FFFFFF;
125-
border:1px solid #dfdfdf;
126-
padding:40px 50px;
97+
.sf-exceptionreset .block_exception {
98+
-moz-border-radius: 16px;
99+
-webkit-border-radius: 16px;
100+
border-radius: 16px;
101+
margin-bottom: 20px;
127102
}
128-
129-
.sf-exceptionreset .block_exception
130-
{
131-
background-color:#f6f6f6;
132-
border:1px solid #dfdfdf;
133-
padding:30px 28px;
103+
.sf-exceptionreset .block {
104+
background-color: #FFFFFF;
105+
border: 1px solid #dfdfdf;
106+
padding: 40px 50px;
134107
}
135-
136-
.sf-exceptionreset .block_exception div
137-
{
138-
color:#313131;
139-
font-size:10px;
108+
.sf-exceptionreset .block_exception {
109+
background-color: #f6f6f6;
110+
border: 1px solid #dfdfdf;
111+
padding: 30px 28px;
112+
}
113+
.sf-exceptionreset .block_exception div {
114+
color: #313131;
115+
font-size: 10px;
140116
}
141117

142118
.sf-exceptionreset .block_exception_detected .illustration_exception,
143-
.sf-exceptionreset .block_exception_detected .text_exception
144-
{
145-
float:left;
119+
.sf-exceptionreset .block_exception_detected .text_exception {
120+
float: left;
146121
}
147-
.sf-exceptionreset .block_exception_detected .illustration_exception
148-
{
149-
width:152px;
122+
.sf-exceptionreset .block_exception_detected .illustration_exception {
123+
width: 152px;
150124
}
151-
.sf-exceptionreset .block_exception_detected .text_exception
152-
{
153-
width:670px;
125+
.sf-exceptionreset .block_exception_detected .text_exception {
126+
width: 670px;
154127
padding: 30px 44px 24px 46px;
155-
position:relative;
128+
position: relative;
156129
}
130+
157131
.sf-exceptionreset .text_exception .open_quote,
158-
.sf-exceptionreset .text_exception .close_quote
159-
{
160-
position:absolute;
132+
.sf-exceptionreset .text_exception .close_quote {
133+
position: absolute;
161134
}
162-
163-
.sf-exceptionreset .open_quote
164-
{
165-
top:0;
166-
left:0;
135+
.sf-exceptionreset .open_quote {
136+
top: 0;
137+
left: 0;
167138
}
168-
169-
.sf-exceptionreset .close_quote
170-
{
171-
bottom:0;
172-
right:50px;
139+
.sf-exceptionreset .close_quote {
140+
bottom: 0;
141+
right: 50px;
173142
}
174143

175-
.sf-exceptionreset .block_exception p
176-
{
177-
font-family:Arial, Helvetica, sans-serif;
144+
.sf-exceptionreset .block_exception p {
145+
font-family: Arial, Helvetica, sans-serif;
178146
}
179147
.sf-exceptionreset .block_exception p a,
180-
.sf-exceptionreset .block_exception p a:hover
181-
{
182-
color:#565656;
148+
.sf-exceptionreset .block_exception p a:hover {
149+
color: #565656;
183150
}
184151

185-
.sf-exceptionreset h2
186-
{
187-
font-size:16px;
188-
font-family:Arial, Helvetica, sans-serif;
189-
padding-bottom:16px;
152+
.sf-exceptionreset h2 {
153+
font-size: 16px;
154+
font-family: Arial, Helvetica, sans-serif;
155+
padding-bottom: 16px;
190156
}
191157

192-
.sf-exceptionreset li a
193-
{
194-
background:none;
195-
color:#868686;
196-
text-decoration:none;
158+
.sf-exceptionreset li a {
159+
background: none;
160+
color: #868686;
161+
text-decoration: none;
197162
}
198163

199-
.sf-exceptionreset li a:hover
200-
{
201-
background:none;
202-
color:#313131;
203-
text-decoration:underline;
164+
.sf-exceptionreset li a:hover {
165+
background: none;
166+
color: #313131;
167+
text-decoration: underline;
204168
}
205169

206-
.sf-exceptionreset .logs h2
207-
{
208-
float:left;
209-
width:654px;
170+
.sf-exceptionreset .logs h2 {
171+
float: left;
172+
width: 654px;
210173
}
211174

212-
.sf-exceptionreset .error_count
213-
{
214-
float:right;
215-
width:170px;
216-
text-align:right;
175+
.sf-exceptionreset .error_count {
176+
float: right;
177+
width: 170px;
178+
text-align: right;
217179
}
218180

219-
.sf-exceptionreset .error_count span
220-
{
221-
display:inline-block;
222-
background-color:#aacd4e;
223-
-moz-border-radius:6px;
224-
-webkit-border-radius:6px;
225-
border-radius:6px;
226-
padding:4px;
227-
color:white;
228-
margin-right:2px;
229-
font-size:11px;
230-
font-weight:bold;
181+
.sf-exceptionreset .error_count span {
182+
display: inline-block;
183+
background-color: #aacd4e;
184+
-moz-border-radius: 6px;
185+
-webkit-border-radius: 6px;
186+
border-radius: 6px;
187+
padding: 4px;
188+
color: white;
189+
margin-right: 2px;
190+
font-size: 11px;
191+
font-weight: bold;
231192
}
232193

233-
.sf-exceptionreset .toggle
234-
{
235-
vertical-align:middle;
194+
.sf-exceptionreset .toggle {
195+
vertical-align: middle;
236196
}
237197

238198
.sf-exceptionreset .linked ul,
239-
.sf-exceptionreset .linked li
240-
{
199+
.sf-exceptionreset .linked li {
241200
display: inline;
242201
}
243202

244-
.sf-exceptionreset #output_content
245-
{
203+
.sf-exceptionreset #output_content {
246204
color: #000;
247205
font-size: 12px;
248206
}
249207

250-
.sf-exceptionreset ol
251-
{
252-
padding: 10px 0
208+
.sf-exceptionreset ol {
209+
padding: 10px 0;
253210
}
254-
255211
.sf-exceptionreset ol li {
256212
list-style: decimal;
257213
margin-left: 20px;
258214
padding: 2px;
259215
padding-bottom: 20px;
260216
}
261-
262-
.sf-exceptionreset ol ol li
263-
{
217+
.sf-exceptionreset ol ol li {
264218
list-style-position: inside;
265219
margin-left: 0;
266220
white-space: nowrap;
267221
font-size: 12px;
268222
padding-bottom: 0;
269223
}
270-
.sf-exceptionreset li .selected
271-
{
224+
.sf-exceptionreset li .selected {
272225
background-color: #ffd;
273226
}

0 commit comments

Comments
 (0)