File tree Expand file tree Collapse file tree 6 files changed +46
-29
lines changed
app/code/Magento/PageBuilder/view
css/source/content-type/row
js/content-type/row/appearance/default
dev/tests/static/testsuite/Magento/Test/Integrity/Xml Expand file tree Collapse file tree 6 files changed +46
-29
lines changed Original file line number Diff line number Diff line change 16
16
// Support for plugin github.com/bfred-it/object-fit-images
17
17
// _________________________________________________________________
18
18
19
- .jarallax > .jarallax-img {
20
- font-family : ' object-fit: cover;' , sans-serif ;
21
- height : 100% ;
22
- left : 0 ;
23
- object-fit : cover ;
24
- position : absolute ;
25
- top : 0 ;
26
- width : 100% ;
27
- z-index : -1 ;
19
+ .jarallax {
20
+ > .jarallax-img {
21
+ font-family : ' object-fit: cover;' , sans-serif ;
22
+ height : 100% ;
23
+ left : 0 ;
24
+ object-fit : cover ;
25
+ position : absolute ;
26
+ top : 0 ;
27
+ width : 100% ;
28
+ z-index : -1 ;
29
+ }
28
30
}
29
31
30
32
.video-overlay {
33
+ bottom : 0 ;
34
+ left : 0 ;
31
35
position : absolute ;
32
- top : 0 ; bottom : 0 ; left : 0 ; right : 0 ;
36
+ right : 0 ;
37
+ top : 0 ;
33
38
z-index : -99 ;
34
39
}
35
40
Original file line number Diff line number Diff line change @@ -166,9 +166,9 @@ define([
166
166
href = ( href || '' ) . replace ( / ^ \s + / , '' ) . replace ( / \s + $ / , '' ) ;
167
167
168
168
return validateIsUrl ( href ) && (
169
- href . match ( / y o u t u b e \. c o m | y o u t u \. b e / )
170
- || href . match ( / v i m e o \. c o m / )
171
- || href . match ( / \. ( m p 4 | o g v | w e b m ) (? ! \w ) / )
169
+ href . match ( / y o u t u b e \. c o m | y o u t u \. b e / ) ||
170
+ href . match ( / v i m e o \. c o m / ) ||
171
+ href . match ( / \. ( m p 4 | o g v | w e b m ) (? ! \w ) / )
172
172
) ;
173
173
} ,
174
174
$ . mage . __ ( 'Please enter a valid video URL.' )
Original file line number Diff line number Diff line change @@ -41,8 +41,8 @@ export default class Preview extends PreviewCollection {
41
41
// Destroy all instances of the plugin prior
42
42
try {
43
43
// store/apply correct style after destroying, as jarallax incorrectly overrides it with stale value
44
- const style = this . element . getAttribute ( "style" )
45
- || this . element . getAttribute ( "data-jarallax-original-styles" ) ;
44
+ const style = this . element . getAttribute ( "style" ) ||
45
+ this . element . getAttribute ( "data-jarallax-original-styles" ) ;
46
46
jarallax ( this . element , "destroy" ) ;
47
47
this . element . setAttribute ( "style" , style ) ;
48
48
} catch ( e ) {
Original file line number Diff line number Diff line change
1
+ // /**
2
+ // * Copyright © Magento, Inc. All rights reserved.
3
+ // * See COPYING.txt for license details.
4
+ // */
5
+
6
+ //
7
+ // Jarallax styles
8
+ // _________________________________________________________________
9
+
1
10
& when (@media-common = true ) {
2
11
.jarallax {
3
12
position : relative ;
4
13
z-index : 0 ;
5
14
}
6
15
7
- .jarallax > .jarallax-img {
8
- // Support for plugin https://github.com/bfred-it/object-fit-images
9
- font-family : ' object-fit: cover;' , sans-serif ;
10
- height : 100% ;
11
- left : 0 ;
12
- object-fit : cover ;
13
- position : absolute ;
14
- top : 0 ;
15
- width : 100% ;
16
- z-index : -1 ;
16
+ .jarallax {
17
+ & > .jarallax-img {
18
+ // Support for plugin https://github.com/bfred-it/object-fit-images
19
+ font-family : ' object-fit: cover;' , sans-serif ;
20
+ height : 100% ;
21
+ left : 0 ;
22
+ object-fit : cover ;
23
+ position : absolute ;
24
+ top : 0 ;
25
+ width : 100% ;
26
+ z-index : -1 ;
27
+ }
17
28
}
18
29
19
30
.jarallax-video-fallback {
22
33
23
34
.jarallax {
24
35
.video-overlay {
25
- position : absolute ;
26
- top : 0 ;
27
36
bottom : 0 ;
28
37
left : 0 ;
38
+ position : absolute ;
29
39
right : 0 ;
40
+ top : 0 ;
30
41
z-index : -99 ;
31
42
}
32
43
}
Original file line number Diff line number Diff line change @@ -40,7 +40,7 @@ define([
40
40
videoLoop : $element . data ( 'videoLoop' ) ,
41
41
videoPlayOnlyVisible : $element . data ( 'videoPlayOnlyVisible' ) ,
42
42
disableVideo : false
43
- }
43
+ } ;
44
44
}
45
45
46
46
jarallaxConfig = jarallaxConfig || {
Original file line number Diff line number Diff line change @@ -64,7 +64,8 @@ private function getXmlFiles(): array
64
64
'pagebuilder_column_form.xml ' => 'pagebuilder_base_form_with_background_attributes ' ,
65
65
'pagebuilder_slide_form.xml ' => 'pagebuilder_base_form_with_background_attributes ' ,
66
66
'pagebuilder_tab_item_form.xml ' => 'pagebuilder_base_form_with_background_attributes ' ,
67
- 'pagebuilder_row_form.xml ' => 'pagebuilder_base_form_with_background_attributes ' ,
67
+ 'pagebuilder_base_form_with_background_video.xml ' => 'pagebuilder_base_form_with_background_attributes ' ,
68
+ 'pagebuilder_row_form.xml ' => 'pagebuilder_base_form_with_background_video ' ,
68
69
'pagebuilder_products_carousel_form.xml ' => 'pagebuilder_products_form ' ,
69
70
];
70
71
$ componentRegistrar = new ComponentRegistrar ();
You can’t perform that action at this time.
0 commit comments