Skip to content

Commit fb4294a

Browse files
authored
Merge pull request #2551 from magento-obsessive-owls/MAGETWO-87592-static-test-less
Fixed issues: - MAGETWO-87592 Static test - investigate why existing test for LESS coding styles doesn't work for PageBuilder code
2 parents ec06e89 + 401abaf commit fb4294a

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

app/code/Magento/Ui/etc/ui_configuration.xsd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@
219219
<xs:element name="checkbox" type="formElementCheckbox" maxOccurs="unbounded"/>
220220
<xs:element name="checkboxset" type="formElementCheckboxset" maxOccurs="unbounded"/>
221221
<xs:element name="email" type="formElementEmail" maxOccurs="unbounded"/>
222+
<xs:element name="colorPicker" type="formElementColorPicker" maxOccurs="unbounded"/>
222223
<xs:element name="select" type="formElementSelect" maxOccurs="unbounded"/>
223224
<xs:element name="multiselect" type="formElementMultiselect" maxOccurs="unbounded"/>
224225
<xs:element name="text" type="formElementText" maxOccurs="unbounded"/>

app/code/Magento/Ui/view/base/ui_component/etc/definition/colorPicker.xsd

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,19 @@
2222
<xs:attributeGroup ref="ui_element_attributes"/>
2323
</xs:complexType>
2424

25+
<xs:complexType name="formElementColorPicker">
26+
<xs:sequence>
27+
<xs:element name="settings" minOccurs="0" maxOccurs="1">
28+
<xs:complexType>
29+
<xs:choice minOccurs="0" maxOccurs="unbounded">
30+
<xs:group ref="componentColorPickerSettings"/>
31+
</xs:choice>
32+
</xs:complexType>
33+
</xs:element>
34+
</xs:sequence>
35+
<xs:attributeGroup ref="ui_element_attributes"/>
36+
</xs:complexType>
37+
2538
<xs:group name="componentColorPickerSettings">
2639
<xs:choice>
2740
<xs:group ref="abstractSettings"/>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
theme * /
2-
library * /
1+
# Format: <componentType=module|library|theme|language|*> <componentName> <globPattern> or simply <globPattern>
2+
* * /

0 commit comments

Comments
 (0)