From fa4667999a9eff7432d06341383debbec0e7ea03 Mon Sep 17 00:00:00 2001
From: Eugeny Galkovskiy <zhegal@gmail.com>
Date: Tue, 4 Oct 2016 14:32:31 +0300
Subject: [PATCH] 123

---
 frontend/views/new-collections/index.php |   8 +++++---
 frontend/views/site/index.php            |  10 +++++-----
 frontend/web/css/style.css               | 391 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 3 files changed, 110 insertions(+), 299 deletions(-)

diff --git a/frontend/views/new-collections/index.php b/frontend/views/new-collections/index.php
index 8d142fc..f9fb467 100755
--- a/frontend/views/new-collections/index.php
+++ b/frontend/views/new-collections/index.php
@@ -33,7 +33,9 @@ $this->params[ 'breadcrumbs' ][] = $this->title;
                 <?php } ?>
             </div>
             <div class="textile_bottom tb2">
-                <div class="title1 left">Стильные элитные обои для вашего дома.</div>
-                <div class="post_1_main">Продумывая дизайн своей квартиры, мы непременно тщательно выбираем «одежду» для стен — красивые модные обои.</div>
-                <div class="more"><a href="#">Узнать больше</a></div>
+                <div class="content">
+                    <div class="title1 left">Стильные элитные обои для вашего дома.</div>
+                    <div class="post_1_main">Продумывая дизайн своей квартиры, мы непременно тщательно выбираем «одежду» для стен — красивые модные обои.</div>
+                    <div class="more"><a href="#">Узнать больше</a></div>
+                </div>
             </div>
\ No newline at end of file
diff --git a/frontend/views/site/index.php b/frontend/views/site/index.php
index 31feed2..0951830 100755
--- a/frontend/views/site/index.php
+++ b/frontend/views/site/index.php
@@ -74,12 +74,12 @@ $this->title = "Главная";
                         echo ArtboxImageHelper::getImage($event_article->getImageUrl(), 'main_event_one');
                         ?></div>
                     <div class="text"><br/><?php echo $event_article->body_preview; ?></div>
+                    <div class="more"><a href="<?php echo Url::to([
+                            'article/view',
+                            'id' => $event_article->id,
+                        ]); ?>">Узнать больше</a></div>
+                    </div>
                 </div>
-                <div class="more"><a href="<?php echo Url::to([
-                    'article/view',
-                        'id' => $event_article->id,
-                    ]); ?>">Узнать больше</a></div>
-            </div>
         </div>
         <div style="clear:both;"></div>
     </section>
diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css
index 67c1b75..a686558 100644
--- a/frontend/web/css/style.css
+++ b/frontend/web/css/style.css
@@ -8,6 +8,10 @@ body{
     min-height: 100vh;
     margin: 0;
 }
+.nav > li > a:hover, .nav > li > a:focus{
+    background-color: inherit;
+    outline: none;
+}
 .cont{
     flex:1;
 }
@@ -31,15 +35,16 @@ a{
     color: #000000;
     font-size: 10.4px;
     text-transform: uppercase;
-    font-weight: 600;
     padding: 5px;
     background-image: url('../images/line1.png');
     background-position: center 20px;
     background-repeat: no-repeat;
+    padding-top: 5.5px;
+    padding-bottom: 4.5px;
 }
 .nav1 li a:hover, .nav1 li .active{
     background-color: inherit!important;
-    background-position: center 3px;
+    background-position: center 5px;
 }
 .nav1 li .active{cursor:default;}
 .nav1 .navbar-nav li{
@@ -129,8 +134,11 @@ footer{
     background-color:black;
     color:white;
     text-align: center;
-    min-height: 280px;
-    padding-top: 58px;
+    min-height: 260px;
+    padding-top: 50px;
+}
+footer .container{
+    max-width: 1070px;
 }
 footer a{
     color: #fff;
@@ -201,6 +209,45 @@ footer .socbuts ul li{
 footer .socbuts a:hover{
     opacity:0.6;
 }
+.pagination{
+    display: flex;
+    justify-content: center;
+    margin: 56px 0px;
+}
+.pagination, .pagination a, .pagination span{
+    font-family: Arial, sans-serif!important;
+    font-weight: bold;
+    color:#9b9999!important;
+    font-size: 12px;
+    background-position: center;
+    background-repeat: no-repeat;
+}
+.pagination li a, .pagination li span{
+    padding: 1px 8.5px;
+}
+
+.pagination .active a{
+    background-color: initial!important;
+    border-color: #d2d2d2!important;
+    color:#000!important;
+}
+.pagination .left_pg span, .pagination .right_pg span, .pagination .left_pg a, .pagination .right_pg a{
+    background-color: #d2d2d2;
+    padding: 1px 9.5px;
+}
+.pagination .left_pg a, .pagination .left_pg span{
+    background-image: url(../images/left_ar.png);
+    font-size:0px;
+    width: 28px;
+    height: 21px;
+}
+.pagination .right_pg a, .pagination .right_pg span{
+    background-image: url(../images/right_ar.png);
+    font-size:0px;
+    width: 28px;
+    height: 21px;
+}
+
 .main-box1{
     position: relative;
     max-width: 1044px;
@@ -215,7 +262,7 @@ footer .socbuts a:hover{
     margin-left: 25px;
     position: absolute;
     height: 1px;
-    background-color: #9f9e9e;
+    background-color: #cecece;
     bottom: 0px;
     left: 0;
 }
@@ -264,7 +311,7 @@ footer .socbuts a:hover{
     background-position: bottom center;
 }
 .main-box3{
-    max-width: 1072px;
+    max-width: 1000px;
     margin: 0 auto;
     letter-spacing: 0.4px;
     padding: 10px 0;
@@ -291,9 +338,11 @@ footer .socbuts a:hover{
     padding: 4px 0px 3px 0px;
 }
 .main-box4{
-    min-height:620px;
+    min-height: 620px;
     text-align: center;
     padding-top: 32px;
+    max-width: 1100px;
+    margin: 0 auto;
 }
 .main-box4 a:hover{color:black;}
 .main-box4 .picture{
@@ -338,7 +387,7 @@ footer .socbuts a:hover{
     line-height: 24px;
     padding-top: 48px;
     margin-bottom: 75px;
-    max-width: 1004px;
+    max-width: 990px;
     margin-left: auto;
     margin-right: auto;
 }
@@ -426,6 +475,7 @@ footer .socbuts a:hover{
     display: flex;
     align-items: center;
     flex-wrap: wrap;
+    position: relative;
     align-content: center;
 }
 .post_cont .text{
@@ -436,6 +486,11 @@ footer .socbuts a:hover{
     font-family: 'Lato-Medium';
     font-size: 14px;
 }
+.post_cont .more{
+    position: absolute;
+    right: 0;
+    bottom: 0;
+}
 .post .title{
     display: flex;
     flex-wrap: wrap;
@@ -629,10 +684,9 @@ footer .socbuts a:hover{
     margin-bottom: 12px;
 }
 .textile_bottom{
-    margin-bottom: 134px;
-    margin-top: 98px;
     float: left;
     width: 100%;
+    margin: 80px 0;
 }
 .textile_bottom.tb1{
     margin-top: 73px;
@@ -645,7 +699,7 @@ footer .socbuts a:hover{
     letter-spacing: 0.4px;
 }
 .post_1 .titles{
-    padding-left: 50px;
+    padding-left: 100px;
 }
 .textitle_bottom{
     margin-bottom: 134px;
@@ -673,7 +727,7 @@ footer .socbuts a:hover{
 }
 .spoiler{display: none;width:100%!important;}
 .text_left{
-    padding-left: 50px;
+    padding-left: 100px;
     padding-right: 40px;
 }
 .text_left.text2{
@@ -740,12 +794,16 @@ footer .socbuts a:hover{
     background-position: 93% center;
 }
 .post_1.contract img{max-height:222px;}
-.blocks{text-align: center;letter-spacing: normal;text-transform: uppercase;margin-top: 36px;margin-left: 9px;}
-.blocks a .title{
+.blocks{text-align: center;letter-spacing: normal;text-transform: uppercase;margin-top: 36px;margin-left: 9px;padding: 0 13px;}
+.post_1.contract .blocks{padding:0;}
+.blocks .title{
+
+    padding: 17px 0px 9px 0px;
+}
+.blocks .title a{
     font-size: 14px;
     font-family: 'Lato-Medium';
     font-weight: bold;
-    padding: 17px 0px 9px 0px;
 }
 .blocks a:hover{color:black!important;}
 .b1{padding-bottom: 44px;}
@@ -786,7 +844,7 @@ footer .socbuts a:hover{
     background-position: center center;
     background-size: cover;
     max-height: 222px;
-    max-width: 960px;
+    max-width: 1020px;
     margin: 0 auto;
 }
 .tile_1{
@@ -1075,7 +1133,8 @@ footer .socbuts a:hover{
 .note{
     display: flex;
     flex-wrap: wrap;
-    margin: 17px 0px 38px 0px;
+    margin: 17px auto 38px auto;
+    max-width: 1030px;
 }
 .note .picture{
     width: 100%;
@@ -1109,47 +1168,9 @@ footer .socbuts a:hover{
     line-height: 18px;
     margin-bottom: 28px;
 }
-.pagination{
-    text-align: center;
-    list-style: none;
-    display: flex;
-    justify-content: center;
-    margin: 56px 0px;
-}
 a.active{
     cursor: default;
 }
-.pagination li a{
-    width: 21px;
-    height: 21px;
-    display: flex;
-    text-align: center;
-    font-family: 'Arial Bold', Arial, sans-serif;
-    font-weight: bold;
-    line-height: 2px;
-    justify-content: center;
-    align-items: center;
-    border: 1px solid #d2d2d2;
-    margin-right: -1px;
-    color: #9b9999;
-    font-size: 12px;
-}
-.pagination .left_pg{
-    background-image: url('../images/left_ar.png');
-}
-.pagination .right_pg{
-    background-image: url('../images/right_ar.png');
-}
-.pagination .left_pg, .pagination .right_pg{
-    background-color: #d2d2d2;
-    padding: 0px 14px;
-    background-repeat: no-repeat;
-    background-position: center center;
-}
-.pagination .left_pg, .pagination .right_pg:hover{
-    border:1px solid rgba(0,0,0,0);
-}
-.pagination li a.active, .pagination li a.active:hover{color:black;}
 .more_colls{
     background-color: #decfc8;
     text-transform: uppercase;
@@ -1248,7 +1269,7 @@ a.active{
     color: #777777;
     letter-spacing: 0.4px;
 }
-.about_brand{margin:0 45px;margin-bottom: 60px;}
+.about_brand{margin:0 20px;margin-bottom: 60px;}
 
 .blog1{
     max-width: 595px;
@@ -1306,6 +1327,8 @@ a.active{
     font-family: 'Lato-Light';
     font-weight: 600;
     letter-spacing: 0.7px;
+    max-width: 1010px;
+    margin: 0 auto;
 }
 .down_line{
     background-image:url('../images/line9.png');
@@ -1353,6 +1376,7 @@ a.active{
     letter-spacing: 0.5px;
     font-family: 'Lato-Light';
     font-weight: 600;
+    padding-left: 35px;
 }
 .list1 li{
     margin-bottom: 20px;
@@ -1368,10 +1392,14 @@ a.active{
     font-family: 'Lato-Light';
     font-weight: 600;
     letter-spacing: 0.5px;
-    max-width: 900px;
+    max-width: 1000px;
     margin: 33px auto;
     line-height: 19px;
 }
+.list-view{
+    max-width: 1056px;
+    margin: 0 auto;
+}
 .list2 li{
     margin-bottom: 20px;
 }
@@ -1535,7 +1563,7 @@ p.right{text-align: right;}
 }
 .collection .head img{
     max-width:960px;
-    width:100%;
+    /*width:100%;*/
 }
 .cols{max-width: 960px;margin: 40px auto 25px;}
 .cols a{
@@ -1584,8 +1612,7 @@ p.right{text-align: right;}
 .dropd_menu{
     position: absolute;
     width: 100%!important;
-    font-family: 'Lato-Light';
-    font-weight: 600;
+    font-family: 'Lato-Medium';
     font-size: 16px;
     background-color: #e9e6e6;
     top: 62px;
@@ -1626,58 +1653,7 @@ p.right{text-align: right;}
     margin: 0px;
 }
 .dropd_menu div:first-child .title:after{display: none;}
-.pagination li a {
-    width: 21px!important;
-    height: 21px!important;
-    display: flex!important;
-    text-align: center!important;
-    font-family: 'Arial Bold', Arial, sans-serif!important;
-    font-weight: bold!important;
-    line-height: 2px!important;
-    justify-content: center!important;
-    align-items: center!important;
-    border: 1px solid #d2d2d2!important;
-    margin-right: -1px!important;
-    color: #9b9999!important;
-    font-size: 12px!important;
-    background-position: center;
-    background-repeat: no-repeat;
-}
 
-.pagination span{
-    width: 28px;
-    height: 21px!important;
-    display: flex!important;
-    text-align: center!important;
-    font-family: 'Arial Bold', Arial, sans-serif!important;
-    font-weight: bold!important;
-    line-height: 2px!important;
-    justify-content: center!important;
-    align-items: center!important;
-    border: 1px solid #d2d2d2!important;
-    margin-right: -1px!important;
-    color: #9b9999!important;
-    font-size: 12px!important;
-    background-color: #d2d2d2;
-    text-indent: -999px;
-    background-position: center;
-    background-repeat: no-repeat;
-}
-.pagination .prev a, .pagination .prev span{
-    background-image: url(../images/left_ar.png);
-    width: 30px!important;
-    text-indent: 100px;
-    overflow: hidden;
-    background-color: #d2d2d2;
-}
-.pagination .next a, .pagination .next span{
-    background-image: url('../images/right_ar.png');
-    width: 30px!important;
-    text-indent: 100px;
-    overflow: hidden;
-    background-color: #d2d2d2;
-}
-.pagination .active a{color:#000!important;background-color:white!important;}
 
 .action{max-width:260px;margin-bottom: 10px;}
 .action img{width:100%; max-width:227px;}
@@ -1722,25 +1698,7 @@ p.right{text-align: right;}
     font-weight: 600;
 }
 .act_d{margin-top:66px;}
-.act_d p{
-    color: #878686;
-    font-family: 'Lato-Light';
-    font-weight: 600;
-    font-size: 15px;
-    letter-spacing: 0.4px;
-    height: 24px;
-    overflow: hidden;
-    transition:0.2s;
-}
-.act_d p.opened{
-    height: initial;
-}
-
-.left_pg, .right_pg{
-    max-height: 21px;
-    width: 28px;
-    overflow: hidden;
-}
+.act_d p{color:#878686;font-family: 'Lato-Light';font-weight: 600;font-size:15px;letter-spacing: 0.4px;}
 
 /**/
 .dropd_menu:before {
@@ -1768,17 +1726,22 @@ p.right{text-align: right;}
     padding-left: 38px;
 }
 
+.textile_bottom .content{
+    margin: 0 auto;
+    max-width: 1008px;
+}
+
 /**/
 @media (min-width: 1200px){
     .nav_up{
-    padding: 20px 25px;
+        padding: 20px 50px;
     }
 }
 @media (min-width: 992px) and (max-width: 1199px) {
     footer .fleft p{
         background-size: contain;
     }
-    .post_cont .text{width: 245px;}
+    .post_cont .text {width: 240px;}
     .main-box1 img{width:100%;}
     .carousel{margin: 0px 14.5px;}
     .post_1_start .text {
@@ -1796,7 +1759,11 @@ p.right{text-align: right;}
         padding-top: 0px;
         max-width: 844px;
     }
-
+    .main-box2 .post {
+        margin-top: 14px;
+        max-width: 550px;
+        margin-left: 30px;
+    }
 }
 @media (max-width: 991px) {
     .carousel{margin: 0px auto;}
@@ -1846,162 +1813,4 @@ p.right{text-align: right;}
 @media (max-width: 379px) {
     .main-box1 img{width:100%;}
     .blog_link img{width: 100%;}
-}
-
-
-/* OTZIVI */
-.form-comm-wr .input_bl, .form-comm-wr .help-block{
-    margin: 0;
-    padding: 0;
-}
-.artbox_item_info .user_data, .artbox_item_info .user_name{
-    color: #7e7e82;
-    font-size:14px;
-    display: inline-block;
-}
-.artbox_item_info .user_name:before{
-    content:'/ ';
-}
-.artbox_item_info .user_txt{
-    color: #343333;
-    font-size: 15px;
-    font-family: 'Lato-Light';
-    font-weight: 600;
-    padding-top: 11px;
-    line-height: 20px;
-}
-.otzivi_block{
-    width:100%;
-    max-width: 865px;
-    float: none;
-    margin: 0 auto;
-    padding-bottom: 140px;
-}
-.artbox_item_info{
-    border-top: 1px solid #d9d9d9;
-    padding-top: 18px;
-    padding-bottom: 27px;
-}
-.comments_block{
-    border-bottom: 1px solid #d9d9d9;
-}
-.title9{
-    color: #847e7e;
-    font-size: 24px;
-    text-transform: uppercase;
-    font-family: 'Lato-Light';
-    font-weight: 600;
-    margin-top: 10px;
-    margin-bottom: 11px;
-}
-.start_otzivi{
-    text-align: center;
-    text-transform: uppercase;
-    color: #000000;
-    font-size: 15px;
-    line-height: 26px;
-    font-family: 'Lato-Light';
-    font-weight: 600;
-    margin-bottom: 15px;
-    max-width: 640px;
-    margin-left: auto;
-    margin-right: auto;
-}
-.start_otzivi .title{
-    font-size:18px;
-}
-.form-comm-wr input, .form-comm-wr textarea{
-    text-transform: uppercase;
-    font-size: 11px;
-    font-weight: 900;
-    border-radius: 0px;
-    margin-top:-1px;
-    outline: none;
-    resize: none;
-    padding:14px;
-    letter-spacing: 0.5px;
-    box-shadow: none!important;
-    border: 1px solid rgb(204, 204, 204)!important;
-}
-.input_bl.submit_btn{
-    text-align:center;
-    padding: 15px 0px;
-}
-.input_bl.submit_btn button{
-    border: 1px solid #9e9e9e;
-    background-color: #fff;
-    outline: none;
-    text-transform: uppercase;
-    font-size: 11px;
-    font-weight: 600;
-    color: #9e9e9e;
-    letter-spacing: 1px;
-    padding: 5px 17px;
-    transition:0.1s;
-}
-.input_bl.submit_btn button:hover{
-    background-color:#9e9e9e;
-    color:#fff;
-}
-.add_comment{
-    display: none;
-    margin-top: 40px!important;
-}
-.add_comment, .add_comment .artbox_comment_container.comments-start{
-    position: relative;
-    max-width: 705px;
-    margin: 0 auto;
-}
-.otz_buttons{
-    text-align: center;
-    text-transform: uppercase;
-    font-size: 11px;
-    font-weight: 600;
-    letter-spacing: 1px;
-    margin: 44px 0px;
-}
-.otz_buttons a{
-    background-color:#e4e4e4;
-    padding: 11px;
-    padding-bottom: 10px;
-    margin: 10px;
-    background-image: url(../images/arrow_down_bold.png);
-    background-repeat: no-repeat;
-    background-position-y: center;
-}
-.otz_buttons .btn_otz.more1{
-    padding-right: 15px;
-    padding-left: 38px;
-    background-position-x: 17px;
-}
-.otz_buttons .btn_otz.write{
-    padding-right: 42px;
-    padding-left: 16px;
-    background-position-x: calc(100% - 16px);
-}
-.otz_buttons a:hover{
-    background-color:#ebdbd4!important;
-    color:#000;
-}
-.add_comment .title{
-    text-align: center;
-    text-transform: uppercase;
-    font-size: 15px;
-    color: #000000;
-    font-family: 'Lato-Light';
-    font-weight: 600;
-    padding: 14px;
-}
-.close_comm{
-    position: absolute;
-    top: 16px;
-    right: 0;
-    width: 27px;
-    height: 27px;
-    background-image:url('../images/close.png');
-    transition:0.1s;
-    cursor: pointer;
-}
-.close_comm:hover{
-    background-image:url('../images/close_hover.png');
 }
\ No newline at end of file
--
libgit2 0.21.4