mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-23 22:54:01 -06:00
Merge branch 'master' into CURA-8943_tool_panel_icon_size
# Conflicts: # resources/qml/ToolTip.qml
This commit is contained in:
commit
f58411d086
28 changed files with 320 additions and 157 deletions
|
@ -69,7 +69,7 @@ ToolButton
|
|||
{
|
||||
target: background
|
||||
color: UM.Theme.getColor("setting_control")
|
||||
liningColor: UM.Theme.getColor("border_main_light")
|
||||
liningColor: UM.Theme.getColor("border_main")
|
||||
}
|
||||
},
|
||||
State
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue