Commit 650a4b139727ca4bfe4189544b96e8f845bb5916
Merge remote-tracking branch 'origin/master'
Showing
2 changed files
with
51 additions
and
14 deletions
Show diff stats
frontend/views/site/index.php
@@ -21,7 +21,7 @@ use frontend\widgets\SliderWidget; | @@ -21,7 +21,7 @@ use frontend\widgets\SliderWidget; | ||
21 | $this->title = "Главная"; | 21 | $this->title = "Главная"; |
22 | ?> | 22 | ?> |
23 | 23 | ||
24 | -<div class="container cont"> | 24 | +<div class="cont"> |
25 | <section class="carousel"> | 25 | <section class="carousel"> |
26 | <div class="row"> | 26 | <div class="row"> |
27 | <?php | 27 | <?php |
@@ -126,7 +126,9 @@ $this->title = "Главная"; | @@ -126,7 +126,9 @@ $this->title = "Главная"; | ||
126 | </div> | 126 | </div> |
127 | </section> | 127 | </section> |
128 | <section class="main-box5"> | 128 | <section class="main-box5"> |
129 | + <div class="spoil"> | ||
129 | <p>На одной из центральных улиц Киева (був. Леси Украинки, 23) расположился шоу-рум «Баккара», в котором можно познакомиться с тщательно отобранными образцами продукции и многочисленными каталогами самых известных и надежных поставщиков Европы и всего мира...</p> | 130 | <p>На одной из центральных улиц Киева (був. Леси Украинки, 23) расположился шоу-рум «Баккара», в котором можно познакомиться с тщательно отобранными образцами продукции и многочисленными каталогами самых известных и надежных поставщиков Европы и всего мира...</p> |
130 | <div class="more"><a href="#">Узнать больше</a></div> | 131 | <div class="more"><a href="#">Узнать больше</a></div> |
132 | + </div> | ||
131 | </section> | 133 | </section> |
132 | </div> | 134 | </div> |
frontend/web/css/style.css
@@ -105,10 +105,9 @@ header a.main:hover{ | @@ -105,10 +105,9 @@ header a.main:hover{ | ||
105 | background-image: url('../images/line2.png'); | 105 | background-image: url('../images/line2.png'); |
106 | background-position: center 55px; | 106 | background-position: center 55px; |
107 | background-repeat: no-repeat; | 107 | background-repeat: no-repeat; |
108 | - font-weight: bold; | ||
109 | } | 108 | } |
110 | .menu li a:hover, .menu li a.active{ | 109 | .menu li a:hover, .menu li a.active{ |
111 | - background-position: center 22px; | 110 | + background-position: center 22.5px; |
112 | color:#a9aaa9; | 111 | color:#a9aaa9; |
113 | } | 112 | } |
114 | .menu a.active{ | 113 | .menu a.active{ |
@@ -203,15 +202,27 @@ footer .socbuts a:hover{ | @@ -203,15 +202,27 @@ footer .socbuts a:hover{ | ||
203 | opacity:0.6; | 202 | opacity:0.6; |
204 | } | 203 | } |
205 | .main-box1{ | 204 | .main-box1{ |
205 | + position: relative; | ||
206 | + max-width: 1044px; | ||
207 | + margin: 0 auto; | ||
206 | min-height:300px; | 208 | min-height:300px; |
207 | text-align: center; | 209 | text-align: center; |
208 | - border-bottom:1px solid #9f9e9e; | 210 | +} |
211 | +.main-box1:after { | ||
212 | + content: ''; | ||
213 | + max-width: calc(100% - 25px); | ||
214 | + width: 100%; | ||
215 | + margin-left: 25px; | ||
216 | + position: absolute; | ||
217 | + height: 1px; | ||
218 | + background-color: #9f9e9e; | ||
219 | + bottom: 0px; | ||
220 | + left: 0; | ||
209 | } | 221 | } |
210 | .main-box1 .title{ | 222 | .main-box1 .title{ |
211 | font-family: 'Lato-Medium'; | 223 | font-family: 'Lato-Medium'; |
212 | text-transform: uppercase; | 224 | text-transform: uppercase; |
213 | font-size: 11px; | 225 | font-size: 11px; |
214 | - font-weight: 600; | ||
215 | color: black; | 226 | color: black; |
216 | padding: 13px; | 227 | padding: 13px; |
217 | background-image: url('../images/line4.png'); | 228 | background-image: url('../images/line4.png'); |
@@ -225,8 +236,9 @@ footer .socbuts a:hover{ | @@ -225,8 +236,9 @@ footer .socbuts a:hover{ | ||
225 | background-position: center 33px; | 236 | background-position: center 33px; |
226 | } | 237 | } |
227 | .carousel{ | 238 | .carousel{ |
228 | - margin: 0px 26.5px; | ||
229 | - position:relative; | 239 | + max-width: 993px; |
240 | + margin: 0 auto; | ||
241 | + position: relative; | ||
230 | } | 242 | } |
231 | .link_big{ | 243 | .link_big{ |
232 | padding: 31px 0px 15px 0px; | 244 | padding: 31px 0px 15px 0px; |
@@ -243,6 +255,8 @@ footer .socbuts a:hover{ | @@ -243,6 +255,8 @@ footer .socbuts a:hover{ | ||
243 | border: 1px solid #9f9e9e; | 255 | border: 1px solid #9f9e9e; |
244 | } | 256 | } |
245 | .main-box2{ | 257 | .main-box2{ |
258 | + max-width: 1032px; | ||
259 | + margin: 0 auto; | ||
246 | padding-bottom:10px; | 260 | padding-bottom:10px; |
247 | padding-top: 52px; | 261 | padding-top: 52px; |
248 | background-image:url('../images/line3.png'); | 262 | background-image:url('../images/line3.png'); |
@@ -250,6 +264,9 @@ footer .socbuts a:hover{ | @@ -250,6 +264,9 @@ footer .socbuts a:hover{ | ||
250 | background-position: bottom center; | 264 | background-position: bottom center; |
251 | } | 265 | } |
252 | .main-box3{ | 266 | .main-box3{ |
267 | + max-width: 1072px; | ||
268 | + margin: 0 auto; | ||
269 | + letter-spacing: 0.4px; | ||
253 | padding: 10px 0; | 270 | padding: 10px 0; |
254 | background-image:url('../images/line3.png'); | 271 | background-image:url('../images/line3.png'); |
255 | background-repeat:no-repeat; | 272 | background-repeat:no-repeat; |
@@ -311,20 +328,25 @@ footer .socbuts a:hover{ | @@ -311,20 +328,25 @@ footer .socbuts a:hover{ | ||
311 | transition:0.2s; | 328 | transition:0.2s; |
312 | } | 329 | } |
313 | .main-box4 a:hover .title{ | 330 | .main-box4 a:hover .title{ |
314 | - background-position: center 29px; | 331 | + background-position: center 33.5px; |
315 | } | 332 | } |
316 | .main-box4 .col-md-6{ | 333 | .main-box4 .col-md-6{ |
317 | padding-bottom: 7px; | 334 | padding-bottom: 7px; |
318 | } | 335 | } |
319 | .main-box5{ | 336 | .main-box5{ |
320 | - font-size:15px; | 337 | + font-size: 15px; |
321 | line-height: 24px; | 338 | line-height: 24px; |
322 | padding-top: 48px; | 339 | padding-top: 48px; |
323 | margin-bottom: 75px; | 340 | margin-bottom: 75px; |
341 | + max-width: 1004px; | ||
342 | + margin-left: auto; | ||
343 | + margin-right: auto; | ||
324 | } | 344 | } |
325 | .main-box5 p{ | 345 | .main-box5 p{ |
326 | - padding:0; | 346 | + padding: 0; |
327 | margin: 0px 0px 21px 0px; | 347 | margin: 0px 0px 21px 0px; |
348 | + letter-spacing: 0.4px; | ||
349 | + font-family: 'Lato-Medium'; | ||
328 | } | 350 | } |
329 | .more{ | 351 | .more{ |
330 | display: flex; | 352 | display: flex; |
@@ -407,10 +429,11 @@ footer .socbuts a:hover{ | @@ -407,10 +429,11 @@ footer .socbuts a:hover{ | ||
407 | align-content: center; | 429 | align-content: center; |
408 | } | 430 | } |
409 | .post_cont .text{ | 431 | .post_cont .text{ |
410 | - width:305px; | ||
411 | - margin:0 20px; | 432 | + width: 355px; |
433 | + margin: 0 20px; | ||
434 | + margin-right:0; | ||
412 | color: #838383; | 435 | color: #838383; |
413 | - font-family: 'Lato-Bold'; | 436 | + font-family: 'Lato-Medium'; |
414 | font-size: 14px; | 437 | font-size: 14px; |
415 | } | 438 | } |
416 | .post .title{ | 439 | .post .title{ |
@@ -506,7 +529,10 @@ footer .socbuts a:hover{ | @@ -506,7 +529,10 @@ footer .socbuts a:hover{ | ||
506 | .blog_link:hover .center_line{ | 529 | .blog_link:hover .center_line{ |
507 | background-position: center 34px; | 530 | background-position: center 34px; |
508 | } | 531 | } |
509 | -.main-box2 .post{margin-top:14px;} | 532 | +.main-box2 .post{ |
533 | + margin-top: 14px; | ||
534 | + max-width: 683px; | ||
535 | +} | ||
510 | .nav_up{ | 536 | .nav_up{ |
511 | font-size: 8.48px; | 537 | font-size: 8.48px; |
512 | text-transform: uppercase; | 538 | text-transform: uppercase; |
@@ -1766,6 +1792,11 @@ p.right{text-align: right;} | @@ -1766,6 +1792,11 @@ p.right{text-align: right;} | ||
1766 | .note .picture{margin: 0 0 25px;} | 1792 | .note .picture{margin: 0 0 25px;} |
1767 | .note{margin: 17px 0px 75px 0px;} | 1793 | .note{margin: 17px 0px 75px 0px;} |
1768 | .tile3 .picture img,.tile4 .picture img{width:100%;} | 1794 | .tile3 .picture img,.tile4 .picture img{width:100%;} |
1795 | + .main-box5 { | ||
1796 | + padding-top: 0px; | ||
1797 | + max-width: 844px; | ||
1798 | + } | ||
1799 | + | ||
1769 | } | 1800 | } |
1770 | @media (max-width: 991px) { | 1801 | @media (max-width: 991px) { |
1771 | .carousel{margin: 0px auto;} | 1802 | .carousel{margin: 0px auto;} |
@@ -1782,6 +1813,10 @@ p.right{text-align: right;} | @@ -1782,6 +1813,10 @@ p.right{text-align: right;} | ||
1782 | .filters_block{padding-bottom: 75px;} | 1813 | .filters_block{padding-bottom: 75px;} |
1783 | .note .picture{margin: 0 auto 25px;} | 1814 | .note .picture{margin: 0 auto 25px;} |
1784 | .note{margin: 17px 0px 75px 0px;} | 1815 | .note{margin: 17px 0px 75px 0px;} |
1816 | + .main-box5 { | ||
1817 | + padding-top: 35px; | ||
1818 | + max-width: 587px; | ||
1819 | + } | ||
1785 | } | 1820 | } |
1786 | @media (max-width: 729px) { | 1821 | @media (max-width: 729px) { |
1787 | .post_cont{justify-content: center;} | 1822 | .post_cont{justify-content: center;} |