From 4d15ee2deff367b60d0d2f85278905b1de8a05a8 Mon Sep 17 00:00:00 2001 From: Ola Date: Fri, 10 Sep 2021 09:56:22 +0200 Subject: [PATCH 1/9] Fix logo in fractal --- Snowdog_Components/components/Molecules/logo/logo.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Snowdog_Components/components/Molecules/logo/logo.config.js b/Snowdog_Components/components/Molecules/logo/logo.config.js index 390ba1828..2a6b26f5f 100644 --- a/Snowdog_Components/components/Molecules/logo/logo.config.js +++ b/Snowdog_Components/components/Molecules/logo/logo.config.js @@ -7,7 +7,7 @@ module.exports = { imageAttributes: '', imageClass: '', imageSrcSet: '', - imageSrc: '/images/icons/logo.svg', + imageSrc: '/images/logo/logo.svg', href: '#' } }; From 36a112bfa872fdcf3f4ac6ac7b97d2c1b7f1e89b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Romaszkin?= Date: Wed, 15 Sep 2021 11:16:54 +0200 Subject: [PATCH 2/9] #80129: Fix asterix position in required checkbox --- CHANGELOG.md | 3 +++ Magento_Newsletter/templates/subscribe.phtml | 4 +--- .../components/Atoms/typography/error/_error.scss | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7df66b3a5..444b6491a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file. ## [Unreleased] ### Added ### Fixed + +- Asterix position in required checkboxes (#80129) + ### Changed ### Updated ### Removed diff --git a/Magento_Newsletter/templates/subscribe.phtml b/Magento_Newsletter/templates/subscribe.phtml index c43002bdd..d1965d990 100644 --- a/Magento_Newsletter/templates/subscribe.phtml +++ b/Magento_Newsletter/templates/subscribe.phtml @@ -88,9 +88,7 @@ for="newsletterAgreement" class="checkbox__label" > - - getChildHtml('newsletter-agreement') ?> - + getChildHtml('newsletter-agreement') ?> diff --git a/Snowdog_Components/components/Atoms/typography/error/_error.scss b/Snowdog_Components/components/Atoms/typography/error/_error.scss index 1e1487581..7c39e03b8 100644 --- a/Snowdog_Components/components/Atoms/typography/error/_error.scss +++ b/Snowdog_Components/components/Atoms/typography/error/_error.scss @@ -34,7 +34,7 @@ div { } > .checkbox__label { - & > span { + & .checkbox__text { &:first-of-type { &:after { content: ' *'; From bbdfd7fbf17ca9036471b11b8ccf85eb7417d31d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Romaszkin?= Date: Wed, 15 Sep 2021 12:06:22 +0200 Subject: [PATCH 3/9] #80129: Revert class select to match other checkboxes --- .../components/Atoms/typography/error/_error.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Snowdog_Components/components/Atoms/typography/error/_error.scss b/Snowdog_Components/components/Atoms/typography/error/_error.scss index 7c39e03b8..597597ec1 100644 --- a/Snowdog_Components/components/Atoms/typography/error/_error.scss +++ b/Snowdog_Components/components/Atoms/typography/error/_error.scss @@ -34,7 +34,7 @@ div { } > .checkbox__label { - & .checkbox__text { + & span { &:first-of-type { &:after { content: ' *'; From 0442aba33cf27d1622f5471868a1e27c7089054c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Romaszkin?= Date: Thu, 16 Sep 2021 15:09:02 +0200 Subject: [PATCH 4/9] #80129: Update selectors to match all cases for required checkbox --- .../components/Atoms/typography/error/_error.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Snowdog_Components/components/Atoms/typography/error/_error.scss b/Snowdog_Components/components/Atoms/typography/error/_error.scss index 597597ec1..4be860846 100644 --- a/Snowdog_Components/components/Atoms/typography/error/_error.scss +++ b/Snowdog_Components/components/Atoms/typography/error/_error.scss @@ -34,7 +34,8 @@ div { } > .checkbox__label { - & span { + & > span, + & .checkbox__text { &:first-of-type { &:after { content: ' *'; From 93e2dbb7ac77cd470c6fb76e311a1978266e1777 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Romaszkin?= Date: Fri, 17 Sep 2021 09:53:32 +0200 Subject: [PATCH 5/9] #80129: Fix asterix wrapping on some breakpoints --- .../components/Atoms/typography/error/_error.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Snowdog_Components/components/Atoms/typography/error/_error.scss b/Snowdog_Components/components/Atoms/typography/error/_error.scss index 4be860846..60511a40b 100644 --- a/Snowdog_Components/components/Atoms/typography/error/_error.scss +++ b/Snowdog_Components/components/Atoms/typography/error/_error.scss @@ -29,6 +29,7 @@ div { &:after { content: '*'; color: $input__required-color; + white-space: nowrap; } } } @@ -40,6 +41,7 @@ div { &:after { content: ' *'; color: $input__required-color; + white-space: nowrap; } } } From 38b955e8bf490282b6a715b8d1be7d1f6113f380 Mon Sep 17 00:00:00 2001 From: Bartek Igielski Date: Wed, 13 Oct 2021 13:29:23 +0200 Subject: [PATCH 6/9] Remove Frontools dependency from the main package --- .circleci/config.yml | 4 ++-- composer.json | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e9342cf15..60953ee1e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2.1 jobs: lint-theme: docker: - - image: circleci/php:7.1-fpm-node-browsers + - image: circleci/php:7.4-fpm-node-browsers environment: - THEME_PATH: "vendor/snowdog/theme-frontend-alpaca" - CONFIG_PATH: "vendor/snowdog/theme-frontend-alpaca/.circleci/frontools/config" @@ -12,7 +12,7 @@ jobs: - run: mkdir -p $THEME_PATH - run: rsync -r --delete . $THEME_PATH - run: cp ".circleci/composer.json" . - - run: composer update --no-dev --no-interaction --prefer-dist --no-progress --ignore-platform-reqs + - run: composer update --no-dev --no-interaction --prefer-dist --no-progress - run: mkdir -p dev/tools/frontools - run: cp -r $CONFIG_PATH dev/tools/frontools - run: cd vendor/snowdog/frontools && yarn && yarn setup diff --git a/composer.json b/composer.json index 2adbbb6a8..eb24f38b7 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,6 @@ "license": "MIT", "type": "magento2-theme", "require": { - "snowdog/frontools": "^1.11.0", "yireo/magento2-webp2": "^0.10.7" }, "autoload": { From 16fa1334e193f3c7338623f59463dd7e1fe5e04b Mon Sep 17 00:00:00 2001 From: Bartek Igielski Date: Wed, 13 Oct 2021 13:30:52 +0200 Subject: [PATCH 7/9] Remove more unwated stuff from test config --- .circleci/composer.json | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.circleci/composer.json b/.circleci/composer.json index b88cfb0bb..ac39c6ce8 100644 --- a/.circleci/composer.json +++ b/.circleci/composer.json @@ -1,14 +1,7 @@ { - "name": "snowdog/theme-frontend-alpaca", - "description": "Alpaca frontend theme for Magento 2", - "license": "MIT", - "type": "magento2-theme", + "name": "circeci-only", + "description": "for testing purpouses only", "require": { "snowdog/frontools": "^1.11.0" - }, - "autoload": { - "files": [ - "registration.php" - ] } } From a5b155a0d077696c1bd6773c45bab0d957a4b0be Mon Sep 17 00:00:00 2001 From: Bartek Igielski Date: Wed, 13 Oct 2021 13:35:47 +0200 Subject: [PATCH 8/9] Update composer.json --- .circleci/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/composer.json b/.circleci/composer.json index ac39c6ce8..9b1117c83 100644 --- a/.circleci/composer.json +++ b/.circleci/composer.json @@ -1,5 +1,5 @@ { - "name": "circeci-only", + "name": "snowdog/circeci-only", "description": "for testing purpouses only", "require": { "snowdog/frontools": "^1.11.0" From 4e04da2a1464cef2d64a3b7bf04f5c0374512790 Mon Sep 17 00:00:00 2001 From: Bartek Igielski Date: Wed, 13 Oct 2021 13:45:49 +0200 Subject: [PATCH 9/9] Version 2.24.1 --- CHANGELOG.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 444b6491a..cc53dba5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,13 +4,16 @@ All notable changes to this project will be documented in this file. ## [Unreleased] ### Added ### Fixed - -- Asterix position in required checkboxes (#80129) - ### Changed ### Updated ### Removed +## [2.24.1] - 2021-10-13 +### Changed +- Frontools dependency removed +### Fixed +- Asterix position in required checkboxes (#80129) + ## [Released] ## [2.24.0] - 2021-09-09 ### Added