Merge remote-tracking branch 'origin/master'

Alexey Boroda
2 parents dec8b5ed 42e6c978
Showing 2 changed files with 51 additions and 14 deletions Show diff stats
frontend/views/site/index.php
frontend/web/css/style.css
@@ -21,7 +21,7 @@ use frontend\widgets\SliderWidget;
 $this->title = "Главная";
 ?>
  
-<div class="container cont">
+<div class="cont">
     <section class="carousel">
         <div class="row">
             <?php
@@ -126,7 +126,9 @@ $this-&gt;title = &quot;Главная&quot;;
         </div>
     </section>
     <section class="main-box5">
+        <div class="spoil">
         <p>На одной из центральных улиц Киева (був. Леси Украинки, 23) расположился шоу-рум «Баккара», в котором можно познакомиться с тщательно отобранными образцами продукции и многочисленными каталогами самых известных и надежных поставщиков Европы и всего мира...</p>
         <div class="more"><a href="#">Узнать больше</a></div>
+        </div>
     </section>
 </div>
@@ -105,10 +105,9 @@ header a.main:hover{
     background-image: url('../images/line2.png');
     background-position: center 55px;
     background-repeat: no-repeat;
-    font-weight: bold;
 }
 .menu li a:hover, .menu li a.active{
-    background-position: center 22px;
+    background-position: center 22.5px;
     color:#a9aaa9;
 }
 .menu a.active{
@@ -203,15 +202,27 @@ footer .socbuts a:hover{
     opacity:0.6;
 }
 .main-box1{
+    position: relative;
+    max-width: 1044px;
+    margin: 0 auto;
     min-height:300px;
     text-align: center;
-    border-bottom:1px solid #9f9e9e;
+}
+.main-box1:after {
+    content: '';
+    max-width: calc(100% - 25px);
+    width: 100%;
+    margin-left: 25px;
+    position: absolute;
+    height: 1px;
+    background-color: #9f9e9e;
+    bottom: 0px;
+    left: 0;
 }
 .main-box1 .title{
     font-family: 'Lato-Medium';
     text-transform: uppercase;
     font-size: 11px;
-    font-weight: 600;
     color: black;
     padding: 13px;
     background-image: url('../images/line4.png');
@@ -225,8 +236,9 @@ footer .socbuts a:hover{
     background-position: center 33px;
 }
 .carousel{
-    margin: 0px 26.5px;
-    position:relative;
+    max-width: 993px;
+    margin: 0 auto;
+    position: relative;
 }
 .link_big{
     padding: 31px 0px 15px 0px;
@@ -243,6 +255,8 @@ footer .socbuts a:hover{
     border: 1px solid #9f9e9e;
 }
 .main-box2{
+    max-width: 1032px;
+    margin: 0 auto;
     padding-bottom:10px;
     padding-top: 52px;
     background-image:url('../images/line3.png');
@@ -250,6 +264,9 @@ footer .socbuts a:hover{
     background-position: bottom center;
 }
 .main-box3{
+    max-width: 1072px;
+    margin: 0 auto;
+    letter-spacing: 0.4px;
     padding: 10px 0;
     background-image:url('../images/line3.png');
     background-repeat:no-repeat;
@@ -311,20 +328,25 @@ footer .socbuts a:hover{
     transition:0.2s;
 }
 .main-box4 a:hover .title{
-    background-position: center 29px;
+    background-position: center 33.5px;
 }
 .main-box4 .col-md-6{
     padding-bottom: 7px;
 }
 .main-box5{
-    font-size:15px;
+    font-size: 15px;
     line-height: 24px;
     padding-top: 48px;
     margin-bottom: 75px;
+    max-width: 1004px;
+    margin-left: auto;
+    margin-right: auto;
 }
 .main-box5 p{
-    padding:0;
+    padding: 0;
     margin: 0px 0px 21px 0px;
+    letter-spacing: 0.4px;
+    font-family: 'Lato-Medium';
 }
 .more{
     display: flex;
@@ -407,10 +429,11 @@ footer .socbuts a:hover{
     align-content: center;
 }
 .post_cont .text{
-    width:305px;
-    margin:0 20px;
+    width: 355px;
+    margin: 0 20px;
+    margin-right:0;
     color: #838383;
-    font-family: 'Lato-Bold';
+    font-family: 'Lato-Medium';
     font-size: 14px;
 }
 .post .title{
@@ -506,7 +529,10 @@ footer .socbuts a:hover{
 .blog_link:hover .center_line{
     background-position: center 34px;
 }
-.main-box2 .post{margin-top:14px;}
+.main-box2 .post{
+    margin-top: 14px;
+    max-width: 683px;
+}
 .nav_up{
     font-size: 8.48px;
     text-transform: uppercase;
@@ -1766,6 +1792,11 @@ p.right{text-align: right;}
     .note .picture{margin: 0 0 25px;}
     .note{margin: 17px 0px 75px 0px;}
     .tile3 .picture img,.tile4 .picture img{width:100%;}
+    .main-box5 {
+        padding-top: 0px;
+        max-width: 844px;
+    }
+
 }
 @media (max-width: 991px) {
     .carousel{margin: 0px auto;}
@@ -1782,6 +1813,10 @@ p.right{text-align: right;}
     .filters_block{padding-bottom: 75px;}
     .note .picture{margin: 0 auto 25px;}
     .note{margin: 17px 0px 75px 0px;}
+    .main-box5 {
+        padding-top: 35px;
+        max-width: 587px;
+    }
 }
 @media (max-width: 729px) {
     .post_cont{justify-content: center;}