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

Merge branch '9145_fonts_look_ticker' of github.com:Ultimaker/Cura into 5.0

Browse source
This commit is contained in:
Jaime van Kessel 2022-05-10 16:24:40 +02:00
commit f05e067f39
56 changed files with 129 additions and 337 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,7 +5,7 @@ import QtQuick 2.7
import QtQuick.Layouts 1.2
import QtQuick.Controls 2.0
import UM 1.1 as UM
import UM 1.5 as UM
import Cura 1.0 as Cura
import "."
@ -135,7 +135,7 @@ Item
}
}
Label
UM.Label
{
id: label
@ -146,7 +146,6 @@ Item
text: definition.label
elide: Text.ElideMiddle
renderType: Text.NativeRendering
textFormat: Text.PlainText
color: UM.Theme.getColor("setting_control_text")