merged branch stof/profiler_fix (PR #4332)

Commits
-------

beb8d18 [WebProfilerBundle] Fixed the displaying of the toolbar in the profiler

Discussion
----------

[WebProfilerBundle] Fixed the displaying of the toolbar in the profiler

When re-adding the clearing div a few days ago, you forgot to put it in the ``if``, thus breaking the design of the profiler (adding 50px above the toolbar)

---------------------------------------------------------------------------

by travisbot at 2012-05-18T22:37:12Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1371378) (merged beb8d184 into 18132c18).
This commit is contained in:
Fabien Potencier 2012-05-19 08:44:02 +02:00
commit 25014ae116

View File

@ -1,9 +1,9 @@
<!-- START of Symfony2 Web Debug Toolbar -->
{% if 'normal' != position %}
{% include 'WebProfilerBundle:Profiler:toolbar_style.html.twig' with { 'position': position, 'floatable': true } %}
<div style="clear: both; height: 50px;"></div>
{% endif %}
<div style="clear: both; height: 50px;"></div>
<div class="sf-toolbarreset">
{% for name, template in templates %}
{{ template.renderblock('toolbar', {