Skip to content

Commit c3f9797

Browse files
PB-379: Full height Slider
1 parent 90fbd1f commit c3f9797

File tree

4 files changed

+15
-17
lines changed

4 files changed

+15
-17
lines changed

app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/slide.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
reader="Magento_PageBuilder/js/master-format/read/configurable">
2626
<elements>
2727
<element name="main">
28-
<style name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
28+
<style name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/min-height"/>
2929
<style name="margins" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/content-type/slide/converter/style/margins"/>
3030
<attribute name="name" source="data-content-type"/>
3131
<attribute name="slide_name" source="data-slide-name"/>
@@ -55,7 +55,7 @@
5555
<style name="border_color" source="border_color"/>
5656
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
5757
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
58-
<style name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
58+
<style name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/min-height"/>
5959
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/converter/style/paddings"/>
6060
<style name="text_align" source="text_align"/>
6161
<attribute name="background_images" source="data-background-images"/>
@@ -119,7 +119,7 @@
119119
<style name="border_color" source="border_color"/>
120120
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
121121
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
122-
<style name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
122+
<style name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/min-height"/>
123123
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/content-type/slide/converter/style/paddings"/>
124124
<style name="text_align" source="text_align"/>
125125
<attribute name="background_images" source="data-background-images"/>
@@ -183,7 +183,7 @@
183183
<style name="border_color" source="border_color"/>
184184
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
185185
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
186-
<style name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
186+
<style name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/min-height"/>
187187
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/converter/style/paddings"/>
188188
<style name="text_align" source="text_align"/>
189189
<attribute name="background_images" source="data-background-images"/>
@@ -235,7 +235,7 @@
235235
</element>
236236
<element name="empty_link"/>
237237
<element name="overlay">
238-
<style name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
238+
<style name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/min-height"/>
239239
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/content-type/slide/converter/style/paddings"/>
240240
<style name="overlay_color" source="background_color" converter="Magento_PageBuilder/js/content-type/slide/converter/style/overlay-background-color" persistence_mode="write"/>
241241
<attribute name="overlay_color_attribute" storage_key="overlay_color" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-color"/>
@@ -251,7 +251,7 @@
251251
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
252252
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
253253
<style name="text_align" source="text_align"/>
254-
<style name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
254+
<style name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/min-height"/>
255255
<attribute name="background_images" source="data-background-images"/>
256256
</element>
257257
<element name="content">

app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/slider.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<elements>
2929
<element name="main">
3030
<style name="text_align" source="text_align"/>
31-
<style name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
31+
<style name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/min-height"/>
3232
<style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
3333
<style name="border_color" source="border_color"/>
3434
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,17 @@
7979
<field name="min_height" sortOrder="30" formElement="input">
8080
<argument name="data" xsi:type="array">
8181
<item name="config" xsi:type="array">
82-
<item name="default" xsi:type="number">300</item>
82+
<item name="default" xsi:type="string">300px</item>
8383
</item>
8484
</argument>
8585
<settings>
8686
<label translate="true">Minimum Height</label>
87+
<notice translate="true">Minimum height can be a single number with any valid CSS unit (50px, 50%, 50em, 50vh) or a calculation (50% + 50px).</notice>
8788
<additionalClasses>
88-
<class name="admin__field-small">true</class>
89+
<class name="admin__field-medium">true</class>
8990
</additionalClasses>
90-
<addAfter translate="true">px</addAfter>
91-
<dataType>text</dataType>
92-
<dataScope>min_height</dataScope>
9391
<validation>
94-
<rule name="validate-number" xsi:type="boolean">true</rule>
92+
<rule name="validate-calc" xsi:type="boolean">true</rule>
9593
</validation>
9694
</settings>
9795
</field>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,17 @@
7171
<field name="min_height" sortOrder="20" formElement="input">
7272
<argument name="data" xsi:type="array">
7373
<item name="config" xsi:type="array">
74-
<item name="default" xsi:type="number">300</item>
74+
<item name="default" xsi:type="string">300px</item>
7575
</item>
7676
</argument>
7777
<settings>
7878
<label translate="true">Minimum Height</label>
79+
<notice translate="true">Minimum height can be a single number with any valid CSS unit (50px, 50%, 50em, 50vh) or a calculation (50% + 50px).</notice>
7980
<additionalClasses>
80-
<class name="admin__field-small">true</class>
81+
<class name="admin__field-medium">true</class>
8182
</additionalClasses>
82-
<addAfter translate="true">px</addAfter>
8383
<validation>
84-
<rule name="validate-number" xsi:type="boolean">true</rule>
84+
<rule name="validate-calc" xsi:type="boolean">true</rule>
8585
</validation>
8686
</settings>
8787
</field>

0 commit comments

Comments
 (0)