From 0332cfcb2e2d4a0eb8eb5752a976bcc7380e2777 Mon Sep 17 00:00:00 2001 From: Metehan Celik Date: Thu, 23 Dec 2021 14:48:25 +0300 Subject: [PATCH 1/3] sahibinden gallery update --- .../resources/views/list/gallery.twig | 50 +++++++++++-------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig index 204537577..3dc3fbaad 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig @@ -11,34 +11,42 @@ {% for adv in advs %}
-
- {{ addBlock('list/extra-actions', {'ad': adv, 'vars': _context}, ['favs', 'comparisons'])|raw }} -
- - {{ adv.name }} - -
-
- - {{ adv.name }} - - {% if not setting_value('visiosoft.module.advs::hide_ad_cat') %} - {{ adv.cat1_name }} /{{ adv.cat2_name }} - {% endif %} - {% if showPrice %} -
- {{ adv.price != '0' ? currency_format(adv.price,adv.currency) : trans('visiosoft.module.advs::field.free') }} -
- {% endif %} - -
+
+ {{ addBlock('list/extra-actions', {'ad': adv, 'vars': _context}, ['favs', 'comparisons'])|raw }} +
+ + {{ adv.name }} +
+
+ +

{{ adv.name }}

+ + {% if not setting_value('visiosoft.module.advs::hide_ad_cat') %} + {{ adv.cat1_name }} /{{ adv.cat2_name }} + {% endif %} + {% if showPrice %} +
+ {{ adv.price != '0' ? currency_format(adv.price,adv.currency) : trans('visiosoft.module.advs::field.free') }} +
+ {% endif %} + +
+
{% endfor %}
{% endblock %} +{% block styles %} + + {{ asset_style('visiosoft.module.advs::css/list.css') }} + {{ asset_style('visiosoft.module.advs::css/list-new.scss') }} +{% endblock %} + {% block customjs %} {{ asset_add("scripts.js", "visiosoft.module.advs::js/list-table.js") }} {% include "theme::scroll-modal" %} From ddd6faf48e820b93c3a1b9aef7ba65b36f8a9a54 Mon Sep 17 00:00:00 2001 From: Metehan Celik Date: Mon, 27 Dec 2021 11:19:13 +0300 Subject: [PATCH 2/3] base theme mobile gallery layout & fav/comparison icons --- .../resources/views/list/gallery.twig | 11 ++- .../resources/views/list/list.twig | 8 +-- .../views/list/partials/breadcrumb.twig | 4 +- .../views/list/partials/list-filter.twig | 2 +- .../views/list/partials/mobile-list.twig | 46 ------------ .../base-theme/resources/css/gallery.css | 66 +++++++++++++++++ .../base-theme/resources/css/theme.css | 71 +------------------ .../resources/views/layouts/default.twig | 2 +- .../resources/views/partials/metadata.twig | 1 + 9 files changed, 79 insertions(+), 132 deletions(-) delete mode 100644 addons/default/visiosoft/advs-module/resources/views/list/partials/mobile-list.twig create mode 100644 addons/default/visiosoft/base-theme/resources/css/gallery.css diff --git a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig index 3dc3fbaad..7494b9077 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig @@ -10,10 +10,10 @@ {{ addBlock('ad-list/partials/gallery',{'featured_advs': featured_advs, 'vars': _context})|raw }} {% for adv in advs %} -
-
+
+
{{ addBlock('list/extra-actions', {'ad': adv, 'vars': _context}, ['favs', 'comparisons'])|raw }} -
+
{{ adv.name }} @@ -40,10 +40,7 @@ {% endblock %} {% block styles %} - - {{ asset_style('visiosoft.module.advs::css/list.css') }} + {{ asset_style('visiosoft.theme.base::css/gallery.css') }} {{ asset_style('visiosoft.module.advs::css/list-new.scss') }} {% endblock %} diff --git a/addons/default/visiosoft/advs-module/resources/views/list/list.twig b/addons/default/visiosoft/advs-module/resources/views/list/list.twig index cb08f0329..8849f19cc 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/list.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/list.twig @@ -7,9 +7,7 @@ {% block content %} - {% include "visiosoft.module.advs::list/partials/mobile-list" %} - -
+
{% include "visiosoft.module.advs::list/partials/breadcrumb" %} @@ -17,7 +15,7 @@ {% include "visiosoft.module.advs::list/partials/list-filter" %} -
+

{{ trans('visiosoft.module.advs::field.search_ad_result_text', { @@ -67,7 +65,7 @@ {{ addBlock('ads-list/row',{'topfields':topfields,'selectRange':selectRange,'advs':advs, 'mainCats':mainCats|length})|raw }} -

+
{% block listContent %} {% include "visiosoft.module.advs::list/partials/ads" %} {% endblock %} diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/breadcrumb.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/breadcrumb.twig index 141ae835f..06e504837 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/breadcrumb.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/breadcrumb.twig @@ -1,6 +1,6 @@ -
+
- + {{ trans("visiosoft.module.advs::field.home") }} diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig index 678a8ca6c..2b68a5e31 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig @@ -3,7 +3,7 @@ {% set citySlug = pathInfo|length is same as(4) ? pathInfo[3] : null %} {% set formAction = catSlug ? url_route('adv_list_seo', [catSlug, citySlug]) : url_route('visiosoft.module.advs::list') %}
+ class="flex-shrink-0 d-md-block d-none"> diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/mobile-list.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/mobile-list.twig deleted file mode 100644 index 686b87377..000000000 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/mobile-list.twig +++ /dev/null @@ -1,46 +0,0 @@ - diff --git a/addons/default/visiosoft/base-theme/resources/css/gallery.css b/addons/default/visiosoft/base-theme/resources/css/gallery.css new file mode 100644 index 000000000..358973d33 --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/css/gallery.css @@ -0,0 +1,66 @@ +.product-hb { + font-family: -apple-system, + BlinkMacSystemFont, + Arial, + Roboto, + Oxygen, + Ubuntu, + Cantarell, + Fira Sans, + Droid Sans, + Helvetica Neue, + sans-serif !important; + height: 500px; + margin-bottom: 20px; +} + +.heart-icon { + width: 36px; + height: 36px; + border-radius: 50%; + font-size: 18px; + color: rgb(109, 109, 109); + background-color: rgb(245, 245, 245); + position: absolute; + right: 25px; + top: 15px; + cursor: pointer; +} + +.product-image-hb { + display: flex; + justify-content: center; + width:100%; + height: 500px; + padding: 10px; +} + +.product-image-in { + width: 100%; + height: 100%; + object-fit:cover; + border-radius: 6px; +} + +.product-name-hb { + font-size: 12px; + line-height: 18px; + margin-top: 0; + font-weight: normal; +} +.line-clamp { + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + overflow: hidden; +} + +.product-price-hb { + font-size: 24px; + font-weight:bolder; + background-color: rgb(244,244,244); + height: 50px; +} +.fs-14{ + font-size: 14px; +} \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/css/theme.css b/addons/default/visiosoft/base-theme/resources/css/theme.css index ea5abc457..4255e2f76 100644 --- a/addons/default/visiosoft/base-theme/resources/css/theme.css +++ b/addons/default/visiosoft/base-theme/resources/css/theme.css @@ -24,73 +24,4 @@ .register-section { padding: 100px 50px; } -} - -.product-hb { - font-family: -apple-system, - BlinkMacSystemFont, - Arial, - Roboto, - Oxygen, - Ubuntu, - Cantarell, - Fira Sans, - Droid Sans, - Helvetica Neue, - sans-serif !important; - height: 500px; - margin-bottom: 20px; -} - -.heart-icon { - width: 36px; - height: 36px; - border-radius: 50%; - font-size: 18px; - color: rgb(109, 109, 109); - background-color: rgb(245, 245, 245); - position: absolute; - right: 25px; - top: 15px; - cursor: pointer; -} - -.product-image-hb { - display: flex; - justify-content: center; - width:100%; - height: 500px; - padding: 10px; -} - -.product-image-in { - width: 100%; - height: 100%; - object-fit:cover; - border-radius: 6px; -} - -.product-name-hb { - font-size: 12px; - line-height: 18px; - margin-top: 0; - font-weight: normal; -} -.line-clamp { - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; - overflow: hidden; -} - -.product-price-hb { - font-size: 24px; - font-weight:bolder; - background-color: rgb(244,244,244); - height: 50px; -} -.fs-14{ - font-size: 14px; -} - - +} \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig b/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig index a06220c3a..12986fdd5 100644 --- a/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig +++ b/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig @@ -22,7 +22,7 @@ {{ addBlock('layouts/default/section')|raw }}
-
+
{% include "visiosoft.theme.base::partials/messages" %} diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig index 243f8eb8f..210b77532 100644 --- a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig +++ b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig @@ -19,6 +19,7 @@ {{ asset_add("theme.css", "visiosoft.theme.base::css/select2.css") }} {{ asset_add("theme.css", "visiosoft.theme.base::css/font-awesome.min.css") }} {{ asset_add("theme.css", "visiosoft.theme.base::css/intlTelInput.css") }} +{{ asset_add("theme.css", "visiosoft.theme.base::css/gallery.css") }} {{ asset_script('visiosoft.theme.base::js/visiosoft.js') }} From 741203d1da02531dad650ddd559e4ae310ab44ac Mon Sep 17 00:00:00 2001 From: Metehan Celik Date: Tue, 28 Dec 2021 09:45:54 +0300 Subject: [PATCH 3/3] unnecessary blocks are deleted --- .../visiosoft/base-theme/resources/css/gallery.css | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/addons/default/visiosoft/base-theme/resources/css/gallery.css b/addons/default/visiosoft/base-theme/resources/css/gallery.css index 358973d33..2d031b42f 100644 --- a/addons/default/visiosoft/base-theme/resources/css/gallery.css +++ b/addons/default/visiosoft/base-theme/resources/css/gallery.css @@ -1,15 +1,4 @@ .product-hb { - font-family: -apple-system, - BlinkMacSystemFont, - Arial, - Roboto, - Oxygen, - Ubuntu, - Cantarell, - Fira Sans, - Droid Sans, - Helvetica Neue, - sans-serif !important; height: 500px; margin-bottom: 20px; }