Commit graph

7 commits

Author SHA1 Message Date
Jaime van Kessel
a825daea95 Cleanup the Theme.json
There were a lot of sizes that weren't used
2018-11-26 17:10:48 +01:00
ChrisTerBeke
60ed0ddc24
Revert "Revert "Merge branch 'fix-oauth2-client' into CURA-5785-Restyle_stage_menu""
This reverts commit 791929d689.
2018-11-20 23:49:33 +01:00
ChrisTerBeke
791929d689
Revert "Merge branch 'fix-oauth2-client' into CURA-5785-Restyle_stage_menu"
This reverts commit 4caf770a62, reversing
changes made to 0cdcd61ff2.
2018-11-20 23:47:46 +01:00
ChrisTerBeke
4caf770a62
Merge branch 'fix-oauth2-client' into CURA-5785-Restyle_stage_menu
* fix-oauth2-client:
  Switch Ultimaker Account OAuth2 client
  Fix the title's top margin size in the add machine dialog.
2018-11-20 20:48:52 +01:00
Diego Prado Gesto
18c9e9f05a Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-06 09:23:15 +01:00
Diego Prado Gesto
ef0ba81564 Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-01 09:21:33 +01:00
Diego Prado Gesto
49e96980f1 Store the dialogs in a folder called Dialogs.
Contributes to CURA-5784.
2018-10-09 17:11:01 +02:00
Renamed from resources/qml/AddMachineDialog.qml (Browse further)