Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into CURA-6006-login-required

This commit is contained in:
Jaime van Kessel 2018-12-07 10:51:48 +01:00
commit ab8a2a9b2b
73 changed files with 3046 additions and 1215 deletions

View file

@ -52,7 +52,6 @@ Item
bottom: parent.bottom
right: parent.right
}
sourceSize.width: width
sourceSize.height: height
visible: installedPackages != 0
color: (installedPackages == packageCount) ? UM.Theme.getColor("primary") : UM.Theme.getColor("border")
@ -83,7 +82,7 @@ Item
width: parent.width
wrapMode: Text.WordWrap
color: UM.Theme.getColor("text_medium")
font: UM.Theme.getFont("very_small")
font: UM.Theme.getFont("default")
}
}
}