Merge remote-tracking branch 'origin/similar' into similar

Alexey Boroda
2 parents 6c04f835 5552a8d4
Showing 3 changed files with 15 additions and 3 deletions Show diff stats
common/modules/product/widgets/views/product_smart_similar.php
frontend/views/catalog/product.php
frontend/web/css/css_header.css
@@ -11,7 +11,7 @@
 <div class="catalog_item">
   <div class="wrapper">
     <?php if (!empty($product->events)) { ?>
-    <div class="banners_sale">
+    <div class="events events_not_link">
  
         <?php
             foreach($product->events as $event){
@@ -178,7 +178,7 @@
                     <tr>
                         <?php foreach($product->events as $event):?>
                             <?php if(!empty($event->end_at) && $event->isActive()):?>
-                                <div class="event_block">
+                                <div class="event_block new_ev_bl">
  
                                     <div class="event_title"> <?=  Html::a('Акция!!! '.$event->name,Url::to(['event/show','alias'=>$event->alias]))?></div>
                                     <div class="event_time">До конца осталось:</div>
@@ -27028,6 +27028,8 @@ ul.product-special li.promo div {
  
 .new_collection {
     margin:0 -15px 0 -15px;
+    height: 450px !important;
+    overflow: hidden;
 }
 .collection .catalog_product_list.view_table.new_collection .catalog_item {
     width: 33.33333333%;
@@ -27169,10 +27171,20 @@ ul.product-special li.promo div {
 .new_collection .events {
     position: absolute;
     z-index: 99;
-    background: #fff;
     top: 0;
     left: 0;
 }
+.new_collection .events_not_link img {
+    background:#fff;
+}
+.new_collection .events_not_link img:first-child {
+    padding-bottom: 5px;
+    background:none;
+}
+.new_collection .owl-theme .owl-controls {
+    margin-top: 0;
+}
+.event_block.new_ev_bl {min-height:180px;}
 @media(max-width: 1200px){
     .collection .catalog_product_list.view_table.new_collection .catalog_item {
         width: 50%;