Skip to content
This repository has been archived by the owner on Apr 26, 2023. It is now read-only.

Commit

Permalink
Merge pull request #464 from SnowdogApps/develop
Browse files Browse the repository at this point in the history
Version 2.24.1
  • Loading branch information
Igloczek authored Oct 13, 2021
2 parents 4d281e7 + 4e04da2 commit 79b58a6
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 17 deletions.
11 changes: 2 additions & 9 deletions .circleci/composer.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
{
"name": "snowdog/theme-frontend-alpaca",
"description": "Alpaca frontend theme for Magento 2",
"license": "MIT",
"type": "magento2-theme",
"name": "snowdog/circeci-only",
"description": "for testing purpouses only",
"require": {
"snowdog/frontools": "^1.11.0"
},
"autoload": {
"files": [
"registration.php"
]
}
}
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ All notable changes to this project will be documented in this file.
### 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
Expand Down
4 changes: 1 addition & 3 deletions Magento_Newsletter/templates/subscribe.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,7 @@
for="newsletterAgreement"
class="checkbox__label"
>
<span class="checkbox__text">
<?= $block->getChildHtml('newsletter-agreement') ?>
</span>
<?= $block->getChildHtml('newsletter-agreement') ?>
</label>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,19 @@ div {
&:after {
content: '*';
color: $input__required-color;
white-space: nowrap;
}
}
}

> .checkbox__label {
& > span {
& > span,
& .checkbox__text {
&:first-of-type {
&:after {
content: ' *';
color: $input__required-color;
white-space: nowrap;
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module.exports = {
imageAttributes: '',
imageClass: '',
imageSrcSet: '',
imageSrc: '/images/icons/logo.svg',
imageSrc: '/images/logo/logo.svg',
href: '#'
}
};
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"license": "MIT",
"type": "magento2-theme",
"require": {
"snowdog/frontools": "^1.11.0",
"yireo/magento2-webp2": "^0.10.7"
},
"autoload": {
Expand Down

1 comment on commit 79b58a6

@vercel
Copy link

@vercel vercel bot commented on 79b58a6 Oct 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.