Skip to content

Commit 922a999

Browse files
committed
MAGETWO-92697: Add vertical alignment to column configuration
- rename virtualType - remove width override - rename svg icon filenames
1 parent e02db13 commit 922a999

File tree

8 files changed

+7
-8
lines changed

8 files changed

+7
-8
lines changed

app/code/Magento/PageBuilder/etc/adminhtml/di.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,24 +176,24 @@
176176
</argument>
177177
</arguments>
178178
</virtualType>
179-
<virtualType name="ColumnVerticalAlignmentSource" type="Magento\PageBuilder\Model\Source\VisualSelect">
179+
<virtualType name="Magento\PageBuilder\Model\Source\ColumnVerticalAlignment" type="Magento\PageBuilder\Model\Source\VisualSelect">
180180
<arguments>
181181
<argument name="optionsSize" xsi:type="string">small</argument>
182182
<argument name="optionsData" xsi:type="array">
183183
<item name="0" xsi:type="array">
184184
<item name="value" xsi:type="string">flex-start</item>
185185
<item name="title" xsi:type="string" translate="true">Top</item>
186-
<item name="icon" xsi:type="string">Magento_PageBuilder/css/images/form/element/visual-select/vertical-align/align-top.svg</item>
186+
<item name="icon" xsi:type="string">Magento_PageBuilder/css/images/form/element/visual-select/vertical-align/top.svg</item>
187187
</item>
188188
<item name="1" xsi:type="array">
189189
<item name="value" xsi:type="string">center</item>
190190
<item name="title" xsi:type="string" translate="true">Center</item>
191-
<item name="icon" xsi:type="string">Magento_PageBuilder/css/images/form/element/visual-select/vertical-align/align-v-center.svg</item>
191+
<item name="icon" xsi:type="string">Magento_PageBuilder/css/images/form/element/visual-select/vertical-align/center.svg</item>
192192
</item>
193193
<item name="2" xsi:type="array">
194194
<item name="value" xsi:type="string">flex-end</item>
195195
<item name="title" xsi:type="string" translate="true">Bottom</item>
196-
<item name="icon" xsi:type="string">Magento_PageBuilder/css/images/form/element/visual-select/vertical-align/align-bottom.svg</item>
196+
<item name="icon" xsi:type="string">Magento_PageBuilder/css/images/form/element/visual-select/vertical-align/bottom.svg</item>
197197
</item>
198198
</argument>
199199
</arguments>

app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_column_form.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@
282282
<formElements>
283283
<select>
284284
<settings>
285-
<options class="ColumnVerticalAlignmentSource"/>
285+
<options class="Magento\PageBuilder\Model\Source\ColumnVerticalAlignment"/>
286286
</settings>
287287
</select>
288288
</formElements>

app/code/Magento/PageBuilder/view/adminhtml/web/js/master-format/style-attribute-filter.js

Lines changed: 1 addition & 1 deletion
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/template/content-type/column/full-height/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 type-container pagebuilder-column children-min-height"
99
attr="data.main.attributes"
10-
ko-style="Object.assign(data.main.style(), {width: previewData.width()})"
10+
ko-style="data.main.style"
1111
event="{ mouseover: onMouseOver, mouseout: onMouseOut }, mouseoverBubble: false"
1212
css="{'empty-container': $parent.children().length == 0}"
1313
afterRender="initColumn">

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/style-attribute-filter.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ export default class StyleAttributeFilter {
2727
"color",
2828
"display",
2929
"height",
30-
"justify_content",
3130
"min_height",
3231
"margin_bottom",
3332
"margin_left",

0 commit comments

Comments
 (0)