Merge branch 'release/2.15.0'

SnowdogApps · Feb 25, 2021 · 18a2883 · 18a2883 · vercel · Feb 25, 2021
2 parents 07c8795 + 4172057
commit 18a2883
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [Released]
+
+## [2.15.0] - 2021-02-25
+### Updated
+- header variable & template; atomic `width-full-screen` class (#75554)
+### Fixed
+- method typo (#76074)
+
+### Added
+- handlebar `or` helper (#75554)
+
 ## [2.14.0] - 2021-02-09
 ### Updated
 - theme to Magento 2.4.2 (#75141)
@@ -18,7 +29,6 @@ All notable changes to this project will be documented in this file.
 ### Changed
 - apply code buttons to uppercase, update placeholders for gift card, add new template for gift card on commerce version (#74636)
 
-## [Released]
 ## [2.13.0] - 2021-01-21
 ### Updated
 - theme to Magento 2.4.1 (#70133)

diff --git a/Magento_Theme/templates/html/pager.phtml b/Magento_Theme/templates/html/pager.phtml
@@ -183,7 +183,7 @@
                                 href="<?= $block->escapeUrl($block->getLastPageUrl()) ?>"
                                 aria-label="<?= $block->escapeHtmlAttr(__('Page ') . $lastPageNumber) ?>"
                             >
-                                <?= $block->escpaeHtml($lastPageNumber) ?>
+                                <?= $block->escapeHtml($lastPageNumber) ?>
                             </a>
                         </li>
                     <?php endif; ?>

diff --git a/Snowdog_Components/components/Atoms/_atomic/_atomic.scss b/Snowdog_Components/components/Atoms/_atomic/_atomic.scss
@@ -517,6 +517,10 @@
     width: 100%;
 }
 
+.width-full-screen {
+    width: 100vw;
+}
+
 .width-auto {
     width: auto;
 }

diff --git a/Snowdog_Components/components/Organisms/header/_header-variables.scss b/Snowdog_Components/components/Organisms/header/_header-variables.scss
@@ -23,6 +23,8 @@ $header__search-wrapper-padding               : 0 0 0 $spacer !default;
 $header__search-wrapper-padding\@medium       : 0 24px !default;
 $header__search-wrapper-padding\@large        : 0 $spacer--medium !default;
 $header__search-wrapper-padding\@extra-large  : 0 $spacer--large !default;
+$header__search-wrapper-flex-grow             : 1 !default;
+$header__search-wrapper-flex-basis            : 50% !default;
 $header__search-wrapper-order                 : 3 !default;
 $header__search-wrapper-order\@medium         : 2 !default;
 $header__search-wrapper-max-width\@large      : 350px !default;

diff --git a/Snowdog_Components/components/Organisms/header/_header.scss b/Snowdog_Components/components/Organisms/header/_header.scss
@@ -68,7 +68,8 @@
     &__search-wrapper {
         display: flex;
         flex-flow: column nowrap;
-        flex: 1 50%;
+        flex-grow: $header__search-wrapper-flex-grow;
+        flex-basis: $header__search-wrapper-flex-basis;
         order: $header__search-wrapper-order;
         justify-content: center;
         padding: $header__search-wrapper-padding;

diff --git a/Snowdog_Components/components/Organisms/header/header.hbs b/Snowdog_Components/components/Organisms/header/header.hbs
@@ -27,7 +27,7 @@
                 </div>
             {{/if}}
 
-            {{#if buttons }}
+            {{#if (or buttons minicart) }}
                 <div class="header__buttons">
                     {{#each buttons as |item| }}
                         <a

diff --git a/Snowdog_Components/gulpfile.js b/Snowdog_Components/gulpfile.js
@@ -53,6 +53,12 @@ hbsEngine.handlebars.registerHelper('component', name => {
   return '@' + name;
 });
 
+hbsEngine.handlebars.registerHelper({
+  or() {
+    return Array.prototype.slice.call(arguments, 0, -1).some(Boolean);
+  }
+});
+
 // Gulp tasks
 const inheritance = (done) => {
   const components = fractal.components.get('path').replace(__dirname + '/build/', ''),