Commit 7aeecbdca08f04ba859c81e3b0a65ea5c970b163
1 parent
86112335
Веталь
Showing
3 changed files
with
24 additions
and
18 deletions
Show diff stats
common/modules/product/widgets/views/product_smart.php
@@ -21,14 +21,14 @@ use yii\helpers\Url; | @@ -21,14 +21,14 @@ use yii\helpers\Url; | ||
21 | <?php | 21 | <?php |
22 | 22 | ||
23 | echo '<div class="cost-block">'; | 23 | echo '<div class="cost-block">'; |
24 | - | 24 | + echo '<p class="cost">'; |
25 | // есть скидка | 25 | // есть скидка |
26 | if ($product->variant->price_old != 0 && $product->variant->price_old != $product->variant->price) | 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> '; |
29 | } | 29 | } |
30 | 30 | ||
31 | - echo '<p class="cost">'.$product->variant->price.' <span>грн.</span></p>'; | 31 | + echo $product->variant->price.' <span>грн.</span></p>'; |
32 | 32 | ||
33 | echo '</div>'; | 33 | echo '</div>'; |
34 | 34 |
frontend/views/catalog/product_item.php
@@ -31,14 +31,14 @@ use yii\helpers\Url; | @@ -31,14 +31,14 @@ use yii\helpers\Url; | ||
31 | <?php | 31 | <?php |
32 | 32 | ||
33 | echo '<div class="cost-block">'; | 33 | echo '<div class="cost-block">'; |
34 | - | 34 | + echo '<p class="cost">'; |
35 | // есть скидка | 35 | // есть скидка |
36 | if ($product->variant->price_old != 0 && $product->variant->price_old != $product->variant->price) | 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> '; |
39 | } | 39 | } |
40 | 40 | ||
41 | - echo '<p class="cost">'.$product->variant->price.' <span>грн.</span></p>'; | 41 | + echo $product->variant->price.' <span>грн.</span></p>'; |
42 | 42 | ||
43 | echo '</div>'; | 43 | echo '</div>'; |
44 | 44 |
frontend/web/css/style.css
@@ -108,16 +108,14 @@ a.myorders{color:#f75d50} | @@ -108,16 +108,14 @@ a.myorders{color:#f75d50} | ||
108 | } | 108 | } |
109 | .products ul{list-style:none;margin:0px;padding:0px;} | 109 | .products ul{list-style:none;margin:0px;padding:0px;} |
110 | .products ul li.item{float:left;width:192px;margin:0px 0 15px 0;text-align:center;position:relative;} | 110 | .products ul li.item{float:left;width:192px;margin:0px 0 15px 0;text-align:center;position:relative;} |
111 | -.products ul li a.name{display:block;color:#333;font-size: 15px;text-decoration:none;margin:15px 0px;height:35px;overflow: hidden; box-sizing: border-box;padding: 0 10px;} | 111 | +.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 | .products ul li .info{text-align: left;} | 112 | .products ul li .info{text-align: left;} |
113 | .pn{border:none;} | 113 | .pn{border:none;} |
114 | 114 | ||
115 | -.cost{color:#f75d50;font-size:20px;margin:0;padding:0;} | ||
116 | -.cost span {font-size: 15px;} | ||
117 | -.cost span.valute{font-size:15px;} | ||
118 | -strike{font-size:20px;} | ||
119 | -strike span#old_cost {font-size: 15px;} | ||
120 | -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; | 115 | +.cost{color:#f75d50;font-size:18px;margin:0;padding:0;} |
116 | +.cost span, .cost span.valute {font-size: 14px;} | ||
117 | +strike, strike span#old_cost{font-size:14px; color: #333} | ||
118 | +a.link_buy{font-size: 15px; display:block;margin:0 auto 10px auto;width:122px;height:38px;line-height:38px;text-transform: uppercase;color:#ffffff;text-decoration:none;font-weight:600;text-align:center; | ||
121 | background: #95ba2f; | 119 | background: #95ba2f; |
122 | border-radius: 4px; | 120 | border-radius: 4px; |
123 | border-bottom: 3px solid #799920; | 121 | border-bottom: 3px solid #799920; |
@@ -129,7 +127,7 @@ a.link_buy:active { | @@ -129,7 +127,7 @@ a.link_buy:active { | ||
129 | background: #799920; | 127 | background: #799920; |
130 | border-bottom: 3px solid #799920; | 128 | border-bottom: 3px solid #799920; |
131 | } | 129 | } |
132 | -.mycarousel{position:absolute;right:-15px;top:-20px;} | 130 | +.mycarousel{position:absolute;right:0;top:13px;} |
133 | ul.mycarousel{list-style:none;margin:0px;padding:0px;} | 131 | ul.mycarousel{list-style:none;margin:0px;padding:0px;} |
134 | ul.mycarousel li{margin:0px;padding:0px;} | 132 | ul.mycarousel li{margin:0px;padding:0px;} |
135 | .mycarousel img{border:1px solid #d2d2d2;} | 133 | .mycarousel img{border:1px solid #d2d2d2;} |
@@ -187,9 +185,9 @@ a.more_map{color:#99a5ad;border-bottom:1px dotted #99a5ad;text-decoration:none;f | @@ -187,9 +185,9 @@ a.more_map{color:#99a5ad;border-bottom:1px dotted #99a5ad;text-decoration:none;f | ||
187 | * html .content2{height:1%;} | 185 | * html .content2{height:1%;} |
188 | 186 | ||
189 | .filters{border-top:1px solid #d2d2d2;padding:20px 0px 0px;margin-top:20px;} | 187 | .filters{border-top:1px solid #d2d2d2;padding:20px 0px 0px;margin-top:20px;} |
190 | -.filters .begin{text-transform: uppercase;font-weight:bold;} | 188 | +.filters .begin{text-transform: uppercase;font-weight:bold; font-size: 12px;} |
191 | .filters ul{list-style:none;margin:0px;padding:0px;line-height:22px;} | 189 | .filters ul{list-style:none;margin:0px;padding:0px;line-height:22px;} |
192 | -.filters ul li a{color:#8fa951;text-decoration:none;} | 190 | +.filters ul li a{color:#8fa951;text-decoration:none; font-size: 13px;} |
193 | .filters ul li a:hover{text-decoration:underline;} | 191 | .filters ul li a:hover{text-decoration:underline;} |
194 | 192 | ||
195 | .productLeftBar{float:left;width:230px;padding-left:20px;margin-right:20px;} | 193 | .productLeftBar{float:left;width:230px;padding-left:20px;margin-right:20px;} |
@@ -344,7 +342,9 @@ ul.brends_list li{float:left;text-align:center;margin:0px 15px 20px 15px;} | @@ -344,7 +342,9 @@ ul.brends_list li{float:left;text-align:center;margin:0px 15px 20px 15px;} | ||
344 | .content ul.pagination li a{padding:3px;color:#82a02f;font-size: 16px;margin:0px; text-decoration: none; } | 342 | .content ul.pagination li a{padding:3px;color:#82a02f;font-size: 16px;margin:0px; text-decoration: none; } |
345 | .content ul.pagination li a:hover {text-decoration: underline} | 343 | .content ul.pagination li a:hover {text-decoration: underline} |
346 | .content ul.pagination li.active a{color: #333333;} | 344 | .content ul.pagination li.active a{color: #333333;} |
347 | -.boxitem{height:300px;} | 345 | +.boxitem{ |
346 | + height:289px; | ||
347 | +} | ||
348 | ul.social {margin-top: 20px;} | 348 | ul.social {margin-top: 20px;} |
349 | .social{list-style: none;margin: 10px;padding: 0px;height:48px;} | 349 | .social{list-style: none;margin: 10px;padding: 0px;height:48px;} |
350 | .social li{display:inline-block;margin-right:7px;padding-bottom: 10px;} | 350 | .social li{display:inline-block;margin-right:7px;padding-bottom: 10px;} |
@@ -416,7 +416,7 @@ ul.social {margin-top: 20px;} | @@ -416,7 +416,7 @@ ul.social {margin-top: 20px;} | ||
416 | vertical-align: middle; | 416 | vertical-align: middle; |
417 | } | 417 | } |
418 | .pixbox img { | 418 | .pixbox img { |
419 | - max-width: 134px; | 419 | + max-width: 160px; |
420 | max-height: 200px; | 420 | max-height: 200px; |
421 | vertical-align: middle; | 421 | vertical-align: middle; |
422 | } | 422 | } |
@@ -988,4 +988,10 @@ ul.product-special li.promo:after { | @@ -988,4 +988,10 @@ ul.product-special li.promo:after { | ||
988 | border: 11px solid transparent; | 988 | border: 11px solid transparent; |
989 | border-top: 5px solid #f75d50; | 989 | border-top: 5px solid #f75d50; |
990 | transform: rotate(-90deg); | 990 | transform: rotate(-90deg); |
991 | +} | ||
992 | +.cost-block { | ||
993 | + margin-top: 1px; | ||
994 | +} | ||
995 | +.products.pn a.link_buy { | ||
996 | + | ||
991 | } | 997 | } |
992 | \ No newline at end of file | 998 | \ No newline at end of file |