Skip to content

Commit 8407e1f

Browse files
committed
MC-3870: Background does not conform to border radius for banner, image, contained row & video
Address CR feedback
1 parent 9118e6a commit 8407e1f

File tree

7 files changed

+30
-22
lines changed

7 files changed

+30
-22
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_default.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
-moz-transition: background-color 500ms ease;
1616
-o-transition: background-color 500ms ease;
1717
-webkit-transition: background-color 500ms ease;
18+
border-radius: inherit;
1819
transition: background-color 500ms ease;
1920
}
2021

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/image/_default.less

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,34 @@
1010
.pagebuilder-image {
1111
border: 1px solid transparent;
1212
width: 100%;
13+
}
1314

14-
figure {
15-
box-sizing: border-box;
16-
margin: 0;
15+
[data-role="image"] {
16+
box-sizing: border-box;
17+
margin: 0;
1718

18-
div.pagebuilder-image-empty-preview {
19-
align-items: center;
20-
background: @color-white-fog;
21-
display: flex;
22-
height: 300px;
23-
justify-content: center;
24-
width: 100%;
19+
div.pagebuilder-image-empty-preview {
20+
align-items: center;
21+
background: @color-white-fog;
22+
border-radius: inherit;
23+
display: flex;
24+
height: 300px;
25+
justify-content: center;
26+
width: 100%;
2527

26-
span {
27-
color: @color-gray65-lighten;
28-
}
28+
span {
29+
color: @color-gray65-lighten;
2930
}
31+
}
3032

31-
figcaption {
32-
padding: 15px 0;
33-
word-wrap: break-word;
34-
}
33+
figcaption {
34+
padding: 15px 0;
35+
word-wrap: break-word;
36+
}
3537

36-
.preview-image {
37-
border-radius: inherit;
38-
}
38+
.preview-image,
39+
[data-element="link"],
40+
[data-element="link"] img {
41+
border-radius: inherit;
3942
}
4043
}

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/uploader/preview/_image.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
.pagebuilder-image-uploader-container {
1616
align-items: center;
17+
border-radius: inherit;
1718
display: flex;
1819
visibility: hidden;
1920

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/video/default/master.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77

88
<div attr="data.main.attributes" ko-style="data.main.style" css="data.main.css">
9-
<div class="pagebuilder-video-wrapper" attr="data.wrapper.attributes" ko-style="data.wrapper.style" css="data.wrapper.css">
9+
<div class="pagebuilder-video-wrapper" attr="data.wrapper.attributes" ko-style="Object.assign(data.wrapper.style(), {backgroundColor: data.wrapper.style().borderColor})" css="data.wrapper.css">
1010
<div class="pagebuilder-video-container" if="data.video.attributes().src">
1111
<iframe frameborder="0" allowfullscreen attr="data.video.attributes"/>
1212
</div>

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/video/default/preview.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<div class="pagebuilder-content-type pagebuilder-video" event="{ mouseover: onMouseOver, mouseout: onMouseOut }, mouseoverBubble: false">
99
<div attr="data.main.attributes" ko-style="data.main.style" css="data.main.css">
10-
<div class="pagebuilder-video-wrapper" attr="data.wrapper.attributes" ko-style="data.wrapper.style" css="data.wrapper.css">
10+
<div class="pagebuilder-video-wrapper" attr="data.wrapper.attributes" ko-style="Object.assign(data.wrapper.style(), {backgroundColor: data.wrapper.style().borderColor})" css="data.wrapper.css">
1111
<div class="pagebuilder-video-container">
1212
<iframe frameborder="0" allowfullscreen attr="data.video.attributes"/>
1313
<i class="icon-pagebuilder-video pagebuilder-video-placeholder" ifnot="data.video.attributes().src"/>

app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_default.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
-moz-transition: background-color 500ms ease;
3434
-o-transition: background-color 500ms ease;
3535
-webkit-transition: background-color 500ms ease;
36+
border-radius: inherit;
3637
box-sizing: border-box;
3738
transition: background-color 500ms ease;
3839

app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_default.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,15 @@
2727
}
2828

2929
.pagebuilder-slide-wrapper {
30+
border-radius: inherit;
3031
box-sizing: border-box;
3132
word-break: break-all;
3233

3334
.pagebuilder-overlay {
3435
-moz-transition: background-color 500ms ease;
3536
-o-transition: background-color 500ms ease;
3637
-webkit-transition: background-color 500ms ease;
38+
border-radius: inherit;
3739
box-sizing: border-box;
3840
transition: background-color 500ms ease;
3941

0 commit comments

Comments
 (0)