Commit 6b45a2aa30fefa34dc82c81a356d49ef99aa913e
1 parent
f95ddf61
Layout fix
Showing
4 changed files
with
80 additions
and
13 deletions
Show diff stats
common/config/main.php
@@ -176,8 +176,8 @@ | @@ -176,8 +176,8 @@ | ||
176 | ], | 176 | ], |
177 | 'filter_image' => [ | 177 | 'filter_image' => [ |
178 | 'resize' => [ | 178 | 'resize' => [ |
179 | - 'width' => 263, | ||
180 | - 'height' => 142, | 179 | + 'width' => 262, |
180 | + 'height' => 144, | ||
181 | ], | 181 | ], |
182 | ], | 182 | ], |
183 | 'full_filter' => [ | 183 | 'full_filter' => [ |
frontend/views/filter/category.php
@@ -23,12 +23,13 @@ | @@ -23,12 +23,13 @@ | ||
23 | <div class="cat-list-wr col-xs-12 col-sm-4 col-md-3 col-lg-3"> | 23 | <div class="cat-list-wr col-xs-12 col-sm-4 col-md-3 col-lg-3"> |
24 | <div class="cat-list"> | 24 | <div class="cat-list"> |
25 | <?php | 25 | <?php |
26 | - echo Html::a(ArtboxImageHelper::getImage($purpose->getImageUrl(), 'filter_image') . Html::tag('p', $purpose->value), [ | 26 | + echo Html::a(Html::tag('p', $purpose->value), [ |
27 | 'filter/index', | 27 | 'filter/index', |
28 | 'category_id' => $category->category_id, | 28 | 'category_id' => $category->category_id, |
29 | 'purpose_id' => $purpose->tax_option_id, | 29 | 'purpose_id' => $purpose->tax_option_id, |
30 | ], [ | 30 | ], [ |
31 | 'class' => 'link-cat', | 31 | 'class' => 'link-cat', |
32 | + 'style' => 'background-image: url("'.ArtboxImageHelper::getImageSrc($purpose->getImageUrl(), 'filter_image').'")', | ||
32 | ]); | 33 | ]); |
33 | ?> | 34 | ?> |
34 | <div class="cat-list-brands-wr"> | 35 | <div class="cat-list-brands-wr"> |
frontend/views/filter/purpose.php
@@ -23,12 +23,13 @@ | @@ -23,12 +23,13 @@ | ||
23 | <div class="cat-list-wr col-xs-12 col-sm-4 col-md-3 col-lg-3"> | 23 | <div class="cat-list-wr col-xs-12 col-sm-4 col-md-3 col-lg-3"> |
24 | <div class="cat-list"> | 24 | <div class="cat-list"> |
25 | <?php | 25 | <?php |
26 | - echo Html::a(ArtboxImageHelper::getImage($category->getImageUrl(), 'filter_image') . Html::tag('p', $category->name), [ | 26 | + echo Html::a(Html::tag('p', $category->name), [ |
27 | 'filter/index', | 27 | 'filter/index', |
28 | 'category_id' => $category->category_id, | 28 | 'category_id' => $category->category_id, |
29 | 'purpose_id' => $purpose->tax_option_id, | 29 | 'purpose_id' => $purpose->tax_option_id, |
30 | ], [ | 30 | ], [ |
31 | 'class' => 'link-cat', | 31 | 'class' => 'link-cat', |
32 | + 'style' => 'background-image: url("'.ArtboxImageHelper::getImageSrc($category->getImageUrl(), 'filter_image').'")', | ||
32 | ]); | 33 | ]); |
33 | ?> | 34 | ?> |
34 | <div class="cat-list-brands-wr"> | 35 | <div class="cat-list-brands-wr"> |
frontend/web/css/style.min.css
@@ -1119,6 +1119,9 @@ ul.main-menu li:first-child ul li a:before {display: none;} | @@ -1119,6 +1119,9 @@ ul.main-menu li:first-child ul li a:before {display: none;} | ||
1119 | float: left; | 1119 | float: left; |
1120 | margin-top: 40px; | 1120 | margin-top: 40px; |
1121 | } | 1121 | } |
1122 | +.form-product-wr.product_1 {height: 75px;} | ||
1123 | +.form-product-wr.product_2 {height: 155px;} | ||
1124 | + | ||
1122 | .scrollbar_ {height: 241px; | 1125 | .scrollbar_ {height: 241px; |
1123 | overflow-y: hidden;} | 1126 | overflow-y: hidden;} |
1124 | .form-product-wr table { | 1127 | .form-product-wr table { |
@@ -1465,6 +1468,9 @@ ul.breadcrumb li a { | @@ -1465,6 +1468,9 @@ ul.breadcrumb li a { | ||
1465 | width: 100%; | 1468 | width: 100%; |
1466 | display: block; | 1469 | display: block; |
1467 | float: left; | 1470 | float: left; |
1471 | + height: 144px; | ||
1472 | + background-repeat: no-repeat !important; | ||
1473 | + background-size: cover !important; | ||
1468 | } | 1474 | } |
1469 | .link-cat:before { | 1475 | .link-cat:before { |
1470 | height: 75px; | 1476 | height: 75px; |
@@ -2486,6 +2492,7 @@ y-axis | @@ -2486,6 +2492,7 @@ y-axis | ||
2486 | 2492 | ||
2487 | 2493 | ||
2488 | @media (max-width: 1200px) { | 2494 | @media (max-width: 1200px) { |
2495 | + .link-cat {height: 116px;} | ||
2489 | /*[class*="moz-"] {*/ | 2496 | /*[class*="moz-"] {*/ |
2490 | /*height: 62px;*/ | 2497 | /*height: 62px;*/ |
2491 | /*}*/ | 2498 | /*}*/ |
@@ -2568,11 +2575,12 @@ y-axis | @@ -2568,11 +2575,12 @@ y-axis | ||
2568 | .new_article-img {margin-bottom: 20px} | 2575 | .new_article-img {margin-bottom: 20px} |
2569 | } | 2576 | } |
2570 | @media (max-width: 991px) { | 2577 | @media (max-width: 991px) { |
2571 | - | 2578 | +.link-cat {height: 162px;} |
2572 | 2579 | ||
2573 | } | 2580 | } |
2574 | 2581 | ||
2575 | @media (max-width: 950px) { | 2582 | @media (max-width: 950px) { |
2583 | + .link-cat {height: 155px;} | ||
2576 | .modal-form, #success-form { | 2584 | .modal-form, #success-form { |
2577 | width: 610px; | 2585 | width: 610px; |
2578 | margin-left: -305px; | 2586 | margin-left: -305px; |
@@ -2589,22 +2597,41 @@ y-axis | @@ -2589,22 +2597,41 @@ y-axis | ||
2589 | } | 2597 | } |
2590 | 2598 | ||
2591 | 2599 | ||
2592 | - | ||
2593 | - | 2600 | +@media (max-width: 900px) { |
2601 | + .link-cat { | ||
2602 | + height: 145px; | ||
2603 | + } | ||
2604 | +} | ||
2594 | @media (max-width: 896px) { | 2605 | @media (max-width: 896px) { |
2595 | 2606 | ||
2596 | } | 2607 | } |
2608 | +@media (max-width: 850px) { | ||
2609 | + .link-cat { | ||
2610 | + height: 136px; | ||
2611 | + } | ||
2612 | +} | ||
2597 | @media (max-width: 835px) {} | 2613 | @media (max-width: 835px) {} |
2598 | @media (max-width: 810px) { | 2614 | @media (max-width: 810px) { |
2599 | .list-tabs {padding-left: 30px;} | 2615 | .list-tabs {padding-left: 30px;} |
2600 | .list-tabs li, .list-tabs li span {width: 160px;} | 2616 | .list-tabs li, .list-tabs li span {width: 160px;} |
2601 | } | 2617 | } |
2618 | +@media (max-width: 800px) { | ||
2619 | + .link-cat { | ||
2620 | + height: 127px; | ||
2621 | + } | ||
2622 | +} | ||
2602 | 2623 | ||
2603 | 2624 | ||
2604 | - | ||
2605 | - | 2625 | +@media (max-width: 768px) { |
2626 | + .link-cat { | ||
2627 | + height: 121px; | ||
2628 | + } | ||
2629 | +} | ||
2606 | 2630 | ||
2607 | @media (max-width: 767px) { | 2631 | @media (max-width: 767px) { |
2632 | + .link-cat { | ||
2633 | + height: 396px; | ||
2634 | + } | ||
2608 | /*.close-search {*/ | 2635 | /*.close-search {*/ |
2609 | /*position: absolute !important;*/ | 2636 | /*position: absolute !important;*/ |
2610 | /*top: 0;*/ | 2637 | /*top: 0;*/ |
@@ -2810,13 +2837,30 @@ y-axis | @@ -2810,13 +2837,30 @@ y-axis | ||
2810 | text-align: left; | 2837 | text-align: left; |
2811 | } | 2838 | } |
2812 | } | 2839 | } |
2813 | - | ||
2814 | - | 2840 | +@media (max-width: 700px) { |
2841 | + .link-cat { | ||
2842 | + height: 360px; | ||
2843 | + } | ||
2844 | +} | ||
2815 | 2845 | ||
2816 | @media (max-width: 668px) { | 2846 | @media (max-width: 668px) { |
2817 | 2847 | ||
2818 | } | 2848 | } |
2819 | - | 2849 | +@media (max-width: 650px) { |
2850 | + .link-cat { | ||
2851 | + height: 332px; | ||
2852 | + } | ||
2853 | +} | ||
2854 | +@media (max-width: 600px) { | ||
2855 | + .link-cat { | ||
2856 | + height: 304px; | ||
2857 | + } | ||
2858 | +} | ||
2859 | +@media (max-width: 550px) { | ||
2860 | + .link-cat { | ||
2861 | + height: 277px; | ||
2862 | + } | ||
2863 | +} | ||
2820 | @media (max-width: 560px) { | 2864 | @media (max-width: 560px) { |
2821 | 2865 | ||
2822 | } | 2866 | } |
@@ -2827,17 +2871,30 @@ y-axis | @@ -2827,17 +2871,30 @@ y-axis | ||
2827 | .box-mosaic a p:before {bottom: 32px;right: 9px;} | 2871 | .box-mosaic a p:before {bottom: 32px;right: 9px;} |
2828 | .certificate-page .certificate {width: 100% !important;} | 2872 | .certificate-page .certificate {width: 100% !important;} |
2829 | } | 2873 | } |
2874 | +@media (max-width: 500px) { | ||
2875 | + .link-cat { | ||
2876 | + height: 249px; | ||
2877 | + } | ||
2878 | +} | ||
2830 | @media (max-width: 480px) { | 2879 | @media (max-width: 480px) { |
2831 | - | 2880 | + .link-cat { |
2881 | + height: 238px; | ||
2882 | + } | ||
2832 | } | 2883 | } |
2833 | @media (max-width: 460px) { } | 2884 | @media (max-width: 460px) { } |
2834 | @media (max-width: 450px) { | 2885 | @media (max-width: 450px) { |
2886 | + .link-cat { | ||
2887 | + height: 222px; | ||
2888 | + } | ||
2835 | #close-form { | 2889 | #close-form { |
2836 | top: -58px; | 2890 | top: -58px; |
2837 | right: 0;} | 2891 | right: 0;} |
2838 | } | 2892 | } |
2839 | 2893 | ||
2840 | @media (max-width: 400px) { | 2894 | @media (max-width: 400px) { |
2895 | + .link-cat { | ||
2896 | + height: 194px; | ||
2897 | + } | ||
2841 | .box-mosaic a p { | 2898 | .box-mosaic a p { |
2842 | padding-right: 23px; | 2899 | padding-right: 23px; |
2843 | padding-top: 16px; | 2900 | padding-top: 16px; |
@@ -2847,12 +2904,20 @@ y-axis | @@ -2847,12 +2904,20 @@ y-axis | ||
2847 | 2904 | ||
2848 | } | 2905 | } |
2849 | @media (max-width: 350px) { | 2906 | @media (max-width: 350px) { |
2907 | + .link-cat { | ||
2908 | + height: 166px; | ||
2909 | + } | ||
2850 | .box-mosaic a p { | 2910 | .box-mosaic a p { |
2851 | padding-right: 23px; | 2911 | padding-right: 23px; |
2852 | padding-top: 16px; | 2912 | padding-top: 16px; |
2853 | } | 2913 | } |
2854 | .box-mosaic a p:before {bottom: 46px;right: 16px;} | 2914 | .box-mosaic a p:before {bottom: 46px;right: 16px;} |
2855 | } | 2915 | } |
2916 | +@media (max-width: 336px) { | ||
2917 | + .link-cat { | ||
2918 | + height: 160px; | ||
2919 | + } | ||
2920 | +} | ||
2856 | @media (max-width: 330px) { | 2921 | @media (max-width: 330px) { |
2857 | .box-mosaic a p { | 2922 | .box-mosaic a p { |
2858 | padding-right: 22px; | 2923 | padding-right: 22px; |