From 10aa92a273c335e7220f6f4dfbbb462b324c5696 Mon Sep 17 00:00:00 2001 From: YosefGul <71524035+YosefGul@users.noreply.github.com> Date: Mon, 29 Nov 2021 16:36:56 +0300 Subject: [PATCH 1/6] fix --- .../resources/views/list/gallery.twig | 55 +++++++---------- .../base-theme/resources/css/theme.css | 60 +++++++++++++++++++ 2 files changed, 82 insertions(+), 33 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 fe88e4d0b..8eb9a8a41 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig @@ -5,48 +5,37 @@ {% set showLocation = setting_value('visiosoft.module.location::home_page_location') %} {% set showDate = setting_value('visiosoft.theme.base::date_fields') %} -
+
{{ addBlock('ad-list/partials/gallery',{'featured_advs': featured_advs, 'vars': _context})|raw }} {% for adv in advs %} -
-
-
- - {{ adv.name }} - -
-
- - {{ addBlock('list/extra-actions', {'ad': adv, 'vars': _context}, ['favs', 'comparisons'])|raw }} - -
+
+ +
+
+ +
+
+ {{ 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') }} + TL +
+ {% endif %}
-
-
- {{ 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 %} - {% if showLocation %} -

{{ adv.country_name }} / {{ adv.city_name }}

- {% endif %} - {% if setting_value('visiosoft.module.advs::market_place') and showDate %} -

{{ adv.publish_at.value|date('d/m/Y') }}

- {% endif %} -
-
+
{% endfor %}
+ {% endblock %} {% block customjs %} diff --git a/addons/default/visiosoft/base-theme/resources/css/theme.css b/addons/default/visiosoft/base-theme/resources/css/theme.css index 466f6e6d0..6625e094b 100644 --- a/addons/default/visiosoft/base-theme/resources/css/theme.css +++ b/addons/default/visiosoft/base-theme/resources/css/theme.css @@ -25,3 +25,63 @@ 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: 315px; + 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; + height: 190px; +} + +.product-image-in { + width: 100%; + height: 100%; + object-fit: contain; +} + +.product-name-hb { + font-size: 12px; + line-height: 18px; + margin-bottom: 4px; + margin-top: 0; + overflow: hidden; + -webkit-line-clamp: 2; + height: 36px; + font-weight: normal; +} + +.product-price-hb { + font-size: 18px; +} + +.tl-span { + font-size: 14px; +} From f79e370c029af653d69472322c3748de1c817ed1 Mon Sep 17 00:00:00 2001 From: YosefGul <71524035+YosefGul@users.noreply.github.com> Date: Thu, 2 Dec 2021 21:43:52 +0300 Subject: [PATCH 2/6] Add block reverted, fav buttons are working. Other problems was fixed. --- .../advs-module/resources/views/list/gallery.twig | 7 +++---- .../default/visiosoft/base-theme/resources/css/theme.css | 8 ++++++++ composer.json | 3 +-- 3 files changed, 12 insertions(+), 6 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 8eb9a8a41..704e70a4c 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig @@ -13,9 +13,8 @@
-
- -
+ {{ addBlock('list/extra-actions', {'ad': adv, 'vars': _context}, ['favs', 'comparisons'])|raw }} +
{{ adv.name }}
@@ -26,9 +25,9 @@ {% if showPrice %}
{{ adv.price != '0' ? currency_format(adv.price,adv.currency) : trans('visiosoft.module.advs::field.free') }} - TL
{% endif %} +
diff --git a/addons/default/visiosoft/base-theme/resources/css/theme.css b/addons/default/visiosoft/base-theme/resources/css/theme.css index 6625e094b..c7bf27404 100644 --- a/addons/default/visiosoft/base-theme/resources/css/theme.css +++ b/addons/default/visiosoft/base-theme/resources/css/theme.css @@ -85,3 +85,11 @@ .tl-span { font-size: 14px; } + +.like { + color: rgb(109, 109, 109) !important; +} + +.unlike { + color: red !important; +} diff --git a/composer.json b/composer.json index e7cb719fc..80d03e20f 100644 --- a/composer.json +++ b/composer.json @@ -93,8 +93,7 @@ "filp/whoops": "~2.0", "fzaninotto/faker": "~1.4", "symfony/css-selector": "3.1.*", - "symfony/dom-crawler": "3.1.*", - "anomaly/installer-module": "~2.4.0" + "symfony/dom-crawler": "3.1.*" }, "repositories": [ { From 20e32aacf5eb19756abaa4764f2aa56f507be7ae Mon Sep 17 00:00:00 2001 From: YosefGul <71524035+YosefGul@users.noreply.github.com> Date: Thu, 2 Dec 2021 23:03:16 +0300 Subject: [PATCH 3/6] Add block reverted, fav buttons are working. Other problems was fixed. --- .../visiosoft/base-theme/resources/css/theme.css | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/addons/default/visiosoft/base-theme/resources/css/theme.css b/addons/default/visiosoft/base-theme/resources/css/theme.css index c7bf27404..cede3a47f 100644 --- a/addons/default/visiosoft/base-theme/resources/css/theme.css +++ b/addons/default/visiosoft/base-theme/resources/css/theme.css @@ -87,9 +87,19 @@ } .like { - color: rgb(109, 109, 109) !important; + color: rgb(109, 109, 109); } .unlike { color: red !important; } + +.color-red { + color: red !important; +} + +.color-black { + color: black; +} + + From 00edf7d5fecd774b0a86136cc21dddbe31257a46 Mon Sep 17 00:00:00 2001 From: YosefGul <71524035+YosefGul@users.noreply.github.com> Date: Mon, 6 Dec 2021 10:21:25 +0300 Subject: [PATCH 4/6] Fix 2. --- .../visiosoft/base-theme/resources/css/theme.css | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/addons/default/visiosoft/base-theme/resources/css/theme.css b/addons/default/visiosoft/base-theme/resources/css/theme.css index cede3a47f..79a90afab 100644 --- a/addons/default/visiosoft/base-theme/resources/css/theme.css +++ b/addons/default/visiosoft/base-theme/resources/css/theme.css @@ -86,20 +86,5 @@ font-size: 14px; } -.like { - color: rgb(109, 109, 109); -} - -.unlike { - color: red !important; -} - -.color-red { - color: red !important; -} - -.color-black { - color: black; -} From 30fc27b4435b21e09aba2f4fded84123848c64e8 Mon Sep 17 00:00:00 2001 From: YosefGul <71524035+YosefGul@users.noreply.github.com> Date: Mon, 6 Dec 2021 10:52:58 +0300 Subject: [PATCH 5/6] composer files fixed. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 80d03e20f..5777ee63f 100644 --- a/composer.json +++ b/composer.json @@ -93,7 +93,8 @@ "filp/whoops": "~2.0", "fzaninotto/faker": "~1.4", "symfony/css-selector": "3.1.*", - "symfony/dom-crawler": "3.1.*" + "symfony/dom-crawler": "3.1.*", + "anomaly/installer-module": "~2.4.0", }, "repositories": [ { From e44418d247ad0da7d61e778eba5b1fc00c8d3e23 Mon Sep 17 00:00:00 2001 From: YosefGul <71524035+YosefGul@users.noreply.github.com> Date: Mon, 6 Dec 2021 10:58:45 +0300 Subject: [PATCH 6/6] composer files fixed. --- addons/default/visiosoft/base-theme/resources/css/theme.css | 5 ----- composer.json | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/addons/default/visiosoft/base-theme/resources/css/theme.css b/addons/default/visiosoft/base-theme/resources/css/theme.css index 79a90afab..da0ce4097 100644 --- a/addons/default/visiosoft/base-theme/resources/css/theme.css +++ b/addons/default/visiosoft/base-theme/resources/css/theme.css @@ -82,9 +82,4 @@ font-size: 18px; } -.tl-span { - font-size: 14px; -} - - diff --git a/composer.json b/composer.json index 5777ee63f..e7cb719fc 100644 --- a/composer.json +++ b/composer.json @@ -94,7 +94,7 @@ "fzaninotto/faker": "~1.4", "symfony/css-selector": "3.1.*", "symfony/dom-crawler": "3.1.*", - "anomaly/installer-module": "~2.4.0", + "anomaly/installer-module": "~2.4.0" }, "repositories": [ {