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

Commit

Permalink
Merge branch 'release/2.26.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ofrankowska
ofrankowska committed Mar 10, 2022
2 parents 23cbe9a + a97e616 commit 94ad09f
Show file tree
Hide file tree
Showing 440 changed files with 10,263 additions and 7,283 deletions.
2 changes: 1 addition & 1 deletion .circleci/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"name": "snowdog/circeci-only",
"description": "for testing purpouses only",
"require": {
"snowdog/frontools": "^1.11.0"
"snowdog/frontools": "^1.12.0"
}
}
1 change: 1 addition & 0 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
- run: cp -r $CONFIG_PATH dev/tools/frontools
- run: cd vendor/snowdog/frontools && yarn && yarn setup
- run: cd tools && yarn inheritance
- run: cd tools && yarn eslint --ci
- run: cd tools && yarn sasslint --ci
- run: cd tools && yarn styles --ci --pipeline
- run: cd tools && yarn csslint --ci
Expand Down
7 changes: 1 addition & 6 deletions .circleci/frontools/config/themes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
"alpaca": {
"src": "vendor/snowdog/theme-frontend-alpaca",
"dest": "pub/static/frontend/Snowdog/alpaca",
"locale": ["en_US"],
"ignore": [
"**/node_modules/**",
"**/Snowdog_Components/docs/**",
"**/Snowdog_Components/build/**"
]
"locale": ["en_US"]
}
}
6 changes: 6 additions & 0 deletions .eslintignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
**/*.min.js
**/libs/**
Snowdog_Components/build/**
Snowdog_Components/dest/**
web/jquery.js
web/fotorama/**
8 changes: 4 additions & 4 deletions Amasty_Gdpr/templates/checkbox.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ if (method_exists($block, 'getConsents')):
role="presentation"
focusable="false"
>
<use href="<?= $block->escapeUrl($block->getViewFileUrl('/images/icons-sprite.svg#checked')) ?>"></use>
<use href="<?= $block->escapeUrl($block->getViewFileUrl('images/icons-sprite.svg#checked')) ?>"></use>
</svg>

<svg
Expand All @@ -61,7 +61,7 @@ if (method_exists($block, 'getConsents')):
role="presentation"
focusable="false"
>
<use href="<?= $block->escapeUrl($block->getViewFileUrl('/images/icons-sprite.svg#unchecked')) ?>"></use>
<use href="<?= $block->escapeUrl($block->getViewFileUrl('images/icons-sprite.svg#unchecked')) ?>"></use>
</svg>

<label
Expand Down Expand Up @@ -117,7 +117,7 @@ if (method_exists($block, 'getConsents')):
role="presentation"
focusable="false"
>
<use href="<?= $block->escapeUrl($block->getViewFileUrl('/images/icons-sprite.svg#checked')) ?>"></use>
<use href="<?= $block->escapeUrl($block->getViewFileUrl('images/icons-sprite.svg#checked')) ?>"></use>
</svg>

<svg
Expand All @@ -128,7 +128,7 @@ if (method_exists($block, 'getConsents')):
role="presentation"
focusable="false"
>
<use href="<?= $block->escapeUrl($block->getViewFileUrl('/images/icons-sprite.svg#unchecked')) ?>"></use>
<use href="<?= $block->escapeUrl($block->getViewFileUrl('images/icons-sprite.svg#unchecked')) ?>"></use>
</svg>

<label
Expand Down
4 changes: 2 additions & 2 deletions Amasty_Gdpr/templates/checkboxNewsletter.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
role="presentation"
focusable="false"
>
<use href="<?= $block->escapeUrl($block->getViewFileUrl('/images/icons-sprite.svg#checked')) ?>"></use>
<use href="<?= $block->escapeUrl($block->getViewFileUrl('images/icons-sprite.svg#checked')) ?>"></use>
</svg>

<svg
Expand All @@ -38,7 +38,7 @@
role="presentation"
focusable="false"
>
<use href="<?= $block->escapeUrl($block->getViewFileUrl('/images/icons-sprite.svg#unchecked')) ?>"></use>
<use href="<?= $block->escapeUrl($block->getViewFileUrl('images/icons-sprite.svg#unchecked')) ?>"></use>
</svg>

<label
Expand Down
6 changes: 3 additions & 3 deletions Amasty_Gdpr/templates/settings.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ $settings = $block->getPrivacySettings();
value="<?= $escaper->escapeHtmlAttr($block->getCurrentOderIncrementId()) ?>"
/>
<p class="policy-content">
<?= $escaper->escapeHtml($setting['content']); ?>
<?= /* @noEscape */ $setting['content'] ?>
</p>
<?php if ($setting['hasCheckbox']): ?>
<div
Expand All @@ -51,7 +51,7 @@ $settings = $block->getPrivacySettings();
role="presentation"
focusable="false"
>
<use href="<?= $escaper->escapeUrl($block->getViewFileUrl('/images/icons-sprite.svg#checked')) ?>"></use>
<use href="<?= $escaper->escapeUrl($block->getViewFileUrl('images/icons-sprite.svg#checked')) ?>"></use>
</svg>
<svg
class="
Expand All @@ -61,7 +61,7 @@ $settings = $block->getPrivacySettings();
role="presentation"
focusable="false"
>
<use href="<?= $escaper->escapeUrl($block->getViewFileUrl('/images/icons-sprite.svg#unchecked')) ?>"></use>
<use href="<?= $escaper->escapeUrl($block->getViewFileUrl('images/icons-sprite.svg#unchecked')) ?>"></use>
</svg>
<label
for="agree-<?= $escaper->escapeHtmlAttr($setting['actionCode']) ?>"
Expand Down
9 changes: 0 additions & 9 deletions Amasty_GdprCookie/requirejs-config.js
View file

This file was deleted.

2 changes: 1 addition & 1 deletion Amasty_GdprCookie/templates/amgdprcookie-styles.phtml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<link
href="<?= $this->getViewFileUrl('Amasty_GdprCookie::css/source/mkcss/amgdprcookie.min.css') ?>"
rel="stylesheet preload"
rel="stylesheet"
as="style"
/>
Loading

1 comment on commit 94ad09f

@vercel
Copy link

@vercel vercel bot commented on 94ad09f Mar 10, 2022

Choose a reason for hiding this comment

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

Successfully deployed to the following URLs:

Please sign in to comment.