Skip to content

Commit bffa741

Browse files
committed
JS-372: [Full-screen mode] Left and right side of image visible while video player is loading
- Fixed close button view
1 parent 3617606 commit bffa741

File tree

4 files changed

+23
-45
lines changed

4 files changed

+23
-45
lines changed

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -227,11 +227,9 @@ define([
227227
* @private
228228
*/
229229
_hideCloseVideo: function () {
230-
$(this.element).find('.' + this.FTVC).css({
231-
opacity: 0,
232-
transform: 'translate3d(95px, -95px, 0)',
233-
display: 'none'
234-
});
230+
$(this.element)
231+
.find('.' + this.FTVC)
232+
.removeClass('fotorama-show-control');
235233
$('.' + this.FTAR).removeClass('hidden-video');
236234
},
237235

@@ -240,11 +238,9 @@ define([
240238
* @private
241239
*/
242240
_showCloseVideo: function () {
243-
$(this.element).find('.' + this.FTVC).css({
244-
opacity: 1,
245-
transform: 'translate3d(0px, 0px, 0)',
246-
display: 'block'
247-
});
241+
$(this.element)
242+
.find('.' + this.FTVC)
243+
.addClass('fotorama-show-control');
248244
$('.' + this.FTAR).addClass('hidden-video');
249245
},
250246

app/design/frontend/Magento/blank/Magento_ProductVideo/web/css/source/_module.less

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,6 @@ and (orientation : landscape) {
8080
z-index: -1 !important;
8181
}
8282

83-
.fotorama__video-close {
84-
bottom: 89%;
85-
top: auto;
86-
}
87-
8883
.fotorama__stage__shaft:focus .fotorama__stage__frame.fotorama__active:after {
8984
bottom: 0;
9085
content: '';

lib/web/mage/gallery/gallery.less

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -488,35 +488,6 @@
488488
}
489489
}
490490

491-
.fotorama__video-close {
492-
&:extend(.fotorama-sprite);
493-
background-position: -60px -9px;
494-
height: @fotorama_close_size;
495-
opacity: 0;
496-
right: 0;
497-
top: 0;
498-
width: @fotorama_close_size;
499-
z-index: 19;
500-
.fotorama__wrap--css2 & {
501-
display: none;
502-
}
503-
504-
.fotorama__wrap--css3 & {
505-
.fotorama-translate3d(@fotorama-arw-size, -@fotorama-arw-size, 0);
506-
}
507-
508-
.fotorama__wrap--video & {
509-
display: block;
510-
opacity: 1;
511-
}
512-
513-
.fotorama__wrap--css3 {
514-
&.fotorama__wrap--video & {
515-
transform: translate3d(0, 0, 0);
516-
}
517-
}
518-
}
519-
520491
.fotorama__wrap--no-controls.fotorama__wrap--toggle-arrows {
521492
.fotorama__arr,
522493
.fotorama__fullscreen-icon {
@@ -981,6 +952,22 @@
981952
}
982953
}
983954

955+
.fotorama__video-close {
956+
&:extend(.fotorama-sprite);
957+
background-position: (-@fotorama_close_button) 0;
958+
height: @fotorama_close_button;
959+
opacity: 0;
960+
right: 0;
961+
top: 0;
962+
width: @fotorama_close_button;
963+
transition: opacity 0.3s ease-in-out;
964+
transform: translate3d((@fotorama_close_button), (-@fotorama_close_button), 0);
965+
&.fotorama-show-control {
966+
opacity: 1;
967+
transform: translate3d(0, -10px, 0);
968+
}
969+
}
970+
984971
// While first time init
985972
.gallery-placeholder {
986973
.loading-mask {

lib/web/mage/gallery/module/_variables.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
@fotorama-inner-box-shadow: 3px;
1010
@fotorama-spinner-size: 64px;
1111
@fotorama-thumb-arrow: 30px;
12-
@fotorama_close_size: 30px;
12+
@fotorama_close_button: 80px;
1313
@size-fotorama-block: 80px;

0 commit comments

Comments
 (0)