From 6b45a2aa30fefa34dc82c81a356d49ef99aa913e Mon Sep 17 00:00:00 2001 From: yarik Date: Wed, 21 Sep 2016 16:22:15 +0300 Subject: [PATCH] Layout fix --- common/config/main.php | 4 ++-- frontend/views/filter/category.php | 3 ++- frontend/views/filter/purpose.php | 3 ++- frontend/web/css/style.min.css | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------- 4 files changed, 80 insertions(+), 13 deletions(-) diff --git a/common/config/main.php b/common/config/main.php index b0dbea9..04f4043 100755 --- a/common/config/main.php +++ b/common/config/main.php @@ -176,8 +176,8 @@ ], 'filter_image' => [ 'resize' => [ - 'width' => 263, - 'height' => 142, + 'width' => 262, + 'height' => 144, ], ], 'full_filter' => [ diff --git a/frontend/views/filter/category.php b/frontend/views/filter/category.php index ac85eed..b395398 100755 --- a/frontend/views/filter/category.php +++ b/frontend/views/filter/category.php @@ -23,12 +23,13 @@
getImageUrl(), 'filter_image') . Html::tag('p', $purpose->value), [ + echo Html::a(Html::tag('p', $purpose->value), [ 'filter/index', 'category_id' => $category->category_id, 'purpose_id' => $purpose->tax_option_id, ], [ 'class' => 'link-cat', + 'style' => 'background-image: url("'.ArtboxImageHelper::getImageSrc($purpose->getImageUrl(), 'filter_image').'")', ]); ?>
diff --git a/frontend/views/filter/purpose.php b/frontend/views/filter/purpose.php index 56254c3..30b8654 100755 --- a/frontend/views/filter/purpose.php +++ b/frontend/views/filter/purpose.php @@ -23,12 +23,13 @@
getImageUrl(), 'filter_image') . Html::tag('p', $category->name), [ + echo Html::a(Html::tag('p', $category->name), [ 'filter/index', 'category_id' => $category->category_id, 'purpose_id' => $purpose->tax_option_id, ], [ 'class' => 'link-cat', + 'style' => 'background-image: url("'.ArtboxImageHelper::getImageSrc($category->getImageUrl(), 'filter_image').'")', ]); ?>
diff --git a/frontend/web/css/style.min.css b/frontend/web/css/style.min.css index ed00c8e..a3107a6 100644 --- a/frontend/web/css/style.min.css +++ b/frontend/web/css/style.min.css @@ -1119,6 +1119,9 @@ ul.main-menu li:first-child ul li a:before {display: none;} float: left; margin-top: 40px; } +.form-product-wr.product_1 {height: 75px;} +.form-product-wr.product_2 {height: 155px;} + .scrollbar_ {height: 241px; overflow-y: hidden;} .form-product-wr table { @@ -1465,6 +1468,9 @@ ul.breadcrumb li a { width: 100%; display: block; float: left; + height: 144px; + background-repeat: no-repeat !important; + background-size: cover !important; } .link-cat:before { height: 75px; @@ -2486,6 +2492,7 @@ y-axis @media (max-width: 1200px) { + .link-cat {height: 116px;} /*[class*="moz-"] {*/ /*height: 62px;*/ /*}*/ @@ -2568,11 +2575,12 @@ y-axis .new_article-img {margin-bottom: 20px} } @media (max-width: 991px) { - +.link-cat {height: 162px;} } @media (max-width: 950px) { + .link-cat {height: 155px;} .modal-form, #success-form { width: 610px; margin-left: -305px; @@ -2589,22 +2597,41 @@ y-axis } - - +@media (max-width: 900px) { + .link-cat { + height: 145px; + } +} @media (max-width: 896px) { } +@media (max-width: 850px) { + .link-cat { + height: 136px; + } +} @media (max-width: 835px) {} @media (max-width: 810px) { .list-tabs {padding-left: 30px;} .list-tabs li, .list-tabs li span {width: 160px;} } +@media (max-width: 800px) { + .link-cat { + height: 127px; + } +} - - +@media (max-width: 768px) { + .link-cat { + height: 121px; + } +} @media (max-width: 767px) { + .link-cat { + height: 396px; + } /*.close-search {*/ /*position: absolute !important;*/ /*top: 0;*/ @@ -2810,13 +2837,30 @@ y-axis text-align: left; } } - - +@media (max-width: 700px) { + .link-cat { + height: 360px; + } +} @media (max-width: 668px) { } - +@media (max-width: 650px) { + .link-cat { + height: 332px; + } +} +@media (max-width: 600px) { + .link-cat { + height: 304px; + } +} +@media (max-width: 550px) { + .link-cat { + height: 277px; + } +} @media (max-width: 560px) { } @@ -2827,17 +2871,30 @@ y-axis .box-mosaic a p:before {bottom: 32px;right: 9px;} .certificate-page .certificate {width: 100% !important;} } +@media (max-width: 500px) { + .link-cat { + height: 249px; + } +} @media (max-width: 480px) { - + .link-cat { + height: 238px; + } } @media (max-width: 460px) { } @media (max-width: 450px) { + .link-cat { + height: 222px; + } #close-form { top: -58px; right: 0;} } @media (max-width: 400px) { + .link-cat { + height: 194px; + } .box-mosaic a p { padding-right: 23px; padding-top: 16px; @@ -2847,12 +2904,20 @@ y-axis } @media (max-width: 350px) { + .link-cat { + height: 166px; + } .box-mosaic a p { padding-right: 23px; padding-top: 16px; } .box-mosaic a p:before {bottom: 46px;right: 16px;} } +@media (max-width: 336px) { + .link-cat { + height: 160px; + } +} @media (max-width: 330px) { .box-mosaic a p { padding-right: 22px; -- libgit2 0.21.4