Skip to content

Commit dd198b1

Browse files
#558: Developer can style content types output differently per viewport
- remove style blocks after assigning to element - fix parallax in row widget
1 parent 1593f34 commit dd198b1

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/js/stage-builder.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/stage-builder.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ function convertToInlineStyles(document: Document): void {
5656
styles[selector].push(rule.style);
5757
});
5858
});
59+
styleBlock.remove();
5960
});
6061
}
6162
_.each(styles, (stylesArray: CSSStyleDeclaration[], selector: string) => {

app/code/Magento/PageBuilder/view/base/web/js/content-type/row/appearance/default/widget.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ define([
1111

1212
return function (config, element) {
1313
var $element = $(element),
14-
parallaxSpeed = null;
14+
parallaxSpeed = null,
15+
elementStyle = null;
1516

1617
if ($element.data('appearance') === 'contained') {
1718
$element = $(element).find('[data-element="inner"]');
@@ -31,11 +32,12 @@ define([
3132
$element.attr('data-jarallax', '');
3233

3334
parallaxSpeed = parseFloat($element.data('parallaxSpeed'));
35+
elementStyle = window.getComputedStyle($element[0]);
3436

3537
window.jarallax($element[0], {
36-
imgPosition: $element[0].style.backgroundPosition || '50% 50%',
37-
imgRepeat: $element[0].style.backgroundRepeat || 'no-repeat',
38-
imgSize: $element[0].style.backgroundSize || 'cover',
38+
imgPosition: elementStyle.backgroundPosition || '50% 50%',
39+
imgRepeat: elementStyle.backgroundRepeat || 'no-repeat',
40+
imgSize: elementStyle.backgroundSize || 'cover',
3941
speed: !isNaN(parallaxSpeed) ? parallaxSpeed : 0.5
4042
});
4143
};

0 commit comments

Comments
 (0)