Skip to content

Commit 189c0e8

Browse files
authored
Merge branch 'develop' into 421_empty-border-radius-fix
2 parents 494b08f + bf625cc commit 189c0e8

File tree

167 files changed

+18
-8597
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+18
-8597
lines changed

app/code/Magento/PageBuilder/Model/Dom/NodeList.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function __construct(
4444
/**
4545
* @inheritDoc
4646
*/
47-
public function item($index): ?ElementInterface
47+
public function item(int $index): ?ElementInterface
4848
{
4949
return $this->objectManager->create(ElementInterface::class, [ 'element' => $this->nodeList->item($index) ]);
5050
}

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,22 @@
9191
margin: 0;
9292
}
9393

94+
.map-old-price {
95+
display: inline-block;
96+
97+
&:not(:last-child) {
98+
margin-right: @indent__s;
99+
}
100+
101+
.price-wrapper {
102+
text-decoration: line-through;
103+
}
104+
}
105+
106+
.map-fallback-price {
107+
display: none;
108+
}
109+
94110
.actions-primary {
95111
display: inline-block;
96112
max-width: 100%;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@
2121
.pagebuilder-column {
2222
background-attachment: scroll !important;
2323
flex-basis: 100%;
24+
max-width: 100%;
2425
}
2526
}

docs/breaking-changes.md

Lines changed: 0 additions & 91 deletions
This file was deleted.

docs/comp-status2.md

Lines changed: 0 additions & 59 deletions
This file was deleted.

docs/create-custom-content-type/overview.md

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)