Administrator / new_rukzachok-1

Commit 55e6fa66e1056aaa412750deb85dcffc2aa2d5cb

Authored by Karnovsky A
2 parents 868680ca aaadf951

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

Showing 4 changed files with 81 additions and 33 deletions   Show diff stats
Inline Side-by-side
common/modules/product/widgets/views/product_smart.php
  Show/Hide comments   View file @55e6fa6
... ... @@ -21,14 +21,14 @@ use yii\helpers\Url;
21 21 <?php
22 22  
23 23 echo '<div class="cost-block">';
24   -
  24 + echo '<p class="cost">';
25 25 // есть скидка
26 26 if ($product->variant->price_old != 0 && $product->variant->price_old != $product->variant->price)
27 27 {
28   - echo '<strike><span id=\'old_cost\'>'.$product->variant->price_old.'</span> грн.</strike>';
  28 + echo '<strike><span id=\'old_cost\'>'.$product->variant->price_old.'</span> грн.</strike>&nbsp;';
29 29 }
30 30  
31   - echo '<p class="cost">'.$product->variant->price.' грн.</p>';
  31 + echo $product->variant->price.' <span>грн.</span></p>';
32 32  
33 33 echo '</div>';
34 34  
... ...
frontend/views/catalog/product_item.php
  Show/Hide comments   View file @55e6fa6
... ... @@ -31,14 +31,14 @@ use yii\helpers\Url;
31 31 <?php
32 32  
33 33 echo '<div class="cost-block">';
34   -
  34 + echo '<p class="cost">';
35 35 // есть скидка
36 36 if ($product->variant->price_old != 0 && $product->variant->price_old != $product->variant->price)
37 37 {
38   - echo '<strike><span id=\'old_cost\'>'.$product->variant->price_old.'</span> грн.</strike>';
  38 + echo '<strike><span id=\'old_cost\'>'.$product->variant->price_old.'</span> грн.</strike>&nbsp;';
39 39 }
40 40  
41   - echo '<p class="cost">'.$product->variant->price.' грн.</p>';
  41 + echo $product->variant->price.' <span>грн.</span></p>';
42 42  
43 43 echo '</div>';
44 44  
... ...
frontend/web/css/style.css
  Show/Hide comments   View file @55e6fa6
1 1 html,form,
2 2 body { padding:0;margin:0;
3   - font-family: 'Roboto';font-size:14px;color:#1d1d1b;height:100%;
  3 + font-family: 'Roboto';font-size:14px;color:#333;height:100%;
4 4 }
5 5 h1,h2,h3{margin:0px;padding:0px 0px 10px 0px;}
6 6 .fl{float:left;}
... ... @@ -28,12 +28,13 @@ a:hover{color:#799920;}
28 28 nav.top{background:#f5f5f5;padding:10px 0px;border-bottom:1px solid #d2d2d2;font-size:12px;}
29 29 nav.top ul{list-style:none;margin:0px;padding:0px;}
30 30 nav.top ul li{float:left;padding-right:20px;}
  31 +nav.top ul li a{font-size: 12px;}
31 32 nav.top a{color:#6a6a6a;text-decoration:none;}
32 33  
33 34 #help{background:url('../img/help.png') right no-repeat;padding-right:20px;}
34 35 #help span{border-bottom:1px dotted #6a6a6a;}
35 36  
36   -#login{background:url('../img/login.png') right no-repeat;padding-right:20px;}
  37 +#login{background:url('../img/login.png') right no-repeat;padding-right:20px; font-size: 12px;}
37 38 #login span{border-bottom:1px dotted #6a6a6a;}
38 39  
39 40 .search{margin:-5px 0px -5px 100px;float:left;}
... ... @@ -106,17 +107,16 @@ a.myorders{color:#f75d50}
106 107 .why_me_, .products {
107 108 border-top: 1px solid #d2d2d2;
108 109 }
109   -.products ul{list-style:none;margin:0px;padding:0px;}
110   -.products ul li.item{float:left;width:160px;margin:0px 35px 15px;text-align:center;position:relative;}
111   -.products ul li a.name{display:block;color:#494949;text-decoration:none;margin:15px 0px;height:30px;text-transform: uppercase;overflow: hidden;}
  110 +.products ul{list-style:none;margin:0;padding:0;}
  111 +.products ul li.item{float:left;width:192px;margin:0 0 50px 0;text-align:center;position:relative;}
  112 +.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;}
112 113 .products ul li .info{text-align: left;}
113 114 .pn{border:none;}
114 115  
115   -.cost{color:#f75d50;font-size:20px;margin:0px;padding:0px;}
116   -.cost span.valute{font-size:16px;}
117   -strike{font-size:18px;}
118   -
119   -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;
  116 +.cost{color:#f75d50;font-size:18px;margin:0;padding:0;}
  117 +.cost span, .cost span.valute {font-size: 14px;}
  118 +strike, strike span#old_cost{font-size:14px; color: #333}
  119 +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;
120 120 background: #95ba2f;
121 121 border-radius: 4px;
122 122 border-bottom: 3px solid #799920;
... ... @@ -128,7 +128,7 @@ a.link_buy:active {
128 128 background: #799920;
129 129 border-bottom: 3px solid #799920;
130 130 }
131   -.mycarousel{position:absolute;right:-15px;top:-20px;}
  131 +.mycarousel{position:absolute;right:0;top:13px;}
132 132 ul.mycarousel{list-style:none;margin:0px;padding:0px;}
133 133 ul.mycarousel li{margin:0px;padding:0px;}
134 134 .mycarousel img{border:1px solid #d2d2d2;}
... ... @@ -177,7 +177,7 @@ a.more_map{color:#99a5ad;border-bottom:1px dotted #99a5ad;text-decoration:none;f
177 177  
178 178  
179 179 .loyout{padding:20px 0px;}
180   -.leftbar{float:left;width:200px; }
  180 +.leftbar{float:left;width:172px;margin-right: 20px; }
181 181 .rightbar{float:right;width:380px;margin-left:35px;}
182 182 .rightbar2{float:right;width:320px;}
183 183 .content {overflow:hidden;min-height:500px;}
... ... @@ -186,9 +186,9 @@ a.more_map{color:#99a5ad;border-bottom:1px dotted #99a5ad;text-decoration:none;f
186 186 * html .content2{height:1%;}
187 187  
188 188 .filters{border-top:1px solid #d2d2d2;padding:20px 0px 0px;margin-top:20px;}
189   -.filters .begin{text-transform: uppercase;font-weight:bold;}
190   -.filters ul{list-style:none;margin:0px;padding:0px;line-height:22px;}
191   -.filters ul li a{color:#8fa951;text-decoration:none;}
  189 +.filters .begin{text-transform: uppercase;font-weight:bold; font-size: 12px;}
  190 +.filters ul{list-style:none;margin:0px;padding:0px;line-height:22px; margin-top: 6px;}
  191 +.filters ul li a{color:#8fa951;text-decoration:none; font-size: 13px;}
192 192 .filters ul li a:hover{text-decoration:underline;}
193 193  
194 194 .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;}
338 338  
339 339 .txts{color:#9da9b1;font-size:18px;margin-bottom:20px;}
340 340  
341   -.content ul.pagination{list-style:none;text-align:center;}
  341 +.content ul.pagination{list-style:none;text-align:center; margin: 0 0 16px 0;padding: 0;}
342 342 .content ul.pagination li{display:inline;}
343   -.content ul.pagination li a{padding:3px;color:#82a02f;font-size: 16px;margin:0px; text-decoration: none; }
  343 +.content ul.pagination li a{padding:3px;color:#82a02f;font-size: 15px;margin:0; text-decoration: none; }
344 344 .content ul.pagination li a:hover {text-decoration: underline}
345 345 .content ul.pagination li.active a{color: #333333;}
346   -.boxitem{height:300px;}
  346 +.boxitem{
  347 + height:283px;
  348 +}
347 349 ul.social {margin-top: 20px;}
348 350 .social{list-style: none;margin: 10px;padding: 0px;height:48px;}
349 351 .social li{display:inline-block;margin-right:7px;padding-bottom: 10px;}
... ... @@ -397,7 +399,7 @@ ul.social {margin-top: 20px;}
397 399 .view_products2 li{margin:10px 0px;}
398 400  
399 401  
400   -.pixbox{width:100%;height:200px;overflow: hidden;text-align: center;}
  402 +.pixbox{width:160px;margin:0 auto;height:200px;overflow: hidden;text-align: center;}
401 403  
402 404  
403 405 .form-order{background:#f5f5f5;padding:10px;border:1px solid #d2d2d2;}
... ... @@ -415,17 +417,21 @@ ul.social {margin-top: 20px;}
415 417 vertical-align: middle;
416 418 }
417 419 .pixbox img {
418   - max-width: 134px;
  420 + max-width: 160px;
419 421 max-height: 200px;
420 422 vertical-align: middle;
421 423 }
422 424 .pagination li.prev.disabled span {
423   - padding: 9px;
424   - border-radius: 10%;
425   - color: #4D5458;
426   - font-size: 14px;
427   - margin: 0px;
428   - border: 1px solid #4d5458;
  425 + /*padding: 9px;*/
  426 + /*border-radius: 10%;*/
  427 + /*color: #4D5458;*/
  428 + /*font-size: 14px;*/
  429 + /*margin: 0px;*/
  430 + /*border: 1px solid #4d5458;*/
  431 + display: none;
  432 +}
  433 +.pagination li.next.disabled span {
  434 + display: none;
429 435 }
430 436 .fr {float: right;}
431 437  
... ... @@ -871,6 +877,7 @@ a.active{font-weight:bold;text-decoration: underline;}
871 877 line-height: 6px;
872 878 background: #fff;
873 879 border: 2px solid #fff;
  880 + box-shadow: 0px 0px 5px 0px rgba(54, 54, 54, 0.75);
874 881 }
875 882 #HOME_SLIDER .jssorb03 .av {
876 883 background: none;
... ... @@ -935,7 +942,7 @@ a.active{font-weight:bold;text-decoration: underline;}
935 942 ul.product-special {
936 943 position: absolute;
937 944 top: 0;
938   - left: 0;
  945 + left: 16px;
939 946 }
940 947 ul.product-special li {
941 948 color: #333;
... ... @@ -948,7 +955,9 @@ ul.product-special li {
948 955 position: relative;
949 956 border-top-left-radius: 4px;
950 957 border-bottom-left-radius: 4px;
  958 + margin-top: 8px;
951 959 }
  960 +ul.product-special li:first-child {margin-top: 0}
952 961 ul.product-special li.top {
953 962 background: #fbc665;
954 963 }
... ... @@ -985,4 +994,43 @@ ul.product-special li.promo:after {
985 994 border: 11px solid transparent;
986 995 border-top: 5px solid #f75d50;
987 996 transform: rotate(-90deg);
  997 +}
  998 +.cost-block {
  999 + margin-top: 1px;
  1000 +}
  1001 +.products.pn a.link_buy {
  1002 + margin-bottom: 0;
  1003 +}
  1004 +.products.pn {
  1005 + padding-bottom: 0;
  1006 +}
  1007 +.products.pn>ul {
  1008 + width: 100%;
  1009 + float: left;
  1010 + margin-bottom: -3px;
  1011 +}
  1012 +
  1013 +._form_checkbox_reset, .sort_block ul li a, .sort_block {
  1014 + font-size: 12px;
  1015 +}
  1016 +.sort_block ul li a {
  1017 + color: #8fa951;
  1018 +}
  1019 +.sort_block ul li a:hover {
  1020 + color: #333;
  1021 +}
  1022 +#HOME_SLIDER .jssora03l, #HOME_SLIDER .jssora03r {
  1023 + width: 36px;
  1024 + height: 340px;
  1025 + background: url('../img/new_arrows_.png') no-repeat;
  1026 +}
  1027 +#HOME_SLIDER .jssora03l, #HOME_SLIDER .jssora03l:hover {
  1028 + background-position: 0 50%;
  1029 + left: 0;
  1030 + top: 0;
  1031 +}
  1032 +#HOME_SLIDER .jssora03r, #HOME_SLIDER .jssora03r:hover {
  1033 + background-position: -36px 50%;
  1034 + right: 0;
  1035 + top: 0;
988 1036 }
989 1037 \ No newline at end of file
... ...
frontend/web/img/new_arrows_.png 0 → 100644
View file @55e6fa6

27 KB