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

Merge remote-tracking branch 'upstream/master' into mb-infill-line-angles

Browse source
This commit is contained in:
Mark Burton 2017-01-27 15:55:43 +00:00
commit 31c1684066
39 changed files with 8897 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

6
resources/qml/Settings/SettingItem.qml
View file

@ -145,8 +145,6 @@ Item {
height: parent.height;
width: height;
backgroundColor: UM.Theme.getColor("setting_control");
hoverBackgroundColor: UM.Theme.getColor("setting_control")
color: UM.Theme.getColor("setting_control_button")
hoverColor: UM.Theme.getColor("setting_control_button")
@ -173,8 +171,6 @@ Item {
height: parent.height;
width: height;
backgroundColor: UM.Theme.getColor("setting_control");
hoverBackgroundColor: UM.Theme.getColor("setting_control_highlight")
color: UM.Theme.getColor("setting_control_button")
hoverColor: UM.Theme.getColor("setting_control_button_hover")
@ -278,8 +274,6 @@ Item {
}
}
backgroundColor: UM.Theme.getColor("setting_control");
hoverBackgroundColor: UM.Theme.getColor("setting_control_highlight")
color: UM.Theme.getColor("setting_control_button")
hoverColor: UM.Theme.getColor("setting_control_button_hover")