Skip to content

Commit 87f80c5

Browse files
committed
Merge branch '3.0'
* 3.0: (24 commits) [Filesystem] Better error handling in remove() [DependencyInjection] Add coverage for invalid Expression in exportParameters [DependencyInjection] Add coverage for all invalid arguments in exportParameters anonymous services are always private [Form] FormValidator removed code related to removed option [Console] Correct time formatting. [WebProfilerBundle] Fixed error from unset twig variable Force profiler toolbar svg display [DependencyInjection] Resolve aliases before removing abstract services + add tests Fix Dom Crawler select option with empty value Remove unnecessary option assignment fix tests (use non-deprecated options) remove unused variable mock the proper method [PropertyAccess] Fix regression [HttpFoundation] Improve phpdoc [Logging] Add support for firefox in ChromePhpHandler Windows 10 version check in just one line Detect CLI color support for Windows 10 build 10586 [Security] Fixed SwitchUserListener when exiting an impersonication with AnonymousToken ...
2 parents 20a3bd9 + 69e7df6 commit 87f80c5

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

Resources/views/Collector/config.html.twig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,24 +50,24 @@
5050
</span>
5151
</div>
5252

53-
{% if 'n/a' != collector.appname %}
53+
{% if 'n/a' is not same as(collector.appname) %}
5454
<div class="sf-toolbar-info-piece">
5555
<b>Kernel name</b>
5656
<span>{{ collector.appname }}</span>
5757
</div>
5858
{% endif %}
5959

60-
{% if 'n/a' != collector.env %}
60+
{% if 'n/a' is not same as(collector.env) %}
6161
<div class="sf-toolbar-info-piece">
6262
<b>Environment</b>
6363
<span>{{ collector.env }}</span>
6464
</div>
6565
{% endif %}
6666

67-
{% if 'n/a' != collector.debug %}
67+
{% if 'n/a' is not same as(collector.debug) %}
6868
<div class="sf-toolbar-info-piece">
6969
<b>Debug</b>
70-
<span class="{{ debug_status_class }}">{{ collector.debug ? 'enabled' : 'disabled' }}</span>
70+
<span class="sf-toolbar-status sf-toolbar-status-{{ collector.debug ? 'green' : 'red' }}">{{ collector.debug ? 'enabled' : 'disabled' }}</span>
7171
</div>
7272
{% endif %}
7373
</div>

Resources/views/Profiler/toolbar.css.twig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
.sf-toolbarreset svg,
6060
.sf-toolbarreset img {
6161
height: 20px;
62+
display: inline-block;
6263
}
6364

6465
.sf-toolbarreset .hide-button {

0 commit comments

Comments
 (0)