3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-04 00:01:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix merge conflicts

Browse source
This commit is contained in:
Lipu Fei 2019-03-20 16:02:19 +01:00
commit 7e176e0f2c
7 changed files with 38 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Cura.qml
View file

@ -53,7 +53,7 @@ UM.MainWindow
id: greyOutBackground
anchors.fill: parent
visible: welcomeDialog.visible
color: "black"
color: UM.Theme.getColor("window_disabled_background")
opacity: 0.7
z: stageMenu.z + 1
}