Merge branch 'master' into feature/new-design-test

This commit is contained in:
m.epshtein 2024-06-17 10:40:34 +03:00
commit b3be2765de

View file

@ -90,7 +90,6 @@
<componentRootId>829f09dd-e33f-4b1f-90ea-16994e373d7e</componentRootId> <componentRootId>829f09dd-e33f-4b1f-90ea-16994e373d7e</componentRootId>
<name>Вертикальный контейнер</name> <name>Вертикальный контейнер</name>
<container>true</container> <container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"> <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties> <properties>
@ -166,6 +165,7 @@
<componentRootId>c9898352-a317-4117-bfcc-28b5c4d9a0d1</componentRootId> <componentRootId>c9898352-a317-4117-bfcc-28b5c4d9a0d1</componentRootId>
<name>Горизонтальный контейнер</name> <name>Горизонтальный контейнер</name>
<container>true</container> <container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"> <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties> <properties>
@ -196,6 +196,15 @@
<entry> <entry>
<key>cssClasses</key> <key>cssClasses</key>
<value> <value>
<item id="e82af49b-78b1-4c4e-9c9f-7f6afb76a1a2" removed="false">
<value>
<simple>"icon-case"</simple>
</value>
</item>
<item id="633b0a83-ad8e-4b77-8de6-e168bc259852" removed="true"/>
<item id="b714e743-c151-44d6-9bb0-73128652ef6a" removed="true"/>
<item id="1d9468cf-d5b9-4a44-a93b-66d0ab93bf67" removed="true"/>
<item id="c663a654-405f-4e92-8d8d-015bc9d3f68a" removed="true"/>
<item id="9eaf8023-8bf9-4bf2-8cd9-d1a3394837dd" removed="true"/> <item id="9eaf8023-8bf9-4bf2-8cd9-d1a3394837dd" removed="true"/>
</value> </value>
</entry> </entry>
@ -230,7 +239,6 @@
<simple>"info"</simple> <simple>"info"</simple>
</value> </value>
</item> </item>
<item id="3de6c0f8-dce8-47a2-af67-bf6c345f2579" removed="true"/>
</value> </value>
</entry> </entry>
<entry> <entry>
@ -487,6 +495,11 @@
<entry> <entry>
<key>cssClasses</key> <key>cssClasses</key>
<value> <value>
<item id="7ac48cd4-1eea-490d-8102-43be37b10a0a" removed="false">
<value>
<simple>"icon-shield"</simple>
</value>
</item>
<item id="9eaf8023-8bf9-4bf2-8cd9-d1a3394837dd" removed="true"/> <item id="9eaf8023-8bf9-4bf2-8cd9-d1a3394837dd" removed="true"/>
</value> </value>
</entry> </entry>
@ -521,7 +534,6 @@
<simple>"info"</simple> <simple>"info"</simple>
</value> </value>
</item> </item>
<item id="3de6c0f8-dce8-47a2-af67-bf6c345f2579" removed="true"/>
</value> </value>
</entry> </entry>
<entry> <entry>
@ -771,6 +783,11 @@
<entry> <entry>
<key>cssClasses</key> <key>cssClasses</key>
<value> <value>
<item id="b5f755f2-1c06-4085-9fa0-2975bbaf3bb1" removed="false">
<value>
<simple>"icon-clip"</simple>
</value>
</item>
<item id="9eaf8023-8bf9-4bf2-8cd9-d1a3394837dd" removed="true"/> <item id="9eaf8023-8bf9-4bf2-8cd9-d1a3394837dd" removed="true"/>
</value> </value>
</entry> </entry>
@ -805,7 +822,6 @@
<simple>"info"</simple> <simple>"info"</simple>
</value> </value>
</item> </item>
<item id="3de6c0f8-dce8-47a2-af67-bf6c345f2579" removed="true"/>
</value> </value>
</entry> </entry>
<entry> <entry>
@ -1055,6 +1071,11 @@
<entry> <entry>
<key>cssClasses</key> <key>cssClasses</key>
<value> <value>
<item id="a51686c7-d1e3-496a-9d85-25887840de6e" removed="false">
<value>
<simple>"icon-pers"</simple>
</value>
</item>
<item id="9eaf8023-8bf9-4bf2-8cd9-d1a3394837dd" removed="true"/> <item id="9eaf8023-8bf9-4bf2-8cd9-d1a3394837dd" removed="true"/>
</value> </value>
</entry> </entry>
@ -1089,7 +1110,6 @@
<simple>"info"</simple> <simple>"info"</simple>
</value> </value>
</item> </item>
<item id="3de6c0f8-dce8-47a2-af67-bf6c345f2579" removed="true"/>
</value> </value>
</entry> </entry>
<entry> <entry>
@ -1339,6 +1359,11 @@
<entry> <entry>
<key>cssClasses</key> <key>cssClasses</key>
<value> <value>
<item id="349ccd1f-caee-4dfa-8581-bf51cbc068a9" removed="false">
<value>
<simple>"icon-building"</simple>
</value>
</item>
<item id="9eaf8023-8bf9-4bf2-8cd9-d1a3394837dd" removed="true"/> <item id="9eaf8023-8bf9-4bf2-8cd9-d1a3394837dd" removed="true"/>
</value> </value>
</entry> </entry>
@ -1373,7 +1398,6 @@
<simple>"info"</simple> <simple>"info"</simple>
</value> </value>
</item> </item>
<item id="3de6c0f8-dce8-47a2-af67-bf6c345f2579" removed="true"/>
</value> </value>
</entry> </entry>
<entry> <entry>