Skip to content

Commit e2bea76

Browse files
committed
Merge branch 'ACP2E-169' of https://github.com/magento-l3/magento2ce into L3-PR-20211001
2 parents fc646eb + 04012ba commit e2bea76

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ define([
123123
isFullscreen: false,
124124
FTCF: '[data-gallery-role="fotorama__fullscreen-icon"]',
125125
Base: 0, //on check for video is base this setting become true if there is any video with base role
126-
MobileMaxWidth: 767,
126+
MobileMaxWidth: 768,
127127
GP: 'gallery-placeholder', //gallery placeholder class is needed to find and erase <script> tag
128128
videoData: null,
129129
videoDataPlaceholder: [{

app/design/frontend/Magento/blank/etc/view.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@
232232
<var name="breakpoints">
233233
<var name="mobile">
234234
<var name="conditions">
235-
<var name="max-width">767px</var>
235+
<var name="max-width">768px</var>
236236
</var>
237237
<var name="options">
238238
<var name="options">

app/design/frontend/Magento/luma/etc/view.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@
238238
<var name="breakpoints">
239239
<var name="mobile">
240240
<var name="conditions">
241-
<var name="max-width">767px</var>
241+
<var name="max-width">768px</var>
242242
</var>
243243
<var name="options">
244244
<var name="options">

lib/web/css/source/lib/_responsive.less

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727

2828
& when (@media-target = 'mobile'), (@media-target = 'all') {
2929

30-
@media only screen and (max-width: @screen__m) {
30+
@media only screen and (max-width: (@screen__m + 1)) {
3131
.media-width('max', (@screen__m + 1));
3232
}
3333

34-
@media only screen and (max-width: (@screen__m - 1)) {
34+
@media only screen and (max-width: @screen__m) {
3535
.media-width('max', @screen__m);
3636
}
3737

@@ -59,14 +59,14 @@
5959

6060
& when (@media-target = 'desktop'), (@media-target = 'all') {
6161

62-
@media all and (min-width: @screen__m),
62+
@media all and (min-width: (@screen__m + 1)),
6363
print {
64-
.media-width('min', @screen__m);
64+
.media-width('min', (@screen__m + 1));
6565
}
6666

6767
@media all and (min-width: (@screen__m + 1)),
6868
print {
69-
.media-width('min', (@screen__m + 1));
69+
.media-width('min', (@screen__m));
7070
}
7171

7272
@media all and (min-width: @screen__l),

lib/web/mage/menu.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ define([
2121
showDelay: 42,
2222
hideDelay: 300,
2323
delay: 0,
24-
mediaBreakpoint: '(max-width: 767px)'
24+
mediaBreakpoint: '(max-width: 768px)'
2525
},
2626

2727
/**

0 commit comments

Comments
 (0)