From 720e2836dcf167446a865530bfc698309a62566d Mon Sep 17 00:00:00 2001 From: Jarek Date: Thu, 6 May 2021 10:33:28 +0200 Subject: [PATCH 001/346] #77501 - Change background for disabled checkbox --- .../Molecules/form/checkbox/_checkbox-variables.scss | 3 +++ .../components/Molecules/form/checkbox/_checkbox.scss | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/Snowdog_Components/components/Molecules/form/checkbox/_checkbox-variables.scss b/Snowdog_Components/components/Molecules/form/checkbox/_checkbox-variables.scss index 0157a2d4f..cd69c540d 100644 --- a/Snowdog_Components/components/Molecules/form/checkbox/_checkbox-variables.scss +++ b/Snowdog_Components/components/Molecules/form/checkbox/_checkbox-variables.scss @@ -37,3 +37,6 @@ $checkbox__before-transform-hover : scaleX(1) translateY(-$checkbox__ $checkbox__error-bottom : -#{$spacer} !default; $checkbox__link-inner-text-decoration : underline !default; + +// disabled +$checkbox__field-background--disabled : $gray !default; diff --git a/Snowdog_Components/components/Molecules/form/checkbox/_checkbox.scss b/Snowdog_Components/components/Molecules/form/checkbox/_checkbox.scss index a1d29c45d..0e9fdbc12 100644 --- a/Snowdog_Components/components/Molecules/form/checkbox/_checkbox.scss +++ b/Snowdog_Components/components/Molecules/form/checkbox/_checkbox.scss @@ -102,6 +102,16 @@ opacity: 0; cursor: pointer; + &:checked { + &.checkbox__field--disabled { + & ~ .checkbox__label { + &:after { + background-color: $checkbox__field-background--disabled; + } + } + } + } + &:checked ~ .checkbox__icon--checked { opacity: 1; } From 7e682127e314d338945f17879f2707cf7273c4a3 Mon Sep 17 00:00:00 2001 From: Jarek Date: Thu, 6 May 2021 11:06:44 +0200 Subject: [PATCH 002/346] #77501 - Add disabled class for checkbox --- Amasty_GdprCookie/web/template/modal.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Amasty_GdprCookie/web/template/modal.html b/Amasty_GdprCookie/web/template/modal.html index 2881ee943..fa53dc153 100644 --- a/Amasty_GdprCookie/web/template/modal.html +++ b/Amasty_GdprCookie/web/template/modal.html @@ -26,7 +26,7 @@

data-bind=" attr: {id: 'switch-box-' + $index(), disabled: isEssential}, value: $data.groupId, - css: {'disabled': isEssential}, + css: {'checkbox__field--disabled': isEssential}, checked: checked " /> From 35d701d4c56c06916ceb463705ee4c0a73a45d44 Mon Sep 17 00:00:00 2001 From: Jarek Date: Thu, 6 May 2021 11:06:56 +0200 Subject: [PATCH 003/346] #77501 - Formatting --- Amasty_GdprCookie/web/js/modal-mixin.js | 80 +++++++++++++------------ 1 file changed, 41 insertions(+), 39 deletions(-) diff --git a/Amasty_GdprCookie/web/js/modal-mixin.js b/Amasty_GdprCookie/web/js/modal-mixin.js index 9a712cc86..0310efcfb 100644 --- a/Amasty_GdprCookie/web/js/modal-mixin.js +++ b/Amasty_GdprCookie/web/js/modal-mixin.js @@ -1,49 +1,51 @@ define([ - 'uiComponent', - 'jquery', - 'underscore', - 'Magento_Ui/js/modal/modal' + "uiComponent", + "jquery", + "underscore", + "Magento_Ui/js/modal/modal", ], function (Component, $, _, modal) { - 'use strict'; + "use strict"; - return function (Component) { - return Component.extend({ - defaults: { - template: { - afterRender: function () { - } - } - }, + return function (Component) { + return Component.extend({ + defaults: { + template: { + afterRender: function () {}, + }, + }, - initModal: function () { - var options = { - type: 'popup', - responsive: true, - modalClass: '', - buttons: [] - }; + initModal: function () { + var options = { + type: "popup", + responsive: true, + modalClass: "", + buttons: [], + }; - this.isShowModal(true); + this.isShowModal(true); - if (this.websiteInteraction == 1) { - options.clickableOverlay = false; - options.keyEventHandlers = { - escapeKey: function () { } - }; + if (this.websiteInteraction == 1) { + options.clickableOverlay = false; + options.keyEventHandlers = { + escapeKey: function () {}, + }; - options.opened = function () { - $('.modal-header button.action-close').hide(); - }; - } + options.opened = function () { + $(".modal-header button.action-close").hide(); + }; + } - this.cookieModal = modal(options, this.element.modal); + this.cookieModal = modal(options, this.element.modal); - this.cookieModal.element.html($(this.element.container)); - this.cookieModal.openModal().on('modalclosed', function () { - this.cookieModal.element.html(''); - $(window).off('resize', this.resizeFunc); - }.bind(this)); - }, - }); - }; + this.cookieModal.element.html($(this.element.container)); + this.cookieModal.openModal().on( + "modalclosed", + function () { + this.cookieModal.element.html(""); + $(window).off("resize", this.resizeFunc); + }.bind(this) + ); + }, + }); + }; }); From 736ea0c7d1f9d023ff4a3108bb7205f57120aeb8 Mon Sep 17 00:00:00 2001 From: Jarek Date: Thu, 6 May 2021 11:08:10 +0200 Subject: [PATCH 004/346] #77501 - Copy method --- Amasty_GdprCookie/web/js/modal-mixin.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Amasty_GdprCookie/web/js/modal-mixin.js b/Amasty_GdprCookie/web/js/modal-mixin.js index 0310efcfb..96b0fc528 100644 --- a/Amasty_GdprCookie/web/js/modal-mixin.js +++ b/Amasty_GdprCookie/web/js/modal-mixin.js @@ -46,6 +46,21 @@ define([ }.bind(this) ); }, + + saveCookie: function () { + var disabledFields = $(this.element.field + ":disabled"); + + disabledFields.removeAttr("disabled"); + cookieModel() + .saveCookie() + .done( + function () { + disabledFields.attr("disabled", true); + this.closeModal(); + cookieModel().triggerSave(); + }.bind(this) + ); + }, }); }; }); From 615ab8e56ee572dd60d15dd349178b295fcd7b61 Mon Sep 17 00:00:00 2001 From: Jarek Date: Thu, 6 May 2021 11:19:58 +0200 Subject: [PATCH 005/346] #77501 - Formatting, close modal immediately --- Amasty_GdprCookie/web/js/modal-mixin.js | 46 ++++++++++++++++--------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/Amasty_GdprCookie/web/js/modal-mixin.js b/Amasty_GdprCookie/web/js/modal-mixin.js index 96b0fc528..d01e1237d 100644 --- a/Amasty_GdprCookie/web/js/modal-mixin.js +++ b/Amasty_GdprCookie/web/js/modal-mixin.js @@ -1,10 +1,11 @@ define([ - "uiComponent", - "jquery", - "underscore", - "Magento_Ui/js/modal/modal", -], function (Component, $, _, modal) { - "use strict"; + 'uiComponent', + 'jquery', + 'underscore', + 'Magento_Ui/js/modal/modal', + 'Amasty_GdprCookie/js/model/cookie', +], function (Component, $, _, modal, cookieModel) { + 'use strict'; return function (Component) { return Component.extend({ @@ -16,9 +17,9 @@ define([ initModal: function () { var options = { - type: "popup", + type: 'popup', responsive: true, - modalClass: "", + modalClass: '', buttons: [], }; @@ -31,7 +32,7 @@ define([ }; options.opened = function () { - $(".modal-header button.action-close").hide(); + $('.modal-header button.action-close').hide(); }; } @@ -39,28 +40,41 @@ define([ this.cookieModal.element.html($(this.element.container)); this.cookieModal.openModal().on( - "modalclosed", + 'modalclosed', function () { - this.cookieModal.element.html(""); - $(window).off("resize", this.resizeFunc); + this.cookieModal.element.html(''); + $(window).off('resize', this.resizeFunc); }.bind(this) ); }, saveCookie: function () { - var disabledFields = $(this.element.field + ":disabled"); + var disabledFields = $(this.element.field + ':disabled'); - disabledFields.removeAttr("disabled"); + this.closeModal(); + + disabledFields.removeAttr('disabled'); cookieModel() .saveCookie() .done( function () { - disabledFields.attr("disabled", true); - this.closeModal(); + disabledFields.attr('disabled', true); cookieModel().triggerSave(); }.bind(this) ); }, + + allowCookies: function () { + this.closeModal(); + + cookieModel() + .allowAllCookies() + .done( + function () { + cookieModel().triggerAllow(); + }.bind(this) + ); + } }); }; }); From 41961fcd6584ab5804d4c01bd0f5ec6b94a475af Mon Sep 17 00:00:00 2001 From: Jarek Date: Fri, 7 May 2021 12:03:44 +0200 Subject: [PATCH 006/346] #77501 - Copy template --- Amasty_GdprCookie/templates/cookiebar.phtml | 131 ++++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100644 Amasty_GdprCookie/templates/cookiebar.phtml diff --git a/Amasty_GdprCookie/templates/cookiebar.phtml b/Amasty_GdprCookie/templates/cookiebar.phtml new file mode 100644 index 000000000..9d7c30a8a --- /dev/null +++ b/Amasty_GdprCookie/templates/cookiebar.phtml @@ -0,0 +1,131 @@ + +getCookiePolicyText(); +$groups = $block->getAllGroups(); +?> + +getNoticeType() === \Amasty\GdprCookie\Model\Config\Source\CookiePolicyBarStyle::CONFIRMATION_MODAL && $cookiePrivacyText && $groups): ?> + +
+ +
+
+ +getNoticeType() === \Amasty\GdprCookie\Model\Config\Source\CookiePolicyBarStyle::CONFIRMATION && $cookiePrivacyText): ?> + +
+ +
+ + + + + + + From ca2f7639c4837af5ee47d7c70e88802b9ad3b03c Mon Sep 17 00:00:00 2001 From: Jarek Date: Fri, 7 May 2021 13:32:17 +0200 Subject: [PATCH 007/346] #77501 - Adjust template --- Amasty_GdprCookie/templates/cookiebar.phtml | 139 +++++++++++++++++--- 1 file changed, 123 insertions(+), 16 deletions(-) diff --git a/Amasty_GdprCookie/templates/cookiebar.phtml b/Amasty_GdprCookie/templates/cookiebar.phtml index 9d7c30a8a..ac1b87918 100644 --- a/Amasty_GdprCookie/templates/cookiebar.phtml +++ b/Amasty_GdprCookie/templates/cookiebar.phtml @@ -1,27 +1,134 @@ -getCookiePolicyText(); -$groups = $block->getAllGroups(); +$groupsJson = $block->getAllGroups(); +$groups = json_decode($groupsJson, true); ?> - getNoticeType() === \Amasty\GdprCookie\Model\Config\Source\CookiePolicyBarStyle::CONFIRMATION_MODAL && $cookiePrivacyText && $groups): ?> -
- +
+
+ getNoticeType() === \Amasty\GdprCookie\Model\Config\Source\CookiePolicyBarStyle::CONFIRMATION && $cookiePrivacyText): ?>
From cecc42fe661292dcb32bf4e5a43fe637d55365f2 Mon Sep 17 00:00:00 2001 From: Jarek Date: Fri, 7 May 2021 13:33:01 +0200 Subject: [PATCH 008/346] #77501 - Add cookie modal js --- Magento_Theme/requirejs-config.js | 1 + Magento_Theme/web/js/cookie-modal.babel.js | 111 +++++++++++++++++++++ 2 files changed, 112 insertions(+) create mode 100644 Magento_Theme/web/js/cookie-modal.babel.js diff --git a/Magento_Theme/requirejs-config.js b/Magento_Theme/requirejs-config.js index 9f2051523..4cd4e6528 100644 --- a/Magento_Theme/requirejs-config.js +++ b/Magento_Theme/requirejs-config.js @@ -15,6 +15,7 @@ var config = { "fileUpload" : "Magento_Theme/js/file-upload.babel", "marketingBar" : "Magento_Theme/js/marketing-bar.babel", "modal" : "Magento_Theme/js/modal.babel", + "cookieModal" : "Magento_Theme/js/cookie-modal.babel", "select2" : "Magento_Theme/js/lib/select2.min", "select" : "Magento_Theme/js/select.babel", "scrollTop" : "Magento_Theme/js/scroll-top.babel", diff --git a/Magento_Theme/web/js/cookie-modal.babel.js b/Magento_Theme/web/js/cookie-modal.babel.js new file mode 100644 index 000000000..108716a30 --- /dev/null +++ b/Magento_Theme/web/js/cookie-modal.babel.js @@ -0,0 +1,111 @@ +define([], function () { + 'use strict'; + + class CookieModal { // eslint-disable-line + constructor(element, config) { + this.config = config + this.modal = element + this.setListeners(); + } + + trap(e) { + if (e.which == 27) { + this.closeModal(this.modal); + } + if (e.which == 9) { + let currentFocus = document.activeElement, + totalOfFocusable = this.modal.focusableChildren.length, + focusedIndex = this.modal.focusableChildren.indexOf(currentFocus); + if (e.shiftKey) { + if (focusedIndex === 0) { + e.preventDefault(); + this.modal.focusableChildren[totalOfFocusable - 1].focus(); + } + } + else { + if (focusedIndex == totalOfFocusable - 1) { + e.preventDefault(); + this.modal.focusableChildren[0].focus(); + } + } + } + } + + modalOpenMq() { + this.modal.setAttribute('aria-hidden', false); + } + + closeOpenMq() { + this.modal.setAttribute('aria-hidden', true); + } + + openModal() { + this.modal.focused = document.activeElement; + this.modal.setAttribute('aria-hidden', false); + this.modal.classList.add(this.modal.activeClass); + this.modal.focusableChildren = Array.from(this.modal.querySelectorAll(this.modal.focusable)); + this.modal.focusableChildren[0].focus(); + this.modal.addEventListener('keydown', (e) => { + this.trap(e); + }); + } + + closeModal() { + this.modal.setAttribute('aria-hidden', true); + this.modal.classList.remove(this.modal.activeClass); + this.modal.focused.focus(); + } + setListeners() { + this.modal.content = this.modal.querySelector('.modal__content'), + this.modal.closeButton = this.modal.querySelector('.modal__close-button'), + this.modal.activeClass = 'modal--active', + this.modal.focusable = 'a[href], area[href], input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), object, embed, *[tabindex], *[contenteditable]', + this.modal.focused = ''; + + this.openModal(this.modal) + + // clicking on button (x) closes the modal + if (this.modal.closeButton) { + this.modal.closeButton.addEventListener('click', + () => this.closeModal() + ); + } + + // clicking anywhere outside of the modal closes the modal + window.addEventListener('click', (e) => { + if (e.target === this.modal + && this.modal.classList.contains(this.modal.activeClass) + && !this.modal.content.contains(e.target) + ) { + this.closeModal() + } + }); + // escape key closes the modal + window.addEventListener('keydown', (e) => { + if (e.which === 27 + && this.modal.classList.contains(this.modal.activeClass) + ) { + this.closeModal() + } + }); + + if (this.config && this.config.mqOpen) { + const mqOpenBreakpoint = window.matchMedia(this.config.mqOpen); + if (mqOpenBreakpoint.matches) { + this.modalOpenMq() + } + window.addEventListener('resize', (e) => { + if (mqOpenBreakpoint.matches) { + this.modalOpenMq(); + } else { + this.closeOpenMq(); + } + }) + } + } + } + + return function (config, element) { + new CookieModal(element, config); + }; +}); From 3be737aecf99d96dfe68ef4673e261298ff4e16c Mon Sep 17 00:00:00 2001 From: Jarek Date: Mon, 10 May 2021 15:14:32 +0200 Subject: [PATCH 009/346] Update modal styles --- Magento_Theme/web/js/cookie-bar.babel.js | 58 +++++++++++++++++++ .../Organisms/modal/_modal-variables.scss | 3 + .../components/Organisms/modal/_modal.scss | 4 ++ 3 files changed, 65 insertions(+) create mode 100644 Magento_Theme/web/js/cookie-bar.babel.js diff --git a/Magento_Theme/web/js/cookie-bar.babel.js b/Magento_Theme/web/js/cookie-bar.babel.js new file mode 100644 index 000000000..200166980 --- /dev/null +++ b/Magento_Theme/web/js/cookie-bar.babel.js @@ -0,0 +1,58 @@ +define(["Amasty_GdprCookie/js/model/cookie"], function (cookieModel) { + "use strict"; + + class CookieBar { + // eslint-disable-line + constructor(element, config) { + this.config = config; + this.cookieBar = element; + + if (this.isShowNotificationBar()) { + this.cookieBar.classList.remove('display-none') + } + + this.setListeners(); + } + + allowAllCookies() { + this.cookieBar.remove(); + + cookieModel() + .allowAllCookies() + .done( + function () { + cookieModel().triggerAllow(); + if (this.config.websiteInteraction == 1) { + cookieModel().restoreInteraction(); + } + }.bind(this) + ); + } + + isShowNotificationBar() { + return cookieModel().isShowNotificationBar( + this.config.isNotice, + this.config.websiteInteraction, + this.config.settingsLink, + this.config.firstShowProcess + ); + } + + setListeners() { + this.cookieBar.allowAllButton = this.cookieBar.querySelector( + '[data-amcookie-js="allow-all-cookies"]' + ); + + // allow all cookies + if (this.cookieBar.allowAllButton) { + this.cookieBar.allowAllButton.addEventListener("click", (e) => + this.allowAllCookies(e) + ); + } + } + } + + return function (config, element) { + new CookieBar(element, config); + }; +}); diff --git a/Snowdog_Components/components/Organisms/modal/_modal-variables.scss b/Snowdog_Components/components/Organisms/modal/_modal-variables.scss index acf499888..282be743f 100644 --- a/Snowdog_Components/components/Organisms/modal/_modal-variables.scss +++ b/Snowdog_Components/components/Organisms/modal/_modal-variables.scss @@ -28,6 +28,9 @@ $modal__container-border : none !default; $modal__container-box-shadow : $shadow !default; $modal__container-animation : animatetop 0.4s !default; +//modal cookies container +$modal__cookies-container-max-width : 1328px !default; + //modal close $modal__close-button-top : $spacer--medium !default; $modal__close-button-right : $spacer--medium !default; diff --git a/Snowdog_Components/components/Organisms/modal/_modal.scss b/Snowdog_Components/components/Organisms/modal/_modal.scss index 149d5c920..fa1894e6d 100644 --- a/Snowdog_Components/components/Organisms/modal/_modal.scss +++ b/Snowdog_Components/components/Organisms/modal/_modal.scss @@ -74,6 +74,10 @@ } } + &__cookies-container { + max-width: $modal__cookies-container-max-width; + } + &__content { display: flex; flex-direction: column; From 61a8a53ac340cdc36023f0f00ed1562d46f4251b Mon Sep 17 00:00:00 2001 From: Jarek Date: Mon, 10 May 2021 15:15:33 +0200 Subject: [PATCH 010/346] #77501 - Adjust template --- Amasty_GdprCookie/templates/cookiebar.phtml | 170 +++++++++++++------- Amasty_GdprCookie/web/js/modal-mixin.js | 8 +- 2 files changed, 117 insertions(+), 61 deletions(-) diff --git a/Amasty_GdprCookie/templates/cookiebar.phtml b/Amasty_GdprCookie/templates/cookiebar.phtml index ac1b87918..381fd379f 100644 --- a/Amasty_GdprCookie/templates/cookiebar.phtml +++ b/Amasty_GdprCookie/templates/cookiebar.phtml @@ -1,21 +1,52 @@ getCookiePolicyText(); +$cookiePrivacyTextJson = /** @noEscape */ $block->getCookiePolicyText(); $groupsJson = $block->getAllGroups(); $groups = json_decode($groupsJson, true); +$cookiePrivacyText = json_decode($cookiePrivacyTextJson, true); ?> -getNoticeType() === \Amasty\GdprCookie\Model\Config\Source\CookiePolicyBarStyle::CONFIRMATION_MODAL && $cookiePrivacyText && $groups): ?> - +getNoticeType() === \Amasty\GdprCookie\Model\Config\Source\CookiePolicyBarStyle::CONFIRMATION_MODAL && $groups): ?>
- -getField()->getValue('options_checkbox_min')); if (!empty($this->getField()->getValue('options_checkbox_min_error_text'))) $validate_message = $this->getField()->getValue('options_checkbox_min_error_text'); - ?> - - - + + + +getField()->getValue('options_checkbox_max')); if (!empty($this->getField()->getValue('options_checkbox_max_error_text'))) $validate_message = $this->getField()->getValue('options_checkbox_max_error_text'); - ?> - - -getField()->getValidationAdvice()) { ?> - - +?> + + + +getField()->getValidationAdvice()): ?> + + diff --git a/VladimirPopov_WebForms/templates/webforms/fields/select_contact.phtml b/VladimirPopov_WebForms/templates/webforms/fields/select_contact.phtml index 1691a4493..c3a7c364a 100644 --- a/VladimirPopov_WebForms/templates/webforms/fields/select_contact.phtml +++ b/VladimirPopov_WebForms/templates/webforms/fields/select_contact.phtml @@ -1,50 +1,57 @@
From de7e1b217bf2def55e6ba088a343ebda459e7301 Mon Sep 17 00:00:00 2001 From: Patryk Date: Mon, 8 Nov 2021 12:36:20 +0100 Subject: [PATCH 087/346] 83891 css margin fix --- VladimirPopov_WebForms/styles/modules/_webforms.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VladimirPopov_WebForms/styles/modules/_webforms.scss b/VladimirPopov_WebForms/styles/modules/_webforms.scss index 30af89709..52b176c1b 100644 --- a/VladimirPopov_WebForms/styles/modules/_webforms.scss +++ b/VladimirPopov_WebForms/styles/modules/_webforms.scss @@ -8,7 +8,7 @@ } .validation-advice__number { - margin: -$spacer 0 $input__margin-bottom 0; + margin: -$spacer 0 $input__margin-bottom; } } From ee8772ac4daed565e56b30b1b4362ef7bee75329 Mon Sep 17 00:00:00 2001 From: Patryk Date: Mon, 8 Nov 2021 13:08:23 +0100 Subject: [PATCH 088/346] 83891 - cr styling fixes --- .../webforms/fields/select_checkbox.phtml | 39 +++++++++---------- .../webforms/fields/select_contact.phtml | 8 ++-- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/VladimirPopov_WebForms/templates/webforms/fields/select_checkbox.phtml b/VladimirPopov_WebForms/templates/webforms/fields/select_checkbox.phtml index beb5c9d6a..88b3feb81 100644 --- a/VladimirPopov_WebForms/templates/webforms/fields/select_checkbox.phtml +++ b/VladimirPopov_WebForms/templates/webforms/fields/select_checkbox.phtml @@ -35,32 +35,32 @@ } ?>
escapeHtmlAttr($validate) ?> + escapeHtmlAttr($validate_min ) ?> + escapeHtmlAttr($validate_max ) ?> + " aria-labelledby=" escapeHtmlAttr($this->getFieldId() . $i) ?> getField()->getHideLabel()): ?> - label_escapeHtmlAttr($this->getFieldId()) ?> + label_escapeHtmlAttr($this->getFieldId()) ?> " - getField()->getCustomAttributes())?> + getField()->getCustomAttributes()) ?> /> escapeHtml($label) ?> - getField()->getTooltip($option["value"]); - if ($tooltip) { - echo $this->getLayout()->createBlock( - 'VladimirPopov\WebForms\Block\Script\Tooltip', - null + getField()->getTooltip($option["value"]); ?> + + getLayout()->createBlock( + 'VladimirPopov\WebForms\Block\Script\Tooltip', + null )->setField($this->getField())->setTooltip($tooltip)->toHtml(); - } - ?> + ?> +
@@ -103,7 +102,7 @@ $validate_message = $this->getField()->getValue('options_checkbox_min_error_text'); ?> - escapeHtmlAttr(__($viewModel->getAssistanceCheckboxTooltip())) ?> From c6a23aed185f19979d378401dd966ee2383cbef1 Mon Sep 17 00:00:00 2001 From: Patryk Date: Fri, 12 Nov 2021 12:27:12 +0100 Subject: [PATCH 094/346] #83738 - Label 'for' changed --- .../templates/shopping-assistance.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Magento_LoginAsCustomerAssistance/templates/shopping-assistance.phtml b/Magento_LoginAsCustomerAssistance/templates/shopping-assistance.phtml index cb170f164..1a1fac30c 100644 --- a/Magento_LoginAsCustomerAssistance/templates/shopping-assistance.phtml +++ b/Magento_LoginAsCustomerAssistance/templates/shopping-assistance.phtml @@ -60,7 +60,7 @@ $viewModel = $block->getViewModel();
From 4df43af72172b370add0ef0c9359688d447952f9 Mon Sep 17 00:00:00 2001 From: Dima Date: Fri, 19 Nov 2021 15:20:48 +0100 Subject: [PATCH 107/346] Adjust comments in changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2919204c7..a3bcb8898 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,13 +4,13 @@ All notable changes to this project will be documented in this file. ## [Unreleased] ### Added - In-store pickup components (#82620) +- Conditional rendering in footer.hbs (#84599) +- Missing variables in _footer.scss (#84599) ### Fixed - Display error message - phone number field (#83240) - Webform checkboxes inline style & Department select on Contact Page (#83891) - Update button in minicart always shown (#83009) - Remote shopping assistance on account creation (#83738) -- Add missing variables in _footer.scss (#84599) -- Add conditional rendering in footer.hbs (#84599) ### Changed ### Updated ### Removed From 6e77e572115618d2559c86ddc9bb90dc643ea158 Mon Sep 17 00:00:00 2001 From: Patryk Date: Mon, 22 Nov 2021 09:35:29 +0100 Subject: [PATCH 108/346] #80429 - Added conditional statements and change in for loop --- web/fotorama/fotorama.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/fotorama/fotorama.js b/web/fotorama/fotorama.js index a9e6221a1..403c6fbf4 100644 --- a/web/fotorama/fotorama.js +++ b/web/fotorama/fotorama.js @@ -3226,8 +3226,10 @@ fotoramaVersion = '4.6.4'; cancelFullScreen(); } - for (let element of fotoramaFramesCollection) { - element.style.opacity = '0' + if (fotoramaFramesCollection && fotoramaFramesCollection.length) { + for (let i = 0; i < fotoramaFramesCollection.length; i++) { + fotoramaFramesCollection[i].style.opacity = '0' + } } return this; From a0d8815794c7d96167f41d851f6bfa791c603599 Mon Sep 17 00:00:00 2001 From: Ola Date: Mon, 22 Nov 2021 11:25:23 +0100 Subject: [PATCH 109/346] Fix typos, formatting --- Snowdog_Acm/templates/content/widget/sliders/list.phtml | 2 +- .../components/Organisms/footer/_footer.scss | 8 ++++---- .../components/Organisms/mega-menu/_mega-menu.scss | 1 + .../components/Organisms/newsletter/newsletter.hbs | 2 +- Snowdog_Components/components/_checkout.scss | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Snowdog_Acm/templates/content/widget/sliders/list.phtml b/Snowdog_Acm/templates/content/widget/sliders/list.phtml index 8446f66a6..5c7df5b2a 100644 --- a/Snowdog_Acm/templates/content/widget/sliders/list.phtml +++ b/Snowdog_Acm/templates/content/widget/sliders/list.phtml @@ -26,7 +26,7 @@ $picturePrefix = $this->getPicturePrefix(); $sliderPrefix = $this->getSliderPrefix(); $wrapperClass = $this->getWrapperClass(); -// banners attrubutes to show +// banners attributes to show $sliderPrefix = $sliderPrefix ? $sliderPrefix : 'cb_slider_'; $picturePrefix = $picturePrefix ? $picturePrefix : 'cb_pic_'; $pictureData = [ diff --git a/Snowdog_Components/components/Organisms/footer/_footer.scss b/Snowdog_Components/components/Organisms/footer/_footer.scss index ad84ead91..01e226b84 100644 --- a/Snowdog_Components/components/Organisms/footer/_footer.scss +++ b/Snowdog_Components/components/Organisms/footer/_footer.scss @@ -135,7 +135,7 @@ } } - .list__item { + .list__item { @include mq($screen-m) { min-width: $footer__links-list-item-min-width\@medium; } @@ -209,7 +209,7 @@ flex-wrap: wrap; } - .list__item { + .list__item { padding: $footer__social-list__item-padding; margin: $footer__social-list__item-margin; @@ -360,7 +360,7 @@ width: auto; background-color: $footer__switcher-background-color; - .dropdown-list__label { + .dropdown-list__label { background-color: $footer__switcher-label-background-color; padding: $footer__switcher-label-padding; color: $footer__switcher-label-color; @@ -384,7 +384,7 @@ } } - .dropdown-list__content { + .dropdown-list__content { position: absolute; bottom: $footer__switcher-content-bottom; width: $footer__switcher-content-width; diff --git a/Snowdog_Components/components/Organisms/mega-menu/_mega-menu.scss b/Snowdog_Components/components/Organisms/mega-menu/_mega-menu.scss index cead18f51..4a597679b 100644 --- a/Snowdog_Components/components/Organisms/mega-menu/_mega-menu.scss +++ b/Snowdog_Components/components/Organisms/mega-menu/_mega-menu.scss @@ -232,6 +232,7 @@ &__inner-link { @extend %button-before; + position: relative; display: flex; align-items: center; diff --git a/Snowdog_Components/components/Organisms/newsletter/newsletter.hbs b/Snowdog_Components/components/Organisms/newsletter/newsletter.hbs index b59a5ffd4..ec7670d2b 100644 --- a/Snowdog_Components/components/Organisms/newsletter/newsletter.hbs +++ b/Snowdog_Components/components/Organisms/newsletter/newsletter.hbs @@ -1,7 +1,7 @@