From bff4098a354c79d1c878198a0de1805ac541fe8c Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Wed, 30 Sep 2015 13:32:59 +0200
Subject: [PATCH] Minor fixes for the profiler and toolbar

---
 .../DebugBundle/Resources/config/services.xml    |  2 +-
 .../DependencyInjection/DebugExtensionTest.php   |  1 +
 .../Resources/config/collectors.xml              | 16 ++++++++--------
 .../Resources/config/form_debug.xml              |  2 +-
 .../Resources/config/translation_debug.xml       |  2 +-
 .../Resources/config/collectors.xml              |  2 +-
 .../Resources/views/Profiler/toolbar.css.twig    |  2 +-
 7 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/Symfony/Bundle/DebugBundle/Resources/config/services.xml b/src/Symfony/Bundle/DebugBundle/Resources/config/services.xml
index 16e27a22c5..001b987e90 100644
--- a/src/Symfony/Bundle/DebugBundle/Resources/config/services.xml
+++ b/src/Symfony/Bundle/DebugBundle/Resources/config/services.xml
@@ -11,7 +11,7 @@
         </service>
 
         <service id="data_collector.dump" class="Symfony\Component\HttpKernel\DataCollector\DumpDataCollector">
-            <tag name="data_collector" id="dump" template="@Debug/Profiler/dump.html.twig" />
+            <tag name="data_collector" id="dump" template="@Debug/Profiler/dump.html.twig" priority="240" />
             <argument type="service" id="debug.stopwatch" on-invalid="ignore" />
             <argument>null</argument><!-- %templating.helper.code.file_link_format% -->
             <argument>%kernel.charset%</argument>
diff --git a/src/Symfony/Bundle/DebugBundle/Tests/DependencyInjection/DebugExtensionTest.php b/src/Symfony/Bundle/DebugBundle/Tests/DependencyInjection/DebugExtensionTest.php
index 3efb196cc9..fc4e620e81 100644
--- a/src/Symfony/Bundle/DebugBundle/Tests/DependencyInjection/DebugExtensionTest.php
+++ b/src/Symfony/Bundle/DebugBundle/Tests/DependencyInjection/DebugExtensionTest.php
@@ -28,6 +28,7 @@ class DebugExtensionTest extends \PHPUnit_Framework_TestCase
             array(
                 'id' => 'dump',
                 'template' => '@Debug/Profiler/dump.html.twig',
+                'priority' => 240,
             ),
         );
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
index 01a271797a..50e4c0a9df 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
@@ -23,41 +23,41 @@
 
         <service id="data_collector.request" class="%data_collector.request.class%">
             <tag name="kernel.event_subscriber" />
-            <tag name="data_collector" template="@WebProfiler/Collector/request.html.twig" id="request" priority="260" />
+            <tag name="data_collector" template="@WebProfiler/Collector/request.html.twig" id="request" priority="335" />
         </service>
 
         <service id="data_collector.ajax" class="Symfony\Bundle\FrameworkBundle\DataCollector\AjaxDataCollector" public="false">
-            <tag name="data_collector" template="@WebProfiler/Collector/ajax.html.twig" id="ajax" priority="256" />
+            <tag name="data_collector" template="@WebProfiler/Collector/ajax.html.twig" id="ajax" priority="315" />
         </service>
 
         <service id="data_collector.exception" class="%data_collector.exception.class%" public="false">
-            <tag name="data_collector" template="@WebProfiler/Collector/exception.html.twig" id="exception" priority="255" />
+            <tag name="data_collector" template="@WebProfiler/Collector/exception.html.twig" id="exception" priority="305" />
         </service>
 
         <service id="data_collector.events" class="%data_collector.events.class%" public="false">
-            <tag name="data_collector" template="@WebProfiler/Collector/events.html.twig" id="events" priority="255" />
+            <tag name="data_collector" template="@WebProfiler/Collector/events.html.twig" id="events" priority="290" />
             <argument type="service" id="event_dispatcher" on-invalid="ignore" />
         </service>
 
         <service id="data_collector.logger" class="%data_collector.logger.class%" public="false">
-            <tag name="data_collector" template="@WebProfiler/Collector/logger.html.twig" id="logger" priority="255" />
+            <tag name="data_collector" template="@WebProfiler/Collector/logger.html.twig" id="logger" priority="300" />
             <tag name="monolog.logger" channel="profiler" />
             <argument type="service" id="logger" on-invalid="ignore" />
         </service>
 
         <service id="data_collector.time" class="%data_collector.time.class%" public="false">
-            <tag name="data_collector" template="@WebProfiler/Collector/time.html.twig" id="time" priority="259" />
+            <tag name="data_collector" template="@WebProfiler/Collector/time.html.twig" id="time" priority="330" />
             <argument type="service" id="kernel" on-invalid="ignore" />
             <argument type="service" id="debug.stopwatch" on-invalid="ignore" />
         </service>
 
         <service id="data_collector.memory" class="%data_collector.memory.class%" public="false">
-            <tag name="data_collector" template="@WebProfiler/Collector/memory.html.twig" id="memory" priority="258" />
+            <tag name="data_collector" template="@WebProfiler/Collector/memory.html.twig" id="memory" priority="325" />
         </service>
 
         <service id="data_collector.router" class="%data_collector.router.class%" >
             <tag name="kernel.event_listener" event="kernel.controller" method="onKernelController"/>
-            <tag name="data_collector" template="@WebProfiler/Collector/router.html.twig" id="router" priority="255" />
+            <tag name="data_collector" template="@WebProfiler/Collector/router.html.twig" id="router" priority="285" />
         </service>
     </services>
 </container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form_debug.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form_debug.xml
index ddf0a4e32c..a68dd911c8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form_debug.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form_debug.xml
@@ -29,7 +29,7 @@
         <service id="data_collector.form.extractor" class="%data_collector.form.extractor.class%" />
 
         <service id="data_collector.form" class="%data_collector.form.class%">
-            <tag name="data_collector" template="@WebProfiler/Collector/form.html.twig" id="form" priority="255" />
+            <tag name="data_collector" template="@WebProfiler/Collector/form.html.twig" id="form" priority="310" />
             <argument type="service" id="data_collector.form.extractor" />
         </service>
     </services>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation_debug.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation_debug.xml
index 37b5cd8de8..fc7d2faaa9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation_debug.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation_debug.xml
@@ -12,7 +12,7 @@
 
         <!-- DataCollector -->
         <service id="data_collector.translation" class="Symfony\Component\Translation\DataCollector\TranslationDataCollector">
-            <tag name="data_collector" template="@WebProfiler/Collector/translation.html.twig" id="translation" priority="255" />
+            <tag name="data_collector" template="@WebProfiler/Collector/translation.html.twig" id="translation" priority="275" />
             <argument type="service" id="translator.data_collector" />
         </service>
     </services>
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/collectors.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/collectors.xml
index bfc236b8cf..b781dbf251 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/collectors.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/collectors.xml
@@ -10,7 +10,7 @@
 
     <services>
         <service id="data_collector.security" class="%data_collector.security.class%" public="false">
-            <tag name="data_collector" template="@Security/Collector/security.html.twig" id="security" />
+            <tag name="data_collector" template="@Security/Collector/security.html.twig" id="security" priority="270" />
             <argument type="service" id="security.token_storage" on-invalid="ignore" />
             <argument type="service" id="security.role_hierarchy" />
             <argument type="service" id="security.logout_url_generator" />
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
index 6d07bc4e0b..ae411b6162 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
@@ -53,7 +53,7 @@
 }
 .sf-toolbarreset .hide-button svg {
     max-height: 18px;
-    padding-top: 10px;
+    margin-top: 10px;
 }
 
 .sf-toolbar-block {