8000 More fixes and tweaks · symfony/symfony@ef53850 · GitHub
[go: up one dir, main page]
Skip to content

Commit ef53850

Browse files
javiereguiluzjaviereguiluz
committed
More fixes and tweaks
1 parent 51a79c9 commit ef53850

File tree

4 files changed

+31
-24
lines changed

4 files changed

+31
-24
lines changed

‎src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ protected function templateExists($template)
146146
*/
147147
protected function reorderTemplates($templates)
148148
{
149+
$templates = $this->moveArrayElementToFirstPosition($templates, 'twig');
149150
$templates = $this->moveArrayElementToFirstPosition($templates, 'memory');
150151
$templates = $this->moveArrayElementToFirstPosition($templates, 'time');
151152
$templates = $this->moveArrayElementToFirstPosition($templates, 'request');

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,6 @@
3333
{% endset %}
3434

3535
{% set text %}
36-
{% if collector.symfonyversion is defined %}
37-
<div class="sf-toolbar-info-piece">
38-
<a href="https://symfony.com/doc/{{ collector.symfonyversion }}/index.html" rel="help">
39-
Read Symfony {{ collector.symfonyversion }} Docs
40-
</a>
41-
</div>
42-
{% endif %}
43-
4436
{% if collector.applicationname %}
4537
<div class="sf-toolbar-info-piece">
4638
{{ collector.applicationname }} <b>{{ collector.applicationversion }}</b>
@@ -94,6 +86,15 @@
9486
<b>PHP SAPI</b>
9587
<span>{{ collector.sapiName }}</span>
9688
</div>
89+
90+
{% if collector.symfonyversion is defined %}
91+
<div class="sf-toolbar-info-piece">
92+
<b>Resources</b>
93+
<a href="https://symfony.com/doc/{{ collector.symfonyversion }}/index.html" rel="help">
94+
Read Symfony {{ collector.symfonyversion }} Docs
95+
</a>
96+
</div>
97+
{% endif %}
9798
{% endset %}
9899

99100
{{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: false, status: block_status }) }}

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,19 @@
2121

2222
{% set icon %}
2323
<span class="sf-toolbar-status sf-toolbar-status-{{ request_status_code_color }}">{{ collector.statuscode }}</span>
24-
<span class="sf-toolbar-value sf-toolbar-info-piece-additional">{{ request_handler }}</span>
24+
<span class="sf-toolbar-label">@</span>
25+
<span class="sf-toolbar-value sf-toolbar-info-piece-additional">{{ collector.route }}</span>
2526
{% endset %}
27+
2628
{% set text %}
2729
{% spaceless %}
2830
<div class="sf-toolbar-info-piece">
2931
<b>HTTP status</b>
30-
<span class="sf-toolbar-status sf-toolbar-status-{{ request_status_code_color }}">{{ collector.statuscode }}</span> {{ collector.statustext }}
32+
<span>{{ collector.statuscode }} {{ collector.statustext }}</span>
3133
</div>
3234
<div class="sf-toolbar-info-piece">
3335
<b>Controller method</b>
34-
{{ request_handler }}
36+
<span>{{ request_handler }}</span>
3537
</div>
3638
<div class="sf-toolbar-info-piece">
3739
<b>Controller file</b>
@@ -47,6 +49,7 @@
4749
</div>
4850
{% endspaceless %}
4951
{% endset %}
52+
5053
{{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: profiler_url }) }}
5154
{% endblock %}
5255

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,19 @@
120120
opacity: .8;
121121
}
122122

123+
.sf-toolbar-block .sf-toolbar-info {
124+
display: table;
125+
}
123126
.sf-toolbar-block .sf-toolbar-info-piece {
127+
display: table-row;
124128
line-height: 1.4;
125129
margin-bottom: 8px;
126130
}
127131

128132
.sf-toolbar-block .sf-toolbar-info-piece .sf-toolbar-status {
129-
padding: 0px 5px;
 6D4E
133+
border-radius: 0;
134+
padding: 2px 5px;
130135
margin-bottom: 0px;
131-
vertical-align: top;
132136
}
133137

134138
.sf-toolbar-block .sf-toolbar-info-piece:last-child {
@@ -145,10 +149,12 @@
145149

146150
.sf-toolbar-block .sf-toolbar-info-piece b {
147151
color: #AAA;
148-
display: inline-block;
152+
display: table-cell;
149153
font-size: 11px;
150-
min-width: 110px;
151-
vertical-align: top;
154+
padding: 4px 8px 4px 4px;
155+
}
156+
.sf-toolbar-block .sf-toolbar-info-piece span {
157+
152158
}
153159
.sf-toolbar-block .sf-toolbar-info-piece span,
154160
.sf-toolbar-block .sf-toolbar-info-piece abbr {
@@ -196,7 +202,7 @@
196202
background-color: #759e1a;
197203
}
198204
.sf-toolbar-block .sf-toolbar-status-red {
199-
background-color: rgba(200,0,0, 0.8);
205+
background-color: rgba(200, 0, 0, 0.8);
200206
}
201207
.sf-toolbar-block .sf-toolbar-status-yellow {
202208
background-color: #ffcc00;
@@ -211,7 +217,7 @@
211217
color: #FFF;
212218
}
213219
.sf-toolbar-block.sf-toolbar-status-red {
214-
background-color: rgba(200,0,0, 0.8);
220+
background-color: rgba(200, 0, 0, 0.8);
215221
color: #FFF;
216222
}
217223
.sf-toolbar-block.sf-toolbar-status-red svg > g > path {
@@ -292,12 +298,8 @@
292298
.sf-toolbar-info-php {}
293299
.sf-toolbar-info-php-ext {}
294300

295-
.sf-toolbar-info-php-ext .sf-toolbar-status {
296-
margin-left: 2px;
297-
}
298-
299-
.sf-toolbar-info-php-ext .sf-toolbar-status:first-child {
300-
margin-left: 0;
301+
.sf-toolbar-info-php-ext .sf-toolbar-status + .sf-toolbar-status {
302+
margin-left: 4px;
301303
}
302304

303305
.sf-toolbar-block a .sf-toolbar-info-piece-additional,

0 commit comments

Comments
 (0)
0