Skip to content

Commit 402a236

Browse files
committed
MAGETWO-45071: Video doesn't play on ipad and iphone
1 parent 22629ab commit 402a236

File tree

2 files changed

+180
-4
lines changed

2 files changed

+180
-4
lines changed

app/design/frontend/Magento/luma/web/css/source/_theme.less

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,10 +249,6 @@
249249

250250
@gallery-thumb-border-color-active: @active__color;
251251

252-
// Modal popup
253-
@modal-action-close__font-size: @font-size__base;
254-
@modal-slide-action-close__padding: @modal-slide-header__padding-vertical @modal-popup__padding;
255-
256252
// Checkout tooltip icon
257253
@checkout-tooltip-icon__font-size: 21px;
258254

Lines changed: 180 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,180 @@
1+
// /**
2+
// * Copyright © 2015 Magento. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
//
7+
// Components -> Modals
8+
// _____________________________________________
9+
10+
//
11+
// Variables
12+
// ---------------------------------------------
13+
14+
@modal-title__color: @text__color;
15+
@modal-title__border: 1px solid @color-gray-light5;
16+
17+
@modal-popup-title__font-size: 26px;
18+
@modal-popup-title-mobile__font-size: @font-size__base;
19+
@modal-popup-breakpoint-screen__m: @screen__m + 1;
20+
21+
@modal-slide__first__indent-left: 44px;
22+
@modal-slide-mobile__background-color: @color-gray-light01;
23+
@modal-overlay__background-color: fade(@color-gray20, 55%);
24+
25+
@modal-action-close__color: @primary__color;
26+
@modal-action-close__font-size: @font-size__base;
27+
@modal-action-close__hover__color: darken(@primary__color, 10%);
28+
29+
@modal-slide-action-close__padding: @modal-slide-header__padding-vertical @modal-popup__padding;
30+
31+
//
32+
// Common
33+
// _____________________________________________
34+
35+
& when (@media-common = true) {
36+
.modal-custom,
37+
.modal-popup,
38+
.modal-slide {
39+
.action-close {
40+
.lib-button-reset();
41+
.lib-button-icon(
42+
@icon-remove,
43+
@_icon-font-color: @minicart-icons-color,
44+
@_icon-font-size: @modal-action-close__font-size,
45+
@_icon-font-line-height: @modal-action-close__font-size,
46+
@_icon-font-text-hide: true
47+
);
48+
position: absolute;
49+
right: 0;
50+
top: 0;
51+
&:hover {
52+
&:before {
53+
color: @modal-action-close__hover__color;
54+
}
55+
}
56+
}
57+
}
58+
.modal-custom {
59+
.action-close {
60+
.lib-css(margin, @indent__m);
61+
}
62+
}
63+
.modal-popup {
64+
.modal-title {
65+
.lib-css(border-bottom, @modal-title__border);
66+
.lib-css(font-weight, @font-weight__light);
67+
.lib-css(padding-bottom, @indent__s);
68+
font-size: @modal-popup-title__font-size;
69+
margin-bottom: 0;
70+
min-height: 1em;
71+
word-wrap: break-word;
72+
}
73+
.action-close {
74+
padding: @modal-popup__padding;
75+
}
76+
}
77+
78+
.modal-slide {
79+
.action-close {
80+
padding: @modal-slide-action-close__padding;
81+
}
82+
.page-main-actions {
83+
margin-top: @modal-slide-header__padding-vertical;
84+
margin-bottom: @modal-slide-header__padding-vertical - (@indent__l/2);
85+
}
86+
}
87+
88+
.modals-overlay {
89+
.lib-css(background-color, @modal-overlay__background-color);
90+
bottom: 0;
91+
left: 0;
92+
position: fixed;
93+
right: 0;
94+
top: 0;
95+
}
96+
97+
body {
98+
&._has-modal-custom {
99+
.modal-custom-overlay {
100+
height: 100vh;
101+
left: 0;
102+
position: fixed;
103+
top: 0;
104+
width: 100vw;
105+
z-index: @overlay__z-index;
106+
}
107+
}
108+
}
109+
}
110+
111+
//
112+
// Mobile
113+
// _____________________________________________
114+
115+
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
116+
.custom-slide {
117+
.lib-modal();
118+
.lib-modal-slide();
119+
&._show {
120+
-webkit-overflow-scrolling: touch;
121+
overflow-y: auto;
122+
overflow-x: hidden;
123+
}
124+
.modal-inner-wrap {
125+
.lib-css(background-color, @modal-slide-mobile__background-color);
126+
box-sizing: border-box;
127+
height: auto;
128+
min-height: 100%;
129+
}
130+
}
131+
body {
132+
&._has-modal-custom {
133+
height: 100vh;
134+
overflow: hidden;
135+
width: 100vw;
136+
.modal-custom-overlay {
137+
.lib-css(background-color, @modal-overlay__background-color);
138+
}
139+
}
140+
}
141+
}
142+
143+
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @modal-popup-breakpoint-screen__m) {
144+
.modal-popup {
145+
&.modal-slide {
146+
.modal-inner-wrap[class] {
147+
.lib-css(background-color, @modal-slide-mobile__background-color);
148+
}
149+
&._inner-scroll {
150+
&._show {
151+
-webkit-overflow-scrolling: touch;
152+
overflow-y: auto;
153+
}
154+
.modal-inner-wrap {
155+
height: auto;
156+
min-height: 100%;
157+
}
158+
}
159+
}
160+
.modal-title {
161+
.lib-css(font-size, @modal-popup-title-mobile__font-size);
162+
.lib-css(font-weight, @font-weight__bold);
163+
}
164+
}
165+
}
166+
167+
//
168+
// Desktop
169+
// _____________________________________________
170+
171+
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @modal-popup-breakpoint-screen__m) {
172+
.modal-popup {
173+
&.modal-slide {
174+
.modal-footer {
175+
.lib-css(border-top, @modal-title__border);
176+
text-align: right;
177+
}
178+
}
179+
}
180+
}

0 commit comments

Comments
 (0)