Alexey Boroda / extrem-new

Commit 5de267175ce1a6325a516f5e10f9a204e1047e83

Authored by Alexey Boroda
2 parents 9ceae125 b2a44ebb

Merge remote-tracking branch 'origin/master'

Showing 2 changed files with 31 additions and 8 deletions   Show diff stats
Inline Side-by-side
frontend/views/catalog/products.php
  Show/Hide comments   View file @5de2671
@@ -19,6 +19,7 @@ $this->params['breadcrumbs'][] = $this->title; @@ -19,6 +19,7 @@ $this->params['breadcrumbs'][] = $this->title;
19 19
20 ?> 20 ?>
21 <div class="col-md-12"> 21 <div class="col-md-12">
  22 + <div class="catalog_block">
22 <div class="col-md-3 filters"> 23 <div class="col-md-3 filters">
23 <div class="button1"><a href="<?php 24 <div class="button1"><a href="<?php
24 echo Url::to(['/discount']); 25 echo Url::to(['/discount']);
@@ -80,6 +81,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -80,6 +81,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
80 81
81 </div> 82 </div>
82 </div> 83 </div>
  84 + </div>
83 </div> 85 </div>
84 <div class="textile_bottom"> 86 <div class="textile_bottom">
85 <div class="title1 left">Стильные элитные обои для вашего дома.</div> 87 <div class="title1 left">Стильные элитные обои для вашего дома.</div>
frontend/web/css/style.css
  Show/Hide comments   View file @5de2671
@@ -420,10 +420,12 @@ footer .socbuts a:hover{ @@ -420,10 +420,12 @@ footer .socbuts a:hover{
420 font-size: 15px; 420 font-size: 15px;
421 line-height: 24px; 421 line-height: 24px;
422 padding-top: 48px; 422 padding-top: 48px;
423 - margin-bottom: 75px; 423 + margin-top: -70px;
  424 + margin-bottom: 50px;
424 max-width: 960px; 425 max-width: 960px;
425 margin-left: auto; 426 margin-left: auto;
426 margin-right: auto; 427 margin-right: auto;
  428 +
427 } 429 }
428 .main-box5 p{ 430 .main-box5 p{
429 padding: 0; 431 padding: 0;
@@ -735,7 +737,8 @@ footer .socbuts a:hover{ @@ -735,7 +737,8 @@ footer .socbuts a:hover{
735 .titles .ti_a{font-size: 24px;padding-bottom: 8px;} 737 .titles .ti_a{font-size: 24px;padding-bottom: 8px;}
736 .titles .ti_b{font-size: 17px;padding-bottom: 15px;} 738 .titles .ti_b{font-size: 17px;padding-bottom: 15px;}
737 .post_1{ 739 .post_1{
738 - margin: 10px 0px 100px 0px; 740 + max-width: 960px;
  741 + margin: 0 auto;
739 letter-spacing: 1px; 742 letter-spacing: 1px;
740 } 743 }
741 .post_1_main{ 744 .post_1_main{
@@ -744,7 +747,6 @@ footer .socbuts a:hover{ @@ -744,7 +747,6 @@ footer .socbuts a:hover{
744 font-family: 'Lato-Medium'; 747 font-family: 'Lato-Medium';
745 margin: 0 auto; 748 margin: 0 auto;
746 max-width: 1110px; 749 max-width: 1110px;
747 - margin-left: 50px;  
748 } 750 }
749 .textitle_bottom .post_1_main{ 751 .textitle_bottom .post_1_main{
750 letter-spacing: 0.4px; 752 letter-spacing: 0.4px;
@@ -770,7 +772,7 @@ footer .socbuts a:hover{ @@ -770,7 +772,7 @@ footer .socbuts a:hover{
770 margin-top: 7px; 772 margin-top: 7px;
771 } 773 }
772 .post_1 .titles{ 774 .post_1 .titles{
773 - padding-left: 100px; 775 + padding-left: 50px;
774 } 776 }
775 .textitle_bottom{ 777 .textitle_bottom{
776 margin-bottom: 134px; 778 margin-bottom: 134px;
@@ -780,7 +782,7 @@ footer .socbuts a:hover{ @@ -780,7 +782,7 @@ footer .socbuts a:hover{
780 } 782 }
781 .post_1_start{ 783 .post_1_start{
782 display: flex; 784 display: flex;
783 - padding-left: 100px; 785 + padding-left: 50px;
784 padding-bottom: 43px; 786 padding-bottom: 43px;
785 letter-spacing: 0.4px; 787 letter-spacing: 0.4px;
786 font-size: 15px; 788 font-size: 15px;
@@ -803,7 +805,7 @@ footer .socbuts a:hover{ @@ -803,7 +805,7 @@ footer .socbuts a:hover{
803 overflow: hidden; 805 overflow: hidden;
804 } 806 }
805 .text_left{ 807 .text_left{
806 - padding-left: 100px; 808 + padding-left: 50px;
807 padding-right: 40px; 809 padding-right: 40px;
808 } 810 }
809 .text_left.text2{ 811 .text_left.text2{
@@ -2097,7 +2099,14 @@ p.right{text-align: right;} @@ -2097,7 +2099,14 @@ p.right{text-align: right;}
2097 .submit_btn button, .answer-form button{ 2099 .submit_btn button, .answer-form button{
2098 height:inherit; 2100 height:inherit;
2099 } 2101 }
2100 - 2102 +.catalog_block{
  2103 + max-width: 1016px;
  2104 + margin: 0 auto;
  2105 +}
  2106 +.textile_bottom .simple-spoiler, .textile_bottom .title1.left{
  2107 + margin: 0 auto;
  2108 + max-width: 960px;
  2109 +}
2101 .aw_logo{ 2110 .aw_logo{
2102 opacity: 0.5; 2111 opacity: 0.5;
2103 margin-top: 15px; 2112 margin-top: 15px;
@@ -2157,7 +2166,7 @@ p.right{text-align: right;} @@ -2157,7 +2166,7 @@ p.right{text-align: right;}
2157 footer .fleft p{ 2166 footer .fleft p{
2158 background-size: contain; 2167 background-size: contain;
2159 } 2168 }
2160 - .post_cont .text {width: 240px;} 2169 + .post_cont .text {width: 210px;}
2161 .main-box1 img{width:100%;} 2170 .main-box1 img{width:100%;}
2162 .carousel{margin: 0px 14.5px;} 2171 .carousel{margin: 0px 14.5px;}
2163 .post_1_start .text { 2172 .post_1_start .text {
@@ -2197,6 +2206,18 @@ p.right{text-align: right;} @@ -2197,6 +2206,18 @@ p.right{text-align: right;}
2197 } 2206 }
2198 } 2207 }
2199 @media (max-width: 991px) { 2208 @media (max-width: 991px) {
  2209 + .text_left, .post_1 .titles{
  2210 + margin-left:50px;
  2211 + }
  2212 + .navbar-nav{margin:0;}
  2213 + footer .fright{
  2214 + margin-left: 0px;
  2215 + }
  2216 + .aw_logo a{
  2217 + padding-right: 17px;
  2218 + background-size: 15%;
  2219 + font-size: 11px;
  2220 + }
2200 .menu .container { 2221 .menu .container {
2201 padding: 0px; 2222 padding: 0px;
2202 display: none; 2223 display: none;