diff --git a/src/Symfony/Bundle/DebugBundle/Resources/views/Profiler/dump.html.twig b/src/Symfony/Bundle/DebugBundle/Resources/views/Profiler/dump.html.twig
index 2ce0899080..7f23547469 100644
--- a/src/Symfony/Bundle/DebugBundle/Resources/views/Profiler/dump.html.twig
+++ b/src/Symfony/Bundle/DebugBundle/Resources/views/Profiler/dump.html.twig
@@ -5,7 +5,10 @@
{% if dumps_count %}
{% set icon %}
-
+
{{ dumps_count }}
{% endset %}
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig b/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig
index 7ecaf82759..6c5b85356d 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig
@@ -9,7 +9,9 @@
{% endif %}
{% set icon %}
-
+
{{ collector.user|default('n/a') }}
{% endset %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/ajax.svg.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/ajax.svg.twig
index ba77a3aa7f..d8cad847d4 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/ajax.svg.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/ajax.svg.twig
@@ -1 +1,6 @@
-
+
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/close.svg.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/close.svg.twig
index 70b4d589bc..49a75fc165 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/close.svg.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/close.svg.twig
@@ -1 +1,5 @@
-
+
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/form.svg.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/form.svg.twig
index 07bd665507..18bdb6e793 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/form.svg.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/form.svg.twig
@@ -1 +1,6 @@
-
+
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/logger.svg.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/logger.svg.twig
index b29b2071d4..3270a33618 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/logger.svg.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/logger.svg.twig
@@ -1 +1,7 @@
-
+
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/memory.svg.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/memory.svg.twig
index 90b195a521..5cd2fc4d84 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/memory.svg.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/memory.svg.twig
@@ -1 +1,5 @@
-
+
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/symfony.svg.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/symfony.svg.twig
index d4136c0958..8d0ab1417f 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/symfony.svg.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/symfony.svg.twig
@@ -1 +1,12 @@
-
+
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/time.svg.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/time.svg.twig
index 65f3671084..ec280a59a6 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/time.svg.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/time.svg.twig
@@ -1 +1,5 @@
-
+
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/translation.svg.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/translation.svg.twig
index ed8601a2a9..93d42327ed 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/translation.svg.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/translation.svg.twig
@@ -1 +1,13 @@
-
+
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/twig.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/twig.html.twig
index a8e72424cf..21d81ea216 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/twig.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/twig.html.twig
@@ -1 +1,5 @@
-
+
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 2314f0896d..6f7f95ebc9 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
@@ -37,7 +37,7 @@
}
.sf-toolbarreset svg,
.sf-toolbarreset img {
- max-height: 24px;
+ max-height: 20px;
}
.sf-toolbarreset .hide-button {
background: #444;
@@ -47,15 +47,11 @@
top: 0;
right: 0;
width: 36px;
- height: 30px;
+ height: 28px;
cursor: pointer;
- padding-top: 6px;
+ padding-top: 8px;
text-align: center;
}
-.sf-toolbarreset .hide-button svg {
- max-height: 24px;
- max-width: 24px;
-}
.sf-toolbar-block {
cursor: default;
@@ -70,9 +66,6 @@
display: block;
text-decoration: none;
}
-.sf-toolbar-block-config svg {
- max-height: 22px;
-}
.sf-toolbar-block span {
display: inline-block;
@@ -117,6 +110,9 @@
padding: 2px 5px;
margin-bottom: 0px;
}
+.sf-toolbar-block .sf-toolbar-info-piece .sf-toolbar-status + .sf-toolbar-status {
+ margin-left: 4px;
+}
.sf-toolbar-block .sf-toolbar-info-piece:last-child {
margin-bottom: 0;
@@ -134,7 +130,7 @@
color: #AAA;
display: table-cell;
font-size: 12px;
- padding: 4px 8px 4px 4px;
+ padding: 4px 8px 4px 0;
}
.sf-toolbar-block .sf-toolbar-info-piece span {
@@ -186,9 +182,6 @@
background-color: rgba(200, 43, 43, 0.8);
color: #FFF;
}
-.sf-toolbar-block.sf-toolbar-status-red svg > g > path {
- fill: #FFF;
-}
.sf-toolbar-block.sf-toolbar-status-yellow {
background-color: rgb(189, 132, 0);
color: #FFF;
@@ -196,9 +189,11 @@
.sf-toolbar-block-request .sf-toolbar-status {
color: #FFF;
+ display: inline-block;
font-size: 14px;
- max-height: 36px;
- padding: 10px 7px;
+ height: 36px;
+ line-height: 36px;
+ padding: 0 10px;
}
.sf-toolbar-block-request .sf-toolbar-info-piece a {
text-decoration: none;
@@ -212,9 +207,12 @@
.sf-toolbar-status-red .sf-toolbar-label {
color: #FFF;
}
-.sf-toolbar-status-green svg > g > path,
-.sf-toolbar-status-red svg > g > path,
-.sf-toolbar-status-yellow svg > g > path {
+.sf-toolbar-status-green svg path,
+.sf-toolbar-status-red svg path,
+.sf-toolbar-status-yellow svg path {
+ fill: #FFF;
+}
+.sf-toolbar-block-config svg path {
fill: #FFF;
}
@@ -232,10 +230,6 @@
.sf-toolbar-block .sf-toolbar-icon svg {
border-width: 0;
position: relative;
- top: 5px;
-}
-.sf-toolbar-block-translation .sf-toolbar-icon svg,
-.sf-toolbar-block-config .sf-toolbar-icon svg {
top: 8px;
}
@@ -243,24 +237,21 @@
.sf-toolbar-block .sf-toolbar-icon svg + span {
margin-left: 4px;
}
-
-.sf-toolbar-info-php-ext .sf-toolbar-status + .sf-toolbar-status {
+.sf-toolbar-block-config .sf-toolbar-icon .sf-toolbar-value {
margin-left: 4px;
}
.sf-toolbar-block:hover {
position: relative;
}
-
.sf-toolbar-block:hover .sf-toolbar-icon {
background-color: #444;
position: relative;
z-index: 10002;
}
-
.sf-toolbar-block:hover .sf-toolbar-info {
display: block;
- padding: 8px;
+ padding: 10px;
max-width: 480px;
max-height: 480px;
word-wrap: break-word;
@@ -393,25 +384,11 @@
.sf-toolbar-icon .sf-toolbar-value {
display: inline;
}
- .sf-toolbar-block .sf-toolbar-value {
- /* needed for perfect vertical aligning */
- line-height: 37px;
- }
.sf-toolbar-block .sf-toolbar-icon img,
.sf-toolbar-block .sf-toolbar-icon svg {
top: 6px;
}
- /* TODO: needed for perfect vertical aligning, remove when icons are recreated */
- .sf-toolbar-block-twig .sf-toolbar-icon img {
- top: 7px;
- }
- .sf-toolbar-block-security .sf-toolbar-icon svg {
- top: 7px;
- }
- .sf-toolbar-block-config .sf-toolbar-icon svg {
- top: 8px;
- }
.sf-toolbar-block-config:hover .sf-toolbar-info {
right: 0;
}
@@ -432,10 +409,11 @@
.sf-toolbar-block-request .sf-toolbar-icon {
padding-left: 0;
}
+
.sf-toolbar-block-request .sf-toolbar-status {
margin-right: 4px;
- padding: 10px;
}
+
.sf-toolbar-block-config {
float: right;
margin-left: 0;