Commit graph

3 commits

Author SHA1 Message Date
Diego Prado Gesto
26be65e405 Fix some other merge conflicts
Contributes to CURA-6008.
2018-12-07 13:29:16 +01:00
Diego Prado Gesto
3b8b70bddf Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-06 16:35:07 +01:00
Diego Prado Gesto
cdb8020029 Add another expandable component
Use one of them if the drop-panel has to act as a Popup and the other if it has to act as a standard component.

Contributes to CURA-5941.
2018-12-05 09:39:04 +01:00