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.16.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
pawel-snowdog committed Mar 24, 2021
2 parents 18a2883 + ab99431 commit 35a252e
Show file tree
Hide file tree
Showing 16 changed files with 2,597 additions and 4,015 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,25 @@
All notable changes to this project will be documented in this file.

## [Unreleased]
### Added
### Updated
### Removed
### Fixed


## [Released]

## [2.16.0] - 2021-03-24
### Updated
- Fractal npm dependencies (PLEASE UPDATE IN CHILD THEMES) (#75847)
### Fixed
- jumping images on PDP (#75491) Affects: images on PDP
- Backorder product notification in minicart (#76180)
- EE - Password trigger (#76538)
- Disabled search button, styles on focus (#76537)
- remove duplicated quantity-update import
- remove php code from authentication-popup.html

## [2.15.0] - 2021-02-25
### Updated
- header variable & template; atomic `width-full-screen` class (#75554)
Expand Down
30 changes: 21 additions & 9 deletions Magento_Catalog/styles/modules/_fotorama.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
}

.fotorama__arr--disabled {
display: none !important;
display: none !important; // sass-lint:disable-line no-important
}

.fotorama__thumb__arr {
Expand Down Expand Up @@ -95,13 +95,6 @@
}
}
}

.fotorama__nav--thumbs {
padding-right: 16px;
@include mq($screen-l) {
padding-right: 0;
}
}
}

&__dot {
Expand All @@ -117,10 +110,12 @@

@include mq($screen-m) {
padding-bottom: 0;
margin-bottom: $spacer--medium;
}

@include mq($screen-l) {
margin-left: $spacer--medium;
margin-bottom: 0;
}

@include mq($screen-xl) {
Expand Down Expand Up @@ -195,13 +190,30 @@
&__wrapper {
width: 100%;

&:not(._block-content-loading) {
padding: 0 !important; // sass-lint:disable-line no-important
}

&._block-content-loading {
.fotorama__nav--dots,
.fotorama__nav--thumbs {
display: none;
}

.loader {
background-color: transparent;
}

@include mq($screen-l) {
margin-left: 100px;
margin-left: 66px;
& > *:not(.loader) {
opacity: 0;
}
}

@include mq($screen-xl) {
margin-left: 98px;
}
}
}
}
2 changes: 1 addition & 1 deletion Magento_Catalog/templates/product/view/gallery.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ $imageHeight = $block->getImageAttribute('product_page_image_medium', 'height');
"
data-gallery-role="gallery-placeholder"
data-testid="product-gallery-placeholder"
style="padding-bottom: <?= $imageHeight / $imageWidth * 100 ?>%"
>
<div
data-role="loader"
Expand All @@ -43,7 +44,6 @@ $imageHeight = $block->getImageAttribute('product_page_image_medium', 'height');
"
aria-live="polite"
aria-label="<?= $block->escapeHtmlAttr(__('Do not refresh the page')); ?>"
style="padding-bottom: <?= $imageHeight / $imageWidth * 100 ?>%"
>
<div class="loader__icon"></div>
<img
Expand Down
2 changes: 1 addition & 1 deletion Magento_Catalog/web/template/product/name.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\<div
<div
if="isAllowed()"
class="product-grid-item__name"
>
Expand Down
5 changes: 2 additions & 3 deletions Magento_Customer/web/template/authentication-popup.html
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,8 @@
fieldset__legend
fieldset__legend--hidden
"
>
<?= __('Login') ?>
</legend>
data-bind="i18n: 'Login'"
></legend>
<div
class="
input
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,7 @@ $directoryHelper = $block->getData('directoryHelper');
input__button-pass
"
aria-label="<?= $block->escapeHtmlAttr(__('Show/hide password')) ?>"
data-mage-init='{"passwordTrigger": {}}'
>
<svg
class="
Expand Down
2 changes: 1 addition & 1 deletion Smile_ElasticsuiteCore/web/js/form-mini-mixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ define([
_onPropertyChange: _.debounce(function () {
var value = this.element.val();

this.submitBtn.disabled = true;
this.submitBtn.disabled = this._isEmpty(value);

if (value.trim().length >= parseInt(this.options.minSearchLength, 10)) {
this.searchForm.addClass('processing');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ $breadcrumbs__display\@mobile : none !default;
$breadcrumbs__display-mq : $screen-l !default;
$breadcrumbs__margin : $spacer !default;
$breadcrumbs__padding : $spacer 0 !default;
$breadcrumbs__min-height : 24px !default;
$breadcrumbs__min-height : 40px !default;

$breadcrumbs__color : $color-secondary !default;
$breadcrumbs__color--active : $color-primary !default;
Expand Down
1 change: 0 additions & 1 deletion Snowdog_Components/components/Organisms/_components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
@import 'quicksearch/quicksearch';
@import 'quantity-update/quantity-update';
@import 'range/range';
@import 'quantity-update/quantity-update';
@import 'recently-viewed/recently-viewed';
@import 'review/review';
@import 'section/section';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ $gallery__thumb-dot-bg-color-active--dots : $color-primary !default;
$gallery__thumb-dot-border-radius--dots : 100% !default;
$gallery__thumb-border-active--dots : 0 !default;

$gallery__placeholder-transform : translate(calc(-50% + #{$spacer--medium}), 0) !default;
$gallery__placeholder-transform : translate(calc(-50% + #{$spacer--medium}), -50%) !default;
5 changes: 2 additions & 3 deletions Snowdog_Components/components/Organisms/gallery/_gallery.scss
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,7 @@
&__placeholder-image {
max-height: 100%;
width: auto;
// sum of fotorama__stage padding & fotorama__nav__frame height
padding-bottom: calc(#{$spacer--medium} + 30px);
padding-bottom: $spacer--medium;

@include mq($screen-m) {
padding-bottom: 0;
Expand All @@ -125,7 +124,7 @@

&.ratio-image {
@include mq($screen-l) {
top: 0;
top: 50%;
// thumbwidth + thumbmargin (fixed in fotorama.js)
padding-right: #{$gallery__thumb-width\@medium + 2px};
transform: $gallery__placeholder-transform;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,13 @@ $search-form__button-top : 1px !default;
$search-form__button-right : 0 !default;
$search-form__button-border : $border-base !default;
$search-form__button-border-width : 0 1px !default;
$search-form__button-border--focus : $color-focus-inline !default;
$search-form__button-height : 46px !default;
$search-form__button-background--disabled : none !default;
$search-form__button-icon-fill--disabled : $color-primary !default;
$search-form__button-transition : none !default;

// Checkout variant
$header__wrapper-padding--checkout : 0 !default;
$header__wrapper-padding--checkout\@medium : $spacer--medium 0 !default;

Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@
&__input {
width: 100%;
-webkit-appearance: none; // sass-lint:disable-line no-vendor-prefixes

&.focus-visible {
& + .search-form__button {
border-color: $search-form__button-border--focus;
}
}
}

&__button {
Expand All @@ -31,6 +37,7 @@
margin: $search-form__button-margin;
border: $search-form__button-border;
border-width: $search-form__button-border-width;
transition: $search-form__button-transition;

&:disabled,
&[disabled] {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.minicart-product {
display: flex;
width: 100%;
flex-flow: row nowrap;
flex-flow: row wrap;
padding: $minicart-product__padding;
border-bottom: $minicart-product__border;

Expand All @@ -26,10 +26,6 @@
flex-flow: column wrap;
flex-grow: 1;
padding: $minicart-product__data-padding;

@include mq($screen-m) {
flex-direction: row;
}
}

&__info {
Expand Down
23 changes: 12 additions & 11 deletions Snowdog_Components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,31 @@
"now-build": "gulp --ci"
},
"dependencies": {
"@frctl/fractal": "~1.2.0",
"autoprefixer": "~9.7.3",
"babel-eslint": "~10.0.3",
"@frctl/fractal": "~1.5.4",
"autoprefixer": "~10.2.4",
"babel-eslint": "~10.1.0",
"eslint-config-idiomatic": "~4.0.0",
"fs-extra": "~8.1.0",
"globby": "~10.0.1",
"fs-extra": "~9.1.0",
"globby": "~11.0.2",
"gulp": "~4.0.2",
"gulp-eslint": "~6.0.0",
"gulp-if": "~3.0.0",
"gulp-logger": "^0.0.2",
"gulp-notify": "~3.2.0",
"gulp-plumber": "~1.2.1",
"gulp-postcss": "~8.0.0",
"gulp-sass": "~4.0.2",
"gulp-postcss": "~9.0.0",
"gulp-sass": "~4.1.0",
"gulp-sass-error": "~1.0.5",
"gulp-sass-lint": "~1.4.0",
"gulp-sourcemaps": "~2.6.5",
"gulp-sourcemaps": "~3.0.0",
"gulp-svg-sprite": "~1.5.0",
"gulp-util": "~3.0.8",
"path": "~0.12.7",
"postcss-reporter": "~6.0.1",
"postcss": "^8.2.6",
"postcss-reporter": "~7.0.2",
"run-sequence": "~2.2.1",
"stylelint": "~12.0.0",
"stylelint-config-standard": "~19.0.0"
"stylelint": "~13.10.0",
"stylelint-config-standard": "~20.0.0"
},
"engines": {
"node": "12.x"
Expand Down
Loading

1 comment on commit 35a252e

@vercel
Copy link

@vercel vercel bot commented on 35a252e Mar 24, 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.