Merge remote-tracking branch 'origin/master'

Alexey Boroda
2 parents 9ceae125 b2a44ebb
Showing 2 changed files with 31 additions and 8 deletions Show diff stats
frontend/views/catalog/products.php
frontend/web/css/style.css
@@ -19,6 +19,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
  
 ?>
 <div class="col-md-12">
+    <div class="catalog_block">
     <div class="col-md-3 filters">
         <div class="button1"><a href="<?php
             echo Url::to(['/discount']);
@@ -80,6 +81,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
  
         </div>
     </div>
+    </div>
 </div>
 <div class="textile_bottom">
     <div class="title1 left">Стильные элитные обои для вашего дома.</div>
@@ -420,10 +420,12 @@ footer .socbuts a:hover{
     font-size: 15px;
     line-height: 24px;
     padding-top: 48px;
-    margin-bottom: 75px;
+    margin-top: -70px;
+    margin-bottom: 50px;
     max-width: 960px;
     margin-left: auto;
     margin-right: auto;
+
 }
 .main-box5 p{
     padding: 0;
@@ -735,7 +737,8 @@ footer .socbuts a:hover{
 .titles .ti_a{font-size: 24px;padding-bottom: 8px;}
 .titles .ti_b{font-size: 17px;padding-bottom: 15px;}
 .post_1{
-    margin: 10px 0px 100px 0px;
+    max-width: 960px;
+    margin: 0 auto;
     letter-spacing: 1px;
 }
 .post_1_main{
@@ -744,7 +747,6 @@ footer .socbuts a:hover{
     font-family: 'Lato-Medium';
     margin: 0 auto;
     max-width: 1110px;
-    margin-left: 50px;
 }
 .textitle_bottom .post_1_main{
     letter-spacing: 0.4px;
@@ -770,7 +772,7 @@ footer .socbuts a:hover{
     margin-top: 7px;
 }
 .post_1 .titles{
-    padding-left: 100px;
+    padding-left: 50px;
 }
 .textitle_bottom{
     margin-bottom: 134px;
@@ -780,7 +782,7 @@ footer .socbuts a:hover{
 }
 .post_1_start{
     display: flex;
-    padding-left: 100px;
+    padding-left: 50px;
     padding-bottom: 43px;
     letter-spacing: 0.4px;
     font-size: 15px;
@@ -803,7 +805,7 @@ footer .socbuts a:hover{
     overflow: hidden;
 }
 .text_left{
-    padding-left: 100px;
+    padding-left: 50px;
     padding-right: 40px;
 }
 .text_left.text2{
@@ -2097,7 +2099,14 @@ p.right{text-align: right;}
 .submit_btn button, .answer-form button{
     height:inherit;
 }
-
+.catalog_block{
+    max-width: 1016px;
+    margin: 0 auto;
+}
+.textile_bottom .simple-spoiler, .textile_bottom .title1.left{
+    margin: 0 auto;
+    max-width: 960px;
+}
 .aw_logo{
     opacity: 0.5;
     margin-top: 15px;
@@ -2157,7 +2166,7 @@ p.right{text-align: right;}
     footer .fleft p{
         background-size: contain;
     }
-    .post_cont .text {width: 240px;}
+    .post_cont .text {width: 210px;}
     .main-box1 img{width:100%;}
     .carousel{margin: 0px 14.5px;}
     .post_1_start .text {
@@ -2197,6 +2206,18 @@ p.right{text-align: right;}
     }
 }
 @media (max-width: 991px) {
+    .text_left, .post_1 .titles{
+        margin-left:50px;
+    }
+    .navbar-nav{margin:0;}
+    footer .fright{
+        margin-left: 0px;
+    }
+    .aw_logo a{
+        padding-right: 17px;
+        background-size: 15%;
+        font-size: 11px;
+    }
     .menu .container {
         padding: 0px;
         display: none;