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

Karnovsky A
2 parents 868680ca aaadf951
Showing 4 changed files with 81 additions and 33 deletions Show diff stats
common/modules/product/widgets/views/product_smart.php
frontend/views/catalog/product_item.php
frontend/web/css/style.css
frontend/web/img/new_arrows_.png
@@ -21,14 +21,14 @@ use yii\helpers\Url;
         <?php
         echo '<div class="cost-block">';
-
+        echo '<p class="cost">';
         // есть скидка
         if ($product->variant->price_old != 0 && $product->variant->price_old != $product->variant->price)
         {
-            echo '<strike><span id=\'old_cost\'>'.$product->variant->price_old.'</span> грн.</strike>';
+            echo '<strike><span id=\'old_cost\'>'.$product->variant->price_old.'</span> грн.</strike>&nbsp;';
         }
-        echo '<p class="cost">'.$product->variant->price.'  грн.</p>';
+        echo $product->variant->price.' <span>грн.</span></p>';
         echo '</div>';
@@ -31,14 +31,14 @@ use yii\helpers\Url;
         <?php
         echo '<div class="cost-block">';
-
+        echo '<p class="cost">';
         // есть скидка
         if ($product->variant->price_old != 0 && $product->variant->price_old != $product->variant->price)
         {
-            echo '<strike><span id=\'old_cost\'>'.$product->variant->price_old.'</span> грн.</strike>';
+            echo '<strike><span id=\'old_cost\'>'.$product->variant->price_old.'</span> грн.</strike>&nbsp;';
         }
-        echo '<p class="cost">'.$product->variant->price.'  грн.</p>';
+        echo $product->variant->price.' <span>грн.</span></p>';
         echo '</div>';
 html,form,
 body { padding:0;margin:0;
-    font-family: 'Roboto';font-size:14px;color:#1d1d1b;height:100%;
+    font-family: 'Roboto';font-size:14px;color:#333;height:100%;
 }
 h1,h2,h3{margin:0px;padding:0px 0px 10px 0px;}
 .fl{float:left;}
@@ -28,12 +28,13 @@ a:hover{color:#799920;}
 nav.top{background:#f5f5f5;padding:10px 0px;border-bottom:1px solid #d2d2d2;font-size:12px;}
 nav.top    ul{list-style:none;margin:0px;padding:0px;}
 nav.top ul li{float:left;padding-right:20px;}
+nav.top ul li a{font-size: 12px;}
 nav.top a{color:#6a6a6a;text-decoration:none;}
 #help{background:url('../img/help.png') right no-repeat;padding-right:20px;}
 #help span{border-bottom:1px dotted #6a6a6a;}
-#login{background:url('../img/login.png') right no-repeat;padding-right:20px;}
+#login{background:url('../img/login.png') right no-repeat;padding-right:20px; font-size: 12px;}
 #login span{border-bottom:1px dotted #6a6a6a;}
 .search{margin:-5px 0px -5px 100px;float:left;}
@@ -106,17 +107,16 @@ a.myorders{color:#f75d50}
 .why_me_, .products {
     border-top: 1px solid #d2d2d2;
 }
-.products ul{list-style:none;margin:0px;padding:0px;}
-.products ul li.item{float:left;width:160px;margin:0px 35px 15px;text-align:center;position:relative;}
-.products ul li a.name{display:block;color:#494949;text-decoration:none;margin:15px 0px;height:30px;text-transform: uppercase;overflow: hidden;}
+.products ul{list-style:none;margin:0;padding:0;}
+.products ul li.item{float:left;width:192px;margin:0 0 50px 0;text-align:center;position:relative;}
+.products ul li a.name{display:block;color:#333;font-size: 15px;text-decoration:none;margin:15px 0 0 0;height:35px;overflow: hidden; box-sizing: border-box;padding: 0 10px;}
 .products ul li .info{text-align: left;}
 .pn{border:none;}
-.cost{color:#f75d50;font-size:20px;margin:0px;padding:0px;}
-.cost span.valute{font-size:16px;}
-strike{font-size:18px;}
-
-a.link_buy{font-size: 15px; display:block;margin:10px auto;width:122px;height:38px;line-height:38px;text-transform: uppercase;color:#ffffff;text-decoration:none;font-weight:600;text-align:center;
+.cost{color:#f75d50;font-size:18px;margin:0;padding:0;}
+.cost span, .cost span.valute {font-size: 14px;}
+strike, strike span#old_cost{font-size:14px; color: #333}
+a.link_buy{font-size: 12px; display:block;margin:0 auto 10px auto;width:122px;height:29px;line-height:32px;text-transform: uppercase;color:#ffffff;text-decoration:none;font-weight:600;text-align:center;
     background: #95ba2f;
     border-radius: 4px;
     border-bottom: 3px solid #799920;
@@ -128,7 +128,7 @@ a.link_buy:active {
     background: #799920;
     border-bottom: 3px solid #799920;
 }
-.mycarousel{position:absolute;right:-15px;top:-20px;}
+.mycarousel{position:absolute;right:0;top:13px;}
 ul.mycarousel{list-style:none;margin:0px;padding:0px;}
 ul.mycarousel li{margin:0px;padding:0px;}
 .mycarousel img{border:1px solid #d2d2d2;}
@@ -177,7 +177,7 @@ a.more_map{color:#99a5ad;border-bottom:1px dotted #99a5ad;text-decoration:none;f
 .loyout{padding:20px 0px;}
-.leftbar{float:left;width:200px; }
+.leftbar{float:left;width:172px;margin-right: 20px; }
 .rightbar{float:right;width:380px;margin-left:35px;}
 .rightbar2{float:right;width:320px;}
 .content {overflow:hidden;min-height:500px;}
@@ -186,9 +186,9 @@ a.more_map{color:#99a5ad;border-bottom:1px dotted #99a5ad;text-decoration:none;f
 * html .content2{height:1%;}
 .filters{border-top:1px solid #d2d2d2;padding:20px 0px 0px;margin-top:20px;}
-.filters .begin{text-transform: uppercase;font-weight:bold;}
-.filters ul{list-style:none;margin:0px;padding:0px;line-height:22px;}
-.filters ul li a{color:#8fa951;text-decoration:none;}
+.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 a:hover{text-decoration:underline;}
 .productLeftBar{float:left;width:230px;padding-left:20px;margin-right:20px;}
@@ -338,12 +338,14 @@ 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;}
+.content ul.pagination{list-style:none;text-align:center; margin: 0 0 16px 0;padding: 0;}
 .content ul.pagination li{display:inline;}
-.content ul.pagination li a{padding:3px;color:#82a02f;font-size: 16px;margin:0px; text-decoration: none;  }
+.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}
 .content ul.pagination li.active a{color: #333333;}
-.boxitem{height:300px;}
+.boxitem{
+    height:283px;
+}
 ul.social {margin-top: 20px;}
 .social{list-style: none;margin: 10px;padding: 0px;height:48px;}
 .social li{display:inline-block;margin-right:7px;padding-bottom: 10px;}
@@ -397,7 +399,7 @@ ul.social {margin-top: 20px;}
 .view_products2 li{margin:10px 0px;}
-.pixbox{width:100%;height:200px;overflow: hidden;text-align: center;}
+.pixbox{width:160px;margin:0 auto;height:200px;overflow: hidden;text-align: center;}
 .form-order{background:#f5f5f5;padding:10px;border:1px solid #d2d2d2;}
@@ -415,17 +417,21 @@ ul.social {margin-top: 20px;}
     vertical-align: middle;
 }
 .pixbox img {
-    max-width: 134px;
+    max-width: 160px;
     max-height: 200px;
     vertical-align: middle;
 }
 .pagination li.prev.disabled span {
-    padding: 9px;
-    border-radius: 10%;
-    color: #4D5458;
-    font-size: 14px;
-    margin: 0px;
-    border: 1px solid #4d5458;
+    /*padding: 9px;*/
+    /*border-radius: 10%;*/
+    /*color: #4D5458;*/
+    /*font-size: 14px;*/
+    /*margin: 0px;*/
+    /*border: 1px solid #4d5458;*/
+    display: none;
+}
+.pagination li.next.disabled span {
+    display: none;
 }
 .fr {float: right;}
@@ -871,6 +877,7 @@ a.active{font-weight:bold;text-decoration: underline;}
     line-height: 6px;
     background: #fff;
     border: 2px solid #fff;
+    box-shadow: 0px 0px 5px 0px rgba(54, 54, 54, 0.75);
 }
 #HOME_SLIDER .jssorb03 .av {
     background: none;
@@ -935,7 +942,7 @@ a.active{font-weight:bold;text-decoration: underline;}
 ul.product-special {
     position: absolute;
     top: 0;
-    left: 0;
+    left: 16px;
 }
 ul.product-special li {
     color: #333;
@@ -948,7 +955,9 @@ ul.product-special li {
     position: relative;
     border-top-left-radius: 4px;
     border-bottom-left-radius: 4px;
+    margin-top: 8px;
 }
+ul.product-special li:first-child {margin-top: 0}
 ul.product-special li.top {
     background: #fbc665;
 }
@@ -985,4 +994,43 @@ ul.product-special li.promo:after {
     border: 11px solid transparent;
     border-top: 5px solid #f75d50;
     transform: rotate(-90deg);
+}
+.cost-block {
+    margin-top: 1px;
+}
+.products.pn a.link_buy {
+    margin-bottom: 0;
+}
+.products.pn {
+    padding-bottom: 0;
+}
+.products.pn>ul {
+    width: 100%;
+    float: left;
+    margin-bottom: -3px;
+}
+
+._form_checkbox_reset, .sort_block ul li a, .sort_block {
+    font-size: 12px;
+}
+.sort_block ul li a {
+    color: #8fa951;
+}
+.sort_block ul li a:hover {
+    color: #333;
+}
+#HOME_SLIDER .jssora03l, #HOME_SLIDER .jssora03r {
+    width: 36px;
+    height: 340px;
+    background: url('../img/new_arrows_.png') no-repeat;
+}
+#HOME_SLIDER .jssora03l, #HOME_SLIDER .jssora03l:hover {
+    background-position: 0 50%;
+    left: 0;
+    top: 0;
+}
+#HOME_SLIDER .jssora03r, #HOME_SLIDER .jssora03r:hover {
+    background-position: -36px 50%;
+    right: 0;
+    top: 0;
 }
 \ No newline at end of file