3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/master' into CURA-6959_collapse_categories

Browse source 
# Conflicts:
#	resources/qml/Menus/SettingVisibilityPresetsMenu.qml
#	resources/qml/Settings/SettingView.qml
This commit is contained in:
Nino van Hooff 2020-01-02 15:32:26 +01:00
commit 8dbd67f5bd
16 changed files with 313 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Settings/SettingCategory.qml
View file

@ -19,7 +19,7 @@ Button
background: Rectangle
{
id: backgroundRectangle
implicitHeight: UM.Theme.getSize("section").height
height: UM.Theme.getSize("section").height
color:
{
if (base.color)