Administrator / new_rukzachok-1

Commit 70b7f09bd62e1c5f0e3a9f4e8057ca98a992ad9e

Authored by Administrator
2 parents 24ebe36c 8a4849ec

Merge remote-tracking branch 'origin/master'

Showing 2 changed files with 54 additions and 7 deletions   Show diff stats
Inline Side-by-side
frontend/views/layouts/main.php
  Show/Hide comments   View file @70b7f09
@@ -58,7 +58,7 @@ @@ -58,7 +58,7 @@
58 $this->registerJs(" 58 $this->registerJs("
59 $('.jcarousel').jcarousel({ 59 $('.jcarousel').jcarousel({
60 vertical: true, 60 vertical: true,
61 - scroll: 2 61 + scroll: 1
62 }); 62 });
63 ", View::POS_READY); 63 ", View::POS_READY);
64 64
frontend/web/css/style.css
  Show/Hide comments   View file @70b7f09
@@ -108,7 +108,7 @@ a.myorders{color:#f75d50} @@ -108,7 +108,7 @@ 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:160px;margin:0px 35px 15px;text-align:center;position:relative;} 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;} 111 +.products ul li a.name{display:block;color:#494949;text-decoration:none;margin:15px 0px;height:30px;text-transform: uppercase;overflow: hidden;}
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
@@ -116,9 +116,19 @@ a.myorders{color:#f75d50} @@ -116,9 +116,19 @@ a.myorders{color:#f75d50}
116 .cost span.valute{font-size:16px;} 116 .cost span.valute{font-size:16px;}
117 strike{font-size:18px;} 117 strike{font-size:18px;}
118 118
119 -a.link_buy{display:block;margin:10px auto;width:122px;height:38px;line-height:38px;background:url('../img/buy.png') no-repeat;text-transform: uppercase;color:#ffffff;text-decoration:none;font-weight:bold;text-align:center;}  
120 -  
121 -.mycarousel{position:absolute;right:-34px;top:-20px;} 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;
  120 + background: #95ba2f;
  121 + border-radius: 4px;
  122 + border-bottom: 3px solid #799920;
  123 +}
  124 +a.link_buy:hover {
  125 + border-bottom: 3px solid #95ba2f;;
  126 +}
  127 +a.link_buy:active {
  128 + background: #799920;
  129 + border-bottom: 3px solid #799920;
  130 +}
  131 +.mycarousel{position:absolute;right:-15px;top:-20px;}
122 ul.mycarousel{list-style:none;margin:0px;padding:0px;} 132 ul.mycarousel{list-style:none;margin:0px;padding:0px;}
123 ul.mycarousel li{margin:0px;padding:0px;} 133 ul.mycarousel li{margin:0px;padding:0px;}
124 .mycarousel img{border:1px solid #d2d2d2;} 134 .mycarousel img{border:1px solid #d2d2d2;}
@@ -129,6 +139,11 @@ h2.why span{display:none;} @@ -129,6 +139,11 @@ h2.why span{display:none;}
129 139
130 ul.why_list{list-style:none;margin:0px;padding:0px;} 140 ul.why_list{list-style:none;margin:0px;padding:0px;}
131 ul.why_list li{float:left;margin-left:58px; width: 288px; height:96px;box-sizing: border-box;padding-left: 110px; margin-top: 20px;} 141 ul.why_list li{float:left;margin-left:58px; width: 288px; height:96px;box-sizing: border-box;padding-left: 110px; margin-top: 20px;}
  142 +ul.why_list li div {
  143 + display: table-cell;
  144 + height: 96px;
  145 + vertical-align: middle;
  146 +}
132 ul.why_list li span{font-weight:bold;color:#799920;} 147 ul.why_list li span{font-weight:bold;color:#799920;}
133 ul.why_list li.item1{background:url('../img/why_item1.png') left no-repeat;} 148 ul.why_list li.item1{background:url('../img/why_item1.png') left no-repeat;}
134 ul.why_list li.item2{background:url('../img/why_item2.png') left no-repeat;} 149 ul.why_list li.item2{background:url('../img/why_item2.png') left no-repeat;}
@@ -380,7 +395,7 @@ ul.social {margin-top: 20px;} @@ -380,7 +395,7 @@ ul.social {margin-top: 20px;}
380 .view_products2 li{margin:10px 0px;} 395 .view_products2 li{margin:10px 0px;}
381 396
382 397
383 -.pixbox{width:134px;height:200px;overflow: hidden;text-align: center;} 398 +.pixbox{width:100%;height:200px;overflow: hidden;text-align: center;}
384 399
385 400
386 .form-order{background:#f5f5f5;padding:10px;border:1px solid #d2d2d2;} 401 .form-order{background:#f5f5f5;padding:10px;border:1px solid #d2d2d2;}
@@ -392,7 +407,7 @@ ul.social {margin-top: 20px;} @@ -392,7 +407,7 @@ ul.social {margin-top: 20px;}
392 .jcarousel-next-disabled, .jcarousel-prev-disabled {display: none !important;} 407 .jcarousel-next-disabled, .jcarousel-prev-disabled {display: none !important;}
393 .content2 br {display: none;} 408 .content2 br {display: none;}
394 .pixbox a { 409 .pixbox a {
395 - width: 134px; 410 + width: 160px;
396 height: 200px; 411 height: 200px;
397 display: table-cell; 412 display: table-cell;
398 vertical-align: middle; 413 vertical-align: middle;
@@ -883,3 +898,35 @@ a.active{font-weight:bold;text-decoration: underline;} @@ -883,3 +898,35 @@ a.active{font-weight:bold;text-decoration: underline;}
883 font-family: Roboto !important; 898 font-family: Roboto !important;
884 } 899 }
885 .seo_text p:first-child {margin-top: 0} 900 .seo_text p:first-child {margin-top: 0}
  901 +.product-special {position: absolute}
  902 +.jcarousel-skin-tango .jcarousel-item {
  903 + width: 38px;
  904 + height: 38px;
  905 + border: 1px solid #d2d2d2;
  906 + text-align: center;
  907 + background: #fff;
  908 +}
  909 +.jcarousel-skin-tango .jcarousel-item a {
  910 + display: table-cell;
  911 + width: 38px;
  912 + height: 38px;
  913 + vertical-align: middle;
  914 +}
  915 +.mycarousel img {
  916 + max-width: 38px;
  917 + max-height: 38px;
  918 + border: 0;
  919 + vertical-align: middle;
  920 +}
  921 +.jcarousel-skin-tango .jcarousel-clip-vertical, .jcarousel-skin-tango .jcarousel-container-vertical {
  922 + height: 175px;
  923 +}
  924 +.jcarousel-skin-tango .jcarousel-container-vertical {
  925 + padding: 0;
  926 +}
  927 +.jcarousel-skin-tango .jcarousel-prev-vertical {
  928 + top:-13px;
  929 +}
  930 +.jcarousel-skin-tango .jcarousel-next-vertical {
  931 + bottom: -13px;
  932 +}
886 \ No newline at end of file 933 \ No newline at end of file