Merge branch 'master' into style/nav-links-font-weight
This commit is contained in:
commit
a3b9ddcb77
2 changed files with 10 additions and 2 deletions
|
@ -20,7 +20,7 @@ $collections = [];
|
|||
$key = (isset($rule['key'])) ? $rule['key'] : '';
|
||||
$label = (isset($rule['label'])) ? $rule['label'] : '';
|
||||
$type = (isset($rule['type'])) ? $rule['type'] : '';
|
||||
$list = (isset($rule['list'])) ? $rule['list'] : [];
|
||||
$list = (isset($rule['list']) && !empty($list)) ? $rule['list'] : [];
|
||||
?>
|
||||
<?php foreach($list as $item):
|
||||
if($item === $collection->getId()) {
|
||||
|
@ -51,7 +51,7 @@ $collections = [];
|
|||
$key = (isset($rule['key'])) ? $rule['key'] : '';
|
||||
$label = (isset($rule['label'])) ? $rule['label'] : '';
|
||||
$type = (isset($rule['type'])) ? $rule['type'] : '';
|
||||
$list = (isset($rule['list'])) ? $rule['list'] : false;
|
||||
$list = (isset($rule['list'])) ? $rule['list'] : [];
|
||||
$array = (isset($rule['array'])) ? $rule['array'] : false;
|
||||
?>
|
||||
|
||||
|
|
|
@ -238,3 +238,11 @@ small {
|
|||
.icon-dot-3:before {
|
||||
.func-rotate(90deg);
|
||||
}
|
||||
|
||||
// fix icons vertical alignment
|
||||
i[class^='icon-'], i[class*=' icon-']{
|
||||
&:before {
|
||||
display: inline;
|
||||
line-height: unset;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue