Merge branch 'master' of gitlab.artweb.com.ua:root/new_rukzachok

Karnovsky A
2 parents 445bce5f 839704ce
Showing 4 changed files with 169 additions and 34 deletions Show diff stats
common/config/main.php
common/modules/product/widgets/views/products_block.php
frontend/views/catalog/product.php
frontend/web/css/style.css
@@ -85,8 +85,8 @@ return [
                 ],
                 'product_trumb2' => [
                     'resize' => [
-                        'width' => 100,
-                        'height' => 100,
+                        'width' => 98,
+                        'height' => 98,
                         'master' => null
                     ],
                 ],
@@ -146,7 +146,7 @@ return [
                 ],
                 'list' => [
                     'resize' => [
-                        'width' => 134,
+                        'width' => 160,
                         'height' => 200,
                         'master' => null
                     ],
-<div class="special-products products<?= (!empty($class) ? ' '. $class : '')?>">
-    <h3><?= $title?></h3>
-    <ul>
-        <?php foreach($products as $product) :?>
-            <?= $this->render('product_smart', ['product' => $product]);?>
-        <?php endforeach?>
-    </ul>
-    <div class="both"></div>
+<div class="_prd_spec-wr">
+    <div class="special-products products<?= (!empty($class) ? ' '. $class : '')?>">
+        <h3><?= $title?></h3>
+        <ul>
+            <?php foreach($products as $product) :?>
+                <?= $this->render('product_smart', ['product' => $product]);?>
+            <?php endforeach?>
+        </ul>
+        <div class="both"></div>
+    </div>
 </div>
 \ No newline at end of file
@@ -102,7 +102,7 @@ $this-&gt;registerJs (&quot;
                        data-cost="<?= $variant->price ?>"
                        data-old_cost="<?= $variant->price_old ?>" data-id="<?= $variant->product_variant_id ?>" data-art="<?= $variant->sku ?>"
                        data-color="<?= $variant->name ?>"
-                       data-image="<?= $variant->imageUrl ?>"
+                       data-image="<?= \common\components\artboximage\ArtboxImageHelper::getImageSrc($variant->imageUrl, 'list') ?>"
                        data-imageoriginal="<?= $variant->imageUrl ?>"
                        title="<?= $product->fullname ?>">
                         <?= \common\components\artboximage\ArtboxImageHelper::getImage($variant->imageUrl, 'product_variant')?>
@@ -158,7 +158,7 @@ $this-&gt;registerJs (&quot;
     <div class="content">
         <div class="pic">
             <center>
-                <a href="#" rel="shadowbox[gal]" id="picoriginal"><?= \common\components\artboximage\ArtboxImageHelper::getImage($product->imageUrl, 'product')?></a>
+                <a href="#" rel="shadowbox[gal]" id="picoriginal"><?= \common\components\artboximage\ArtboxImageHelper::getImage($product->imageUrl, 'product',['id'=>'pic'])?></a>
             </center>
         </div>
         <ul class="product_colors">
@@ -170,4 +170,4 @@ $this-&gt;registerJs (&quot;
         </ul>
     </div>
     <div class="both"></div>
-</div>
 \ No newline at end of file
+</div>
@@ -67,7 +67,7 @@ nav input[type=&quot;submit&quot;]{width:35px;height:29px;border:none;background:url(&#39;../i
 .basket span.more {margin-bottom: -1px}
 .menu{
     background:#596065;
-    /*border:1px solid #e8e8e8;*/
+    border:1px solid #e8e8e8;
 }
 .menu ul{margin:0px;padding:0px;list-style:none;}
 .menu ul li{float:left;border-left:1px solid #8b9094; height: 43px;}
@@ -164,15 +164,19 @@ ul.why_list li.item6{background:url(&#39;../img/why_item6.png&#39;) left no-repeat;}
 .map{padding:5px 0px 5px 25px;background:url('../img/map.png') left no-repeat; margin-bottom: 7px;}
 a.more_map{color:#99a5ad;border-bottom:1px dotted #99a5ad;text-decoration:none;font-size:11px;text-align:center;}
-.bread-crumbs{padding:10px 0px 10px 20px;border-bottom:1px solid #d2d2d2;}
-.bread-crumbs ul{list-style:none;margin:0px 0px 0px 0px;padding:0px;}
-.bread-crumbs ul li{float:left;padding-right:5px;}
+.bread-crumbs{padding:0 0 0 20px;border-bottom:1px solid #d2d2d2; height: 29px;}
+.bread-crumbs ul{list-style:none;margin:0 0 0 0;padding:0; height: 29px;}
+.bread-crumbs ul li{float:left;padding-left:20px;height: 100%; line-height: 29px; color: #7d7d7d; position: relative}
+.bread-crumbs ul li:first-child {padding-left: 0}
+.bread-crumbs ul li a {font-size: 12px;  display: block; color: #7d7d7d}
 .bread-crumbs ul li a:visited,.bread-crumbs ul li a:link{font-size:14px;color:#7d7d7d;text-decoration:underline;}
 .bread-crumbs ul li a:hover{color:#464646;text-decoration: none;}
 .breadcrumb > li + li:before {
     color: #ccc;
-    content: "/ ";
-    padding: 0 5px;
+    content: "/";
+    position: absolute;
+    top: 0;
+    left: 8px;
 }
@@ -188,20 +192,69 @@ a.more_map{color:#99a5ad;border-bottom:1px dotted #99a5ad;text-decoration:none;f
 .filters{border-top:1px solid #d2d2d2;padding:20px 0px 0px;margin-top:20px;}
 .filters .begin{text-transform: uppercase;font-weight:bold; font-size: 12px;}
 .filters ul{list-style:none;margin:0px;padding:0px;line-height:22px; margin-top: 6px;}
-.filters ul li a{color:#8fa951;text-decoration:none; font-size: 13px;}
+.filters ul li {
+    position: relative;
+    box-sizing: border-box;
+    padding-left: 24px;
+    line-height: 16px;
+    margin-top: 7px;
+}
+.filters ul li:first-child {margin-top: 0}
+.filters ul li>input {
+    position: absolute;
+    left: 4px;
+    margin: -6px 0 0 ;
+    top: 50%;
+}
+.filters ul li a{color:#8fa951;text-decoration:none; font-size: 13px; line-height: 16px;}
 .filters ul li a:hover{text-decoration:underline;}
 .productLeftBar{float:left;width:230px;padding-left:20px;margin-right:20px;}
 .productRightBar{float:right;width:280px;margin-left:20px;}
 .productLeftBar h1{font-size:27px;border-bottom:1px solid #d2d2d2;margin-bottom:10px;}
-ul.product_mod{list-style:none;margin:10px 0px 0px 0px;padding:0px;}
-ul.product_mod li{float:left;margin-right:7px;}
-ul.product_mod li img{border:1px solid #d2d2d2;}
+ul.product_mod{list-style:none;margin:10px 0 0 0;padding:0; float: left;}
+ul.product_mod li{
+    float:left;
+    width: 46px;
+    height: 46px;
+    background: #fff;
+    border: 1px solid #d2d2d2;
+    margin: 7px 7px 0 0;
+    text-align: center;
+}
+ul.product_mod li a{
+    width: 46px;
+    height: 46px;
+    display: table-cell;
+    vertical-align: middle;
+}
+ul.product_mod li img{
+    vertical-align: middle;
+    max-width: 46px;
+    max-height: 46px;
+}
-ul.product_colors{list-style:none;margin:10px 0px 0px 0px;padding:0px;}
-ul.product_colors li{float:left;margin-right:7px;}
-ul.product_colors li img{border:1px solid #d2d2d2;}
+ul.product_colors{list-style:none;margin:30px 0 0 0 ;padding:0; float: left;}
+ul.product_colors li{
+    float:left;
+    margin:10px 10px 0 0;
+    width: 98px;
+    height: 98px;
+    text-align: center;
+    border: 1px solid #d2d2d2;
+}
+ul.product_colors li a {
+    width: 98px;
+    height: 98px;
+    vertical-align: middle;
+    display: table-cell;
+}
+ul.product_colors li img{
+    max-width: 98px;
+    max-height: 98px;
+    vertical-align: middle;
+}
 .productLeftBar .begin{text-transform: uppercase;font-weight:bold;}
 .cost_box{border-top:1px solid #d2d2d2;border-bottom:1px solid #d2d2d2;margin:10px 0px;padding:10px 0px;}
@@ -338,7 +391,7 @@ ul.brends_list li{float:left;text-align:center;margin:0px 15px 20px 15px;}
 .txts{color:#9da9b1;font-size:18px;margin-bottom:20px;}
-.content ul.pagination{list-style:none;text-align:center; margin: 0 0 16px 0;padding: 0;}
+.content ul.pagination{list-style:none;text-align:center; margin: 0 0 16px 0;padding: 0 0 20px 0; border-bottom: 1px solid #d2d2d2;}
 .content ul.pagination li{display:inline;}
 .content ul.pagination li a{padding:3px;color:#82a02f;font-size: 15px;margin:0; text-decoration: none;  }
 .content ul.pagination li a:hover {text-decoration: underline}
@@ -879,12 +932,10 @@ a.active{font-weight:bold;text-decoration: underline;}
     border: 2px solid #fff;
     box-shadow: 0px 0px 5px 0px rgba(54, 54, 54, 0.75);
 }
-#HOME_SLIDER .jssorb03 .av {
-    background: none;
-}
-#HOME_SLIDER .jssorb03 div.av:hover, #HOME_SLIDER .jssorb03 div.av:active {
+
+#HOME_SLIDER .jssorb03 div.av:hover, #HOME_SLIDER .jssorb03 div.av:active, #HOME_SLIDER .jssorb03 .av  {
     cursor: default;
-    background: none;
+    background: #333;
 }
 .special-products {
     padding-top: 30px;
@@ -1013,6 +1064,28 @@ ul.product-special li.promo:after {
 ._form_checkbox_reset, .sort_block ul li a, .sort_block {
     font-size: 12px;
 }
+.filter_accept_bloc {margin-top: 13px; margin-bottom: 0;}
+._form_checkbox_reset {
+    color: #6a6a6a;
+    display: block;
+    width: 128px;
+    height: 28px;
+    border: 1px solid #d2d2d2;
+    line-height: 28px;
+    text-align: center;
+    border-radius: 4px;
+    text-decoration: none;
+    margin: 0 auto;
+}
+._form_checkbox_reset:hover {
+    border: 1px solid #95ba2f;
+    color: #6a6a6a;
+}
+._form_checkbox_reset:active {
+    border: 1px solid #95ba2f;
+    background: #95ba2f;
+    color: #fff;
+}
 .sort_block ul li a {
     color: #8fa951;
 }
@@ -1033,4 +1106,64 @@ ul.product-special li.promo:after {
     background-position: -36px 50%;
     right: 0;
     top: 0;
-}
 \ No newline at end of file
+}
+.loyout ._prd_spec-wr {margin-top: 10px;}
+.loyout .special-products:first-child {
+    border-top: 0;
+    padding-top: 0;
+
+}
+.irs-slider {
+    width: 13px;
+    height: 13px;
+    top: 25px;
+    border-radius: 100%;
+    box-shadow: none;
+    border: 1px solid #d2d2d2;
+    background: #ffffff;
+    background: -moz-linear-gradient(top,  #ffffff 0%, #ebebeb 100%);
+    background: -webkit-linear-gradient(top,  #ffffff 0%,#ebebeb 100%);
+    background: linear-gradient(to bottom,  #ffffff 0%,#ebebeb 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#ebebeb',GradientType=0 );
+}
+.irs-slider.state_hover, .irs-slider:hover {
+    background: #ffffff;
+}
+.irs-slider:after {
+    display: none;
+}
+.irs-slider:before {
+    content: "";
+    position: absolute;
+    width: 5px;
+    height: 5px;
+    z-index: 2;
+    border: 1px solid #d2d2d2;
+    border-radius: 100%;
+    background: #799920;
+    top: 3px;
+    left: 3px;
+}
+.irs-bar {
+    height: 3px;
+    top: 30px;
+}
+.irs-line {
+    height: 9px;
+    background: #ebebeb;
+    border: 1px solid #d2d2d2;
+    top: 27px;
+}
+.irs-line:before {
+    width: 166px;
+    height: 5px;
+    position: absolute;
+    content: '';
+    top: 2px;
+    left: 2px;
+    background: #d2d2d2;
+    border-radius: 5px;
+}
+.irs-min, .irs-max {display: none;}
+.irs {height: 49px;}
+.price_filter.first_price_li {margin-top: 8px;}
 \ No newline at end of file