Merge remote-tracking branch 'origin/master'

Yarik
2 parents 8cd678be 8c3ef8da
Showing 4 changed files with 16 additions and 5 deletions Show diff stats
backend/web/assets/.gitignore
frontend/views/category/view.php
frontend/views/site/index.php
frontend/web/css/style.css
-*
-!.gitignore
@@ -127,6 +127,10 @@ _________________________________________________________ --&gt;
                 $brands = $filterHelper->getBrands($model);
                 if (!empty($brands)) {
                     ?>
+                    <a class="btn btn-xs btn-danger reset-filters" href="#">
+                        <i class="fa fa-times-circle"></i>
+                        <span class="hidden-sm">Сбросить все фильтры</span>
+                    </a>
                   <div class="panel-heading">
                     <h3 class="panel-title"><?php echo \Yii::t('app', 'Бренды'); ?></h3>
                   </div>
@@ -393,7 +393,7 @@ _________________________________________________________ --&gt;
     */
 ?>
-<section class="bar background-gray no-mb">
+<section class="bar background-white no-mb">
     <div class="container">
         <div class="col-md-12">
             <?php echo $seo->text; ?>
@@ -4053,13 +4053,13 @@ hr {
 }
 .dropdown-menu .dropdown-submenu {
-    position: static;
+    position: relative;
 }
 .dropdown-menu .dropdown-submenu > .dropdown-menu {
     top: 0;
     left: 100%;
-    min-height: 200px;
+    /*min-height: 200px;*/
     margin-left: -4px;
     border-radius: 0 3px 3px 3px;
 }
@@ -4529,4 +4529,13 @@ a.list-group-item.active &gt; .badge,
 .inline-block.lang-link {
     font-size: 18px;
     padding-right: 20px;
+}
+.reset-filters{
+    padding: 5px 10px;
+    font-size: 12px;
+    line-height: 1.5;
+    border-radius: 50px;
+    padding-right: 20px;
+    outline: none;
+    margin-bottom: 20px;
 }
 \ No newline at end of file