Skip to content

Commit

Permalink
Merge pull request #2551 from magento-obsessive-owls/MAGETWO-87592-st…
Browse files Browse the repository at this point in the history
…atic-test-less

Fixed issues:
- MAGETWO-87592 Static test - investigate why existing test for LESS coding styles doesn't work for PageBuilder code
  • Loading branch information
slavvka authored May 17, 2018
2 parents ec06e89 + 401abaf commit fb4294a
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 2 deletions.
1 change: 1 addition & 0 deletions app/code/Magento/Ui/etc/ui_configuration.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@
<xs:element name="checkbox" type="formElementCheckbox" maxOccurs="unbounded"/>
<xs:element name="checkboxset" type="formElementCheckboxset" maxOccurs="unbounded"/>
<xs:element name="email" type="formElementEmail" maxOccurs="unbounded"/>
<xs:element name="colorPicker" type="formElementColorPicker" maxOccurs="unbounded"/>
<xs:element name="select" type="formElementSelect" maxOccurs="unbounded"/>
<xs:element name="multiselect" type="formElementMultiselect" maxOccurs="unbounded"/>
<xs:element name="text" type="formElementText" maxOccurs="unbounded"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,19 @@
<xs:attributeGroup ref="ui_element_attributes"/>
</xs:complexType>

<xs:complexType name="formElementColorPicker">
<xs:sequence>
<xs:element name="settings" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:group ref="componentColorPickerSettings"/>
</xs:choice>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attributeGroup ref="ui_element_attributes"/>
</xs:complexType>

<xs:group name="componentColorPickerSettings">
<xs:choice>
<xs:group ref="abstractSettings"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
theme * /
library * /
# Format: <componentType=module|library|theme|language|*> <componentName> <globPattern> or simply <globPattern>
* * /

0 comments on commit fb4294a

Please sign in to comment.