Merge remote-tracking branch 'origin/master'

Alexey Boroda
2 parents 5e764d84 7e9b752b
Showing 4 changed files with 206 additions and 24 deletions Show diff stats
frontend/views/layouts/main.php
frontend/views/new-collections/index.php
frontend/views/site/index.php
frontend/web/css/style.css
@@ -86,6 +86,9 @@
     <header>
         <div class="container">
             <a href="<?php echo Url::home(); ?>" class="main"></a>
+            <div class="hidden-xs hidden-sm oldsite">
+                <a href="http://baccara.com.ua/" target="_blank">Старая версия сайта</a>
+            </div>
         </div>
     </header>
     <section class="menu">
@@ -35,7 +35,7 @@
 </div>
 <div class="textile_bottom tb2">
     <div class="content">
-        <div class="simple-spoiler just-closed" style="height: 50px">
+        <div class="simple-spoiler just-closed">
             <div class="spoiler-inner"><?php echo Seo::widget(['row' => Seo::SEO_TEXT]); ?></div>
         </div>
         <div class="just-more">
@@ -27,7 +27,12 @@
 ?>
  
 <div class="cont">
-    <section class="carousel">
+    <section class="picmobile hidden-lg hidden-md">
+        <div class="picture2">
+            <img src="/storage/slider/Ris2.jpg"/>
+        </div>
+    </section>
+    <section class="carousel hidden-xs hidden-sm">
         <div class="row">
             <?php
                 echo SliderWidget::widget([
@@ -143,6 +148,7 @@
                 <div class="title">Мебель</div>
             </a>
         </div>
+        <div style="clear:both;"></div>
     </section>
     <section class="main-box5">
         <div class="simple-spoiler just-closed" style="height: 50px">
@@ -17,6 +17,7 @@ body{
     overflow: hidden;
 }
 .container.cont{
+    width:100%;
     max-width:100%;
 }
 a{
@@ -65,7 +66,10 @@ header{
     background-repeat: no-repeat;
     position:relative;
 }
-header .container{position:relative;height:100%;}
+header .container{
+    position: relative;
+    height: 100%;
+    max-width: 960px;}
 header a.main{
     width: 100%;
     height: 100%;
@@ -318,7 +322,7 @@ footer .socbuts a:hover{
 }
 .carousel{
     max-width: 960px;
-    margin: 0 auto;
+    margin: 0 auto!important;
     position: relative;
 }
 .link_big{
@@ -372,7 +376,7 @@ footer .socbuts a:hover{
     padding: 4px 0px 3px 0px;
 }
 .main-box4{
-    min-height: 620px;
+    min-height: 410px;
     text-align: center;
     padding-top: 32px;
     max-width: 1064px;
@@ -419,13 +423,11 @@ footer .socbuts a:hover{
 .main-box5{
     font-size: 15px;
     line-height: 24px;
-    padding-top: 48px;
-    margin-top: -70px;
+    margin-top: 35px;
     margin-bottom: 50px;
     max-width: 960px;
     margin-left: auto;
     margin-right: auto;
-
 }
 .main-box5 p{
     padding: 0;
@@ -539,6 +541,8 @@ footer .socbuts a:hover{
     color: #838383;
     font-family: 'Lato-Medium';
     font-size: 14px;
+    max-height: 145px;
+    overflow: hidden;
 }
 .post_cont .more{
     position: absolute;
@@ -645,6 +649,9 @@ footer .socbuts a:hover{
     color:#a9a9a9;
     padding: 20px 0;
     margin-top:8px;
+    max-width: 980px;
+    margin-left: auto;
+    margin-right: auto;
 }
 .nav_up a{
     color:#a9a9a9;
@@ -726,6 +733,19 @@ footer .socbuts a:hover{
     position: absolute;
     right: 0;
 }
+.oldsite a{
+    color: #fff;
+    text-transform: uppercase;
+    border: 2px solid #fff;
+    width: 100%;
+    text-align: center;
+    padding-top: 7px;
+    padding-bottom: 6px;
+}
+.oldsite a:hover{
+    border:2px solid black;
+    background-color:black;
+}
 .showroom img{width:100%;max-width:700px;margin:25px auto; margin-bottom: 50px;padding-top:1px;}
 .no_btm{margin-bottom: 0!important;padding-bottom: 0!important;}
 .no_top{margin-top: 0!important;padding-top: 0!important;}
@@ -756,7 +776,7 @@ footer .socbuts a:hover{
 }
 .textile_bottom{
     float: left;
-    margin: 80px auto;
+    margin: 40px auto;
     width: 100%;
 }
 .textile_bottom.tb1{
@@ -934,7 +954,7 @@ footer .socbuts a:hover{
 .tile_1{
     width: 100%;
     max-width: 227px;
-    height: 250px;
+    height: 240px;
     position: relative;
     text-align: center;
     text-transform: uppercase;
@@ -943,11 +963,11 @@ footer .socbuts a:hover{
 .tile_2{
     width: 100%;
     max-width: 305px;
-    height: 315px;
     position: relative;
     text-align: center;
     text-transform: uppercase;
     margin: 0 auto;
+    margin-bottom: 20px;
 }
 .tile_1 .picture, .tile_2 .picture{
     width:100%;
@@ -965,7 +985,7 @@ footer .socbuts a:hover{
 .tile_1 .title_1, .tile_2 .title_1{
     font-size: 15px;
     padding-bottom: 1px;
-    padding-top: 14px;
+    padding-top: 15px;
 }
 .tile_1 .title_2, .tile_2 .title_2{font-size: 10px;}
 .tile_1 a, .tile_1 a:hover, .tile_2 a, .tile_2 a:hover, .tile3 a:hover, .tile4 a:hover{color:#414143!important;}
@@ -999,8 +1019,8 @@ footer .socbuts a:hover{
 .tile3{
     text-align: center;
     overflow: hidden;
-    margin-bottom: 40px;
-    margin-top: 30px;
+    margin-bottom: 15px;
+    margin-top: 0px;
     padding: 0!important;
 }
 .tile3 .picture{
@@ -1094,7 +1114,7 @@ footer .socbuts a:hover{
 .button2 a.punkt, .button2 a.punkt:hover{
     background-color: white!important;
     color: #414143!important;
-    width: 89%!important;
+    width: 195px!important;
     display: flex;
     margin: 0 auto;
     justify-content: center;
@@ -1315,10 +1335,10 @@ a.active{
     background-repeat: no-repeat;
 }
 .mat_pics{
-    margin: 43px auto 210px auto;
+    margin: 40px auto 210px auto;
     float: none;
     width: 100%;
-    max-width: 1020px;
+    max-width: 1022px;
 }
 .mat_pic{
     margin-bottom: 25px;
@@ -1336,6 +1356,7 @@ a.active{
 }
 .brand_logo{
     text-align: center;
+    padding-bottom: 30px;
 }
 .brand_logo img{
     max-width: 960px;
@@ -1372,6 +1393,17 @@ a.active{
     font-weight: 600;
     text-transform: uppercase;
 }
+.brand .about_brand {
+    margin-top: 40px!important;
+}
+.spoiler-inner div{
+    font-family: 'Lato-Medium'!important;
+    font-size: 14px!important;
+}
+.titles .line2{
+    max-width: 960px;
+    margin: 0 auto;
+}
 .title4{
     text-transform: uppercase;
     font-family: 'Lato-Light';
@@ -1634,7 +1666,7 @@ p.right{text-align: right;}
 .shares-blog{
     list-style: none;
     text-align: center;
-    padding: 7px 0px;
+    padding: 30px 0px;
 }
 .shares-blog li a {
     width: 42px;
@@ -2084,7 +2116,7 @@ p.right{text-align: right;}
     max-width: 865px;
     float: none;
     margin: 0 auto;
-    padding-bottom: 140px;
+    padding-bottom: 70px;
 }
 .title9 {
     color: #847e7e;
@@ -2133,6 +2165,7 @@ p.right{text-align: right;}
     left: 0;
     position: absolute;
     width: 100%;
+    top:0px;
 }
 .comments-wr {
     margin-top: 0px!important;
@@ -2171,6 +2204,7 @@ p.right{text-align: right;}
     font-size: 12px;
 }
 .product .pic{
+    padding-left: 25px;
     max-width: 630px;
     max-height: 390px;
     overflow: hidden;
@@ -2193,6 +2227,30 @@ p.right{text-align: right;}
 .hidemenu.show a{
     background-image: url('../images/hidem2.png');
 }
+.picmobile{
+    width: 100%;
+    padding-top: 10px;
+    margin: 0 auto;
+    margin-bottom: -15px;
+    padding-left: 15px;
+    padding-right: 15px;
+}
+.picmobile .picture2{
+    max-height: 175px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    overflow: hidden;
+    max-width: 308px;
+    margin: 0 auto;
+    position: relative;
+}
+.picmobile .picture2 img{
+    width: 100%;
+    height: 100%;
+    max-height: 175px;
+    max-width: 308px;
+}
 /**/
 @media (min-width: 1200px){
     .dropd_menu{left:0px;}
@@ -2210,11 +2268,12 @@ p.right{text-align: right;}
     }
 }
 @media (min-width: 992px) and (max-width: 1199px) {
+    .dropd_menu{left:0px;}
     .tile3 {
         text-align: center;
         overflow: hidden;
-        margin-bottom: 40px;
-        margin-top: 30px;
+        margin-bottom: 0px;
+        margin-top: 15px;
         padding: 0!important;
         margin-left: 5px;
         margin-right: 5px;
@@ -2265,6 +2324,46 @@ p.right{text-align: right;}
     }
 }
 @media (max-width: 991px) {
+    .actions_cont {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: center;
+        overflow: hidden;
+        max-width: 1036px;
+        margin: 0 auto;
+        padding-right: 42px;
+        padding: 0;
+    }
+    .main-box1{
+        padding-bottom: 10px;
+    }
+    .main-box2{
+        padding-bottom: 30px;
+        padding-top: 15px;
+    }
+    .dates_but{
+        margin:0;
+        text-align:center;
+        margin: 25px 0px;
+    }
+    .blocks_2 .col-md-4.col-sm-6{
+        padding: 0;
+    }
+    .button2 a.punkt, .button2 a.punkt:hover{
+        width: 85%!important;
+        line-height: 13px;
+        font-size: 10px;
+    }
+    .button2 .spoiler{
+        width: 85%!important;
+    }
+    .button2 a.punkt:before, .button3 a.punkt:before{
+        background-size: 60%;
+        right: 8px;
+    }
+    .textile_bottom{
+        margin: 30px auto;
+    }
     .menu .container ul li:hover .dropd_menu{
         display:none;
     }
@@ -2330,8 +2429,9 @@ p.right{text-align: right;}
     .note .picture{margin: 0 auto 25px;}
     .note{margin: 17px 0px 75px 0px;}
     .main-box5 {
-        padding-top: 35px;
+        margin: 0 auto;
         max-width: 587px;
+        padding: 20px 0 45px;
     }
     .menu li{
         min-width:100%;
@@ -2371,11 +2471,63 @@ p.right{text-align: right;}
     }
 }
 @media (max-width: 729px) {
-    .post_cont{justify-content: center;}
-    .post_cont .text{width:100%;margin:20px}
+    .blog_block a img{
+        max-height: 175px;
+        width: 100%;
+        max-width: 308px;
+    }
+    .main-box1 a img{
+        max-width:305px;
+    }
+    .post_cont{
+        justify-content: center;
+        overflow: hidden;
+        max-width: 308px;
+        margin: 0 auto;}
+    .post_cont .picture{
+        max-height: 175px;
+        display: flex;
+        align-items: center;
+        overflow: hidden;
+    }
+    .post_cont .text{
+        width: 100%;
+        max-width: 308px;
+        margin: 20px auto 35px;}
     .dates_but {margin:0 auto;text-align: center;}
     .post_1.contract img {width: initial;}
     .brand_logo img, .tile3 .picture img, .tile4 .picture img{width:100%;}
+    .main-box3 ul{
+        padding: 0 15px;
+        max-width: 330px;
+        margin: 10px auto;
+    }
+    .main-box4 .picture{
+        width: 100%;
+        padding-top: 48.21%;
+        max-width: 305px;
+        padding-top: 45%!important;
+        max-height: 175px!important;
+    }
+    .main-box5 .simple-spoiler{
+        padding: 0 15px;
+    }
+    .main-box5 .just-more, .main-box5 .more{
+        padding-left: 15px;
+        padding-right: 15px;
+        max-width: 335px;
+        margin: 0 auto;
+    }
+    .main-box5 .spoiler-inner{
+        max-width: 305px;
+        margin: 0 auto;
+    }
+    .main-box2 .post .title{
+        max-width: 308px;
+        margin: 0 auto;
+        margin-bottom: 15px;
+    }
+    .main-box1 .title{margin-bottom: 0px;}
 }
 @media (min-width: 705px){
     .tiles{
@@ -2398,4 +2550,25 @@ p.right{text-align: right;}
 @media (max-width: 379px) {
     .main-box1 img{width:100%;}
     .blog_link img{width: 100%;}
+    .shares-blog li a {
+        width: 25px;
+        height: 25px;
+        background-size: cover;
+        display: block;
+        background-position: center;
+        background-repeat: no-repeat;
+    }
+    .link_big a{font-size:13px;}
+    .oldsite_down a{font-size:11px;}
+    header{
+        background-size: 70%;
+    }
+    footer .fleft p{
+        background-size: 80%;}
+    .tile_1 .title_1, .tile_2 .title_1{
+        font-size: 12px;
+    }
+    .tile_1 .title_2, .tile_2 .title_2{
+        font-size: 9px;
+    }
 }
 \ No newline at end of file