Merge branch 'master' into CURA-8943_tool_panel_icon_size

# Conflicts:
#	resources/qml/ToolTip.qml
This commit is contained in:
j.delarago 2022-03-07 12:46:36 +01:00
commit f58411d086
28 changed files with 320 additions and 157 deletions

View file

@ -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