diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
index 98ea6c3265d2a..6860230243106 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
@@ -60,10 +60,19 @@
Symfony initialization
+ {% if profile.collectors.memory %}
+
+ {{ '%.2f'|format(profile.collectors.memory.memory / 1024 / 1024) }} MB
+ Peak memory usage
+
+ {% endif %}
+
{% if profile.children|length > 0 %}
+
+
{{ profile.children|length }}
- Sub-Requests
+ Sub-Request{{ profile.children|length > 1 ? 's' }}
{% set subrequests_time = 0 %}
@@ -73,14 +82,7 @@
{{ subrequests_time }} ms
- Sub-Requests time
-
- {% endif %}
-
- {% if profile.collectors.memory %}
-
- {{ '%.2f'|format(profile.collectors.memory.memory / 1024 / 1024) }} MB
- Peak memory usage
+ Sub-Request{{ profile.children|length > 1 ? 's' }} time
{% endif %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
index 4d458d3242c97..b807d0bcf9b5b 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
@@ -250,12 +250,12 @@ table tbody ul {
{# Metrics
------------------------------------------------------------------------- #}
.metrics {
- margin: 1em 0;
+ margin: 1em 0 0;
overflow: auto;
}
.metrics .metric {
float: left;
- margin-right: 1em;
+ margin: 0 1em 1em 0;
}
.metric {
@@ -310,6 +310,12 @@ table tbody ul {
vertical-align: middle;
}
+.metric-divider {
+ float: left;
+ margin: 0 1em;
+ min-height: 1px; {# required to apply 'margin' to an empty 'div' #}
+}
+
{# Cards
------------------------------------------------------------------------- #}
.card {