Merged CSS for the toolbar in both embedded mode (on each page) and p…

…rofiler.
symfony · Apr 13, 2012 · a9afdd0 · a9afdd0
1 parent cd53483
commit a9afdd0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 205 deletions.
diff --git a/Resources/public/css/toolbar.css b/Resources/public/css/toolbar.css
diff --git a/Resources/views/Profiler/base.html.twig b/Resources/views/Profiler/base.html.twig
@@ -9,6 +9,7 @@
             <link rel="stylesheet" href="{{ asset('bundles/webprofiler/css/toolbar.css') }}"  />
             <link rel="stylesheet" href="{{ asset('bundles/webprofiler/css/profiler.css') }}" />
         {% endblock %}
+        {% include 'WebProfilerBundle:Profiler:toolbar_style.html.twig' with { 'position': 'top', 'floatable': false } %}
     </head>
     <body>
         {% block body '' %}

diff --git a/Resources/views/Profiler/toolbar.html.twig b/Resources/views/Profiler/toolbar.html.twig
@@ -1,6 +1,6 @@
 <!-- START of Symfony2 Web Debug Toolbar -->
 {% if 'normal' != position %}
-    {% include 'WebProfilerBundle:Profiler:toolbar_style.html.twig' with { 'position': position } %}
+    {% include 'WebProfilerBundle:Profiler:toolbar_style.html.twig' with { 'position': position, 'floatable': true } %}
 {% endif %}
 
 <div class="sf-toolbarreset">

diff --git a/Resources/views/Profiler/toolbar_style.html.twig b/Resources/views/Profiler/toolbar_style.html.twig
@@ -190,12 +190,29 @@
             background-image: -moz-linear-gradient(-90deg, #ffffff, #e4e4e4);
             background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#e4e4e4));
             top: 0;
+            bottom: auto;
             border-bottom: 1px solid #bbb;
         }
 
         .sf-toolbar-block .sf-toolbar-info {
             top: 38px;
+            bottom: auto;
             border-top: 1px solid #fff;
+            border-bottom: 1px solid #bbb;
+        }
+    {% endif %}
+
+    {% if not floatable %}
+        .sf-toolbarreset {
+            position: static;
+            background: #cbcbcb;
+            background-image: -moz-linear-gradient(-90deg, #e8e8e8, #cbcbcb) !important;
+            background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#e8e8e8), to(#cbcbcb)) !important;
+        }
+
+        .sf-toolbarreset abbr {
+            border-bottom: 1px dotted #000000;
+            cursor: help;
         }
     {% endif %}