Merge branch '2.8' into 3.1

* 2.8:
  Update profiler's layout to use flexbox
  [Yaml] Remove legacy code
This commit is contained in:
Fabien Potencier 2016-09-01 19:12:52 -07:00
commit cc5a65b7f6
2 changed files with 34 additions and 31 deletions

View File

@ -17,9 +17,15 @@ html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:1
{# Basic styles
========================================================================= #}
html, body {
height: 100%;
width: 100%;
}
body {
background-color: #F9F9F9;
color: #222;
display: flex;
flex-direction: column;
{{ mixins.sans_serif_font|raw }}
font-size: 14px;
line-height: 1.4;
@ -405,16 +411,34 @@ tr.status-warning td {
max-width: 1300px;
padding-right: 15px;
}
#header {
flex: 0 0 auto;
}
#header .container {
display: flex;
flex-direction: row;
justify-content: space-between;
}
#summary {
flex: 0 0 auto;
}
#content {
min-height: 1024px;
overflow: hidden;
height: 100%;
}
#main {
display: flex;
flex-direction: row-reverse;
min-height: 100%;
}
#sidebar {
flex: 0 0 220px;
}
#collector-wrapper {
float: left;
width: 100%;
flex: 0 1 100%;
min-width: 0;
}
#collector-content {
margin: 0 0 30px 220px;
margin: 0 0 30px 0;
padding: 14px 0 14px 20px;
}
@ -432,7 +456,6 @@ tr.status-warning td {
color: #FFF;
font-weight: normal;
font-size: 21px;
float: left;
margin: 0;
padding: 10px 10px 8px;
}
@ -449,7 +472,6 @@ tr.status-warning td {
fill: #FFF;
}
#header .search {
float: right;
padding-top: 11px;
}
#header .search input {
@ -519,10 +541,7 @@ tr.status-warning td {
#sidebar {
background: #444;
color: #CCC;
float: left;
margin-bottom: -99999px; {# needed for 'same-height columns' trick #}
margin-left: -100%;
padding-bottom: 99999px; {# needed for 'same-height columns' trick #}
padding-bottom: 30px;
position: relative;
width: 220px;
z-index: 9999;
@ -605,7 +624,6 @@ tr.status-warning td {
#menu-profiler li {
position: relative;
margin-bottom: 0;
width: 220px;
}
#menu-profiler li a {
border: solid transparent;
@ -939,17 +957,13 @@ table.logs .sf-call-stack abbr {
}
@media (max-width: 768px) {
#collector-content {
margin-left: 50px;
}
#sidebar {
width: 50px;
overflow-y: hidden;
transition: width 200ms ease-out;
flex-basis: 50px;
overflow-x: hidden;
transition: flex-basis 200ms ease-out;
}
#sidebar:hover, #sidebar.expanded {
width: 220px;
flex-basis: 220px;
}
#sidebar-search {

View File

@ -278,17 +278,6 @@ class Parser
throw $e;
}
if (is_array($value)) {
$first = reset($value);
if (is_string($first) && 0 === strpos($first, '*')) {
$data = array();
foreach ($value as $alias) {
$data[] = $this->refs[substr($alias, 1)];
}
$value = $data;
}
}
if (isset($mbEncoding)) {
mb_internal_encoding($mbEncoding);
}