Merge branch '5.1' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2022-06-21 11:00:06 +02:00
commit 58651b6b97
2 changed files with 2 additions and 2 deletions

View file

@ -15,7 +15,7 @@ Cura.TextField
leftPadding: searchIcon.width + UM.Theme.getSize("default_margin").width * 2
placeholderText: catalog.i18nc("@placeholder", "Search")
font.italic: true
font: UM.Theme.getFont("default_italic")
UM.ColorImage
{

View file

@ -46,7 +46,7 @@ Item
topPadding: height / 4
leftPadding: searchIcon.width + UM.Theme.getSize("default_margin").width * 2
placeholderText: catalog.i18nc("@label:textbox", "Search settings")
font.italic: true
font: UM.Theme.getFont("default_italic")
property var expandedCategories
property bool lastFindingSettings: false