Administrator / new_rukzachok-1

Commit 61b046ac03ec6716d7dbd8e5ecc5cb3f2963a54b

Authored by Karnovsky A
2 parents 445bce5f 839704ce

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

Showing 4 changed files with 169 additions and 34 deletions   Show diff stats
Inline Side-by-side
common/config/main.php
  Show/Hide comments   View file @61b046a
... ... @@ -85,8 +85,8 @@ return [
85 85 ],
86 86 'product_trumb2' => [
87 87 'resize' => [
88   - 'width' => 100,
89   - 'height' => 100,
  88 + 'width' => 98,
  89 + 'height' => 98,
90 90 'master' => null
91 91 ],
92 92 ],
... ... @@ -146,7 +146,7 @@ return [
146 146 ],
147 147 'list' => [
148 148 'resize' => [
149   - 'width' => 134,
  149 + 'width' => 160,
150 150 'height' => 200,
151 151 'master' => null
152 152 ],
... ...
common/modules/product/widgets/views/products_block.php
  Show/Hide comments   View file @61b046a
1   -<div class="special-products products<?= (!empty($class) ? ' '. $class : '')?>">
2   - <h3><?= $title?></h3>
3   - <ul>
4   - <?php foreach($products as $product) :?>
5   - <?= $this->render('product_smart', ['product' => $product]);?>
6   - <?php endforeach?>
7   - </ul>
8   - <div class="both"></div>
  1 +<div class="_prd_spec-wr">
  2 + <div class="special-products products<?= (!empty($class) ? ' '. $class : '')?>">
  3 + <h3><?= $title?></h3>
  4 + <ul>
  5 + <?php foreach($products as $product) :?>
  6 + <?= $this->render('product_smart', ['product' => $product]);?>
  7 + <?php endforeach?>
  8 + </ul>
  9 + <div class="both"></div>
  10 + </div>
9 11 </div>
10 12 \ No newline at end of file
... ...
frontend/views/catalog/product.php
  Show/Hide comments   View file @61b046a
... ... @@ -102,7 +102,7 @@ $this-&gt;registerJs (&quot;
102 102 data-cost="<?= $variant->price ?>"
103 103 data-old_cost="<?= $variant->price_old ?>" data-id="<?= $variant->product_variant_id ?>" data-art="<?= $variant->sku ?>"
104 104 data-color="<?= $variant->name ?>"
105   - data-image="<?= $variant->imageUrl ?>"
  105 + data-image="<?= \common\components\artboximage\ArtboxImageHelper::getImageSrc($variant->imageUrl, 'list') ?>"
106 106 data-imageoriginal="<?= $variant->imageUrl ?>"
107 107 title="<?= $product->fullname ?>">
108 108 <?= \common\components\artboximage\ArtboxImageHelper::getImage($variant->imageUrl, 'product_variant')?>
... ... @@ -158,7 +158,7 @@ $this-&gt;registerJs (&quot;
158 158 <div class="content">
159 159 <div class="pic">
160 160 <center>
161   - <a href="#" rel="shadowbox[gal]" id="picoriginal"><?= \common\components\artboximage\ArtboxImageHelper::getImage($product->imageUrl, 'product')?></a>
  161 + <a href="#" rel="shadowbox[gal]" id="picoriginal"><?= \common\components\artboximage\ArtboxImageHelper::getImage($product->imageUrl, 'product',['id'=>'pic'])?></a>
162 162 </center>
163 163 </div>
164 164 <ul class="product_colors">
... ... @@ -170,4 +170,4 @@ $this-&gt;registerJs (&quot;
170 170 </ul>
171 171 </div>
172 172 <div class="both"></div>
173   -</div>
174 173 \ No newline at end of file
  174 +</div>
... ...
frontend/web/css/style.css
  Show/Hide comments   View file @61b046a
... ... @@ -67,7 +67,7 @@ nav input[type=&quot;submit&quot;]{width:35px;height:29px;border:none;background:url(&#39;../i
67 67 .basket span.more {margin-bottom: -1px}
68 68 .menu{
69 69 background:#596065;
70   - /*border:1px solid #e8e8e8;*/
  70 + border:1px solid #e8e8e8;
71 71 }
72 72 .menu ul{margin:0px;padding:0px;list-style:none;}
73 73 .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;}
164 164 .map{padding:5px 0px 5px 25px;background:url('../img/map.png') left no-repeat; margin-bottom: 7px;}
165 165 a.more_map{color:#99a5ad;border-bottom:1px dotted #99a5ad;text-decoration:none;font-size:11px;text-align:center;}
166 166  
167   -.bread-crumbs{padding:10px 0px 10px 20px;border-bottom:1px solid #d2d2d2;}
168   -.bread-crumbs ul{list-style:none;margin:0px 0px 0px 0px;padding:0px;}
169   -.bread-crumbs ul li{float:left;padding-right:5px;}
  167 +.bread-crumbs{padding:0 0 0 20px;border-bottom:1px solid #d2d2d2; height: 29px;}
  168 +.bread-crumbs ul{list-style:none;margin:0 0 0 0;padding:0; height: 29px;}
  169 +.bread-crumbs ul li{float:left;padding-left:20px;height: 100%; line-height: 29px; color: #7d7d7d; position: relative}
  170 +.bread-crumbs ul li:first-child {padding-left: 0}
  171 +.bread-crumbs ul li a {font-size: 12px; display: block; color: #7d7d7d}
170 172 .bread-crumbs ul li a:visited,.bread-crumbs ul li a:link{font-size:14px;color:#7d7d7d;text-decoration:underline;}
171 173 .bread-crumbs ul li a:hover{color:#464646;text-decoration: none;}
172 174 .breadcrumb > li + li:before {
173 175 color: #ccc;
174   - content: "/ ";
175   - padding: 0 5px;
  176 + content: "/";
  177 + position: absolute;
  178 + top: 0;
  179 + left: 8px;
176 180 }
177 181  
178 182  
... ... @@ -188,20 +192,69 @@ a.more_map{color:#99a5ad;border-bottom:1px dotted #99a5ad;text-decoration:none;f
188 192 .filters{border-top:1px solid #d2d2d2;padding:20px 0px 0px;margin-top:20px;}
189 193 .filters .begin{text-transform: uppercase;font-weight:bold; font-size: 12px;}
190 194 .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;}
  195 +.filters ul li {
  196 + position: relative;
  197 + box-sizing: border-box;
  198 + padding-left: 24px;
  199 + line-height: 16px;
  200 + margin-top: 7px;
  201 +}
  202 +.filters ul li:first-child {margin-top: 0}
  203 +.filters ul li>input {
  204 + position: absolute;
  205 + left: 4px;
  206 + margin: -6px 0 0 ;
  207 + top: 50%;
  208 +}
  209 +.filters ul li a{color:#8fa951;text-decoration:none; font-size: 13px; line-height: 16px;}
192 210 .filters ul li a:hover{text-decoration:underline;}
193 211  
194 212 .productLeftBar{float:left;width:230px;padding-left:20px;margin-right:20px;}
195 213 .productRightBar{float:right;width:280px;margin-left:20px;}
196 214 .productLeftBar h1{font-size:27px;border-bottom:1px solid #d2d2d2;margin-bottom:10px;}
197 215  
198   -ul.product_mod{list-style:none;margin:10px 0px 0px 0px;padding:0px;}
199   -ul.product_mod li{float:left;margin-right:7px;}
200   -ul.product_mod li img{border:1px solid #d2d2d2;}
  216 +ul.product_mod{list-style:none;margin:10px 0 0 0;padding:0; float: left;}
  217 +ul.product_mod li{
  218 + float:left;
  219 + width: 46px;
  220 + height: 46px;
  221 + background: #fff;
  222 + border: 1px solid #d2d2d2;
  223 + margin: 7px 7px 0 0;
  224 + text-align: center;
  225 +}
  226 +ul.product_mod li a{
  227 + width: 46px;
  228 + height: 46px;
  229 + display: table-cell;
  230 + vertical-align: middle;
  231 +}
  232 +ul.product_mod li img{
  233 + vertical-align: middle;
  234 + max-width: 46px;
  235 + max-height: 46px;
  236 +}
201 237  
202   -ul.product_colors{list-style:none;margin:10px 0px 0px 0px;padding:0px;}
203   -ul.product_colors li{float:left;margin-right:7px;}
204   -ul.product_colors li img{border:1px solid #d2d2d2;}
  238 +ul.product_colors{list-style:none;margin:30px 0 0 0 ;padding:0; float: left;}
  239 +ul.product_colors li{
  240 + float:left;
  241 + margin:10px 10px 0 0;
  242 + width: 98px;
  243 + height: 98px;
  244 + text-align: center;
  245 + border: 1px solid #d2d2d2;
  246 +}
  247 +ul.product_colors li a {
  248 + width: 98px;
  249 + height: 98px;
  250 + vertical-align: middle;
  251 + display: table-cell;
  252 +}
  253 +ul.product_colors li img{
  254 + max-width: 98px;
  255 + max-height: 98px;
  256 + vertical-align: middle;
  257 +}
205 258 .productLeftBar .begin{text-transform: uppercase;font-weight:bold;}
206 259  
207 260 .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;}
338 391  
339 392 .txts{color:#9da9b1;font-size:18px;margin-bottom:20px;}
340 393  
341   -.content ul.pagination{list-style:none;text-align:center; margin: 0 0 16px 0;padding: 0;}
  394 +.content ul.pagination{list-style:none;text-align:center; margin: 0 0 16px 0;padding: 0 0 20px 0; border-bottom: 1px solid #d2d2d2;}
342 395 .content ul.pagination li{display:inline;}
343 396 .content ul.pagination li a{padding:3px;color:#82a02f;font-size: 15px;margin:0; text-decoration: none; }
344 397 .content ul.pagination li a:hover {text-decoration: underline}
... ... @@ -879,12 +932,10 @@ a.active{font-weight:bold;text-decoration: underline;}
879 932 border: 2px solid #fff;
880 933 box-shadow: 0px 0px 5px 0px rgba(54, 54, 54, 0.75);
881 934 }
882   -#HOME_SLIDER .jssorb03 .av {
883   - background: none;
884   -}
885   -#HOME_SLIDER .jssorb03 div.av:hover, #HOME_SLIDER .jssorb03 div.av:active {
  935 +
  936 +#HOME_SLIDER .jssorb03 div.av:hover, #HOME_SLIDER .jssorb03 div.av:active, #HOME_SLIDER .jssorb03 .av {
886 937 cursor: default;
887   - background: none;
  938 + background: #333;
888 939 }
889 940 .special-products {
890 941 padding-top: 30px;
... ... @@ -1013,6 +1064,28 @@ ul.product-special li.promo:after {
1013 1064 ._form_checkbox_reset, .sort_block ul li a, .sort_block {
1014 1065 font-size: 12px;
1015 1066 }
  1067 +.filter_accept_bloc {margin-top: 13px; margin-bottom: 0;}
  1068 +._form_checkbox_reset {
  1069 + color: #6a6a6a;
  1070 + display: block;
  1071 + width: 128px;
  1072 + height: 28px;
  1073 + border: 1px solid #d2d2d2;
  1074 + line-height: 28px;
  1075 + text-align: center;
  1076 + border-radius: 4px;
  1077 + text-decoration: none;
  1078 + margin: 0 auto;
  1079 +}
  1080 +._form_checkbox_reset:hover {
  1081 + border: 1px solid #95ba2f;
  1082 + color: #6a6a6a;
  1083 +}
  1084 +._form_checkbox_reset:active {
  1085 + border: 1px solid #95ba2f;
  1086 + background: #95ba2f;
  1087 + color: #fff;
  1088 +}
1016 1089 .sort_block ul li a {
1017 1090 color: #8fa951;
1018 1091 }
... ... @@ -1033,4 +1106,64 @@ ul.product-special li.promo:after {
1033 1106 background-position: -36px 50%;
1034 1107 right: 0;
1035 1108 top: 0;
1036   -}
1037 1109 \ No newline at end of file
  1110 +}
  1111 +.loyout ._prd_spec-wr {margin-top: 10px;}
  1112 +.loyout .special-products:first-child {
  1113 + border-top: 0;
  1114 + padding-top: 0;
  1115 +
  1116 +}
  1117 +.irs-slider {
  1118 + width: 13px;
  1119 + height: 13px;
  1120 + top: 25px;
  1121 + border-radius: 100%;
  1122 + box-shadow: none;
  1123 + border: 1px solid #d2d2d2;
  1124 + background: #ffffff;
  1125 + background: -moz-linear-gradient(top, #ffffff 0%, #ebebeb 100%);
  1126 + background: -webkit-linear-gradient(top, #ffffff 0%,#ebebeb 100%);
  1127 + background: linear-gradient(to bottom, #ffffff 0%,#ebebeb 100%);
  1128 + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#ebebeb',GradientType=0 );
  1129 +}
  1130 +.irs-slider.state_hover, .irs-slider:hover {
  1131 + background: #ffffff;
  1132 +}
  1133 +.irs-slider:after {
  1134 + display: none;
  1135 +}
  1136 +.irs-slider:before {
  1137 + content: "";
  1138 + position: absolute;
  1139 + width: 5px;
  1140 + height: 5px;
  1141 + z-index: 2;
  1142 + border: 1px solid #d2d2d2;
  1143 + border-radius: 100%;
  1144 + background: #799920;
  1145 + top: 3px;
  1146 + left: 3px;
  1147 +}
  1148 +.irs-bar {
  1149 + height: 3px;
  1150 + top: 30px;
  1151 +}
  1152 +.irs-line {
  1153 + height: 9px;
  1154 + background: #ebebeb;
  1155 + border: 1px solid #d2d2d2;
  1156 + top: 27px;
  1157 +}
  1158 +.irs-line:before {
  1159 + width: 166px;
  1160 + height: 5px;
  1161 + position: absolute;
  1162 + content: '';
  1163 + top: 2px;
  1164 + left: 2px;
  1165 + background: #d2d2d2;
  1166 + border-radius: 5px;
  1167 +}
  1168 +.irs-min, .irs-max {display: none;}
  1169 +.irs {height: 49px;}
  1170 +.price_filter.first_price_li {margin-top: 8px;}
1038 1171 \ No newline at end of file
... ...