mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-11-26 04:11:07 -07:00
Merge branch '9145_fonts_look_ticker' of github.com:Ultimaker/Cura into 5.0
This commit is contained in:
commit
f05e067f39
56 changed files with 129 additions and 337 deletions
|
|
@ -133,7 +133,6 @@ Item
|
|||
visible: (index % 20) == 0 // Only show steps of 20%
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
y: UM.Theme.getSize("thin_margin").height
|
||||
renderType: Text.NativeRendering
|
||||
color: UM.Theme.getColor("quality_slider_available")
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
import QtQuick 2.10
|
||||
import QtQuick.Controls 2.3
|
||||
|
||||
import UM 1.2 as UM
|
||||
import UM 1.5 as UM
|
||||
import Cura 1.6 as Cura
|
||||
import ".."
|
||||
|
||||
|
|
@ -111,7 +111,7 @@ Item
|
|||
}
|
||||
height: intentCategoryLabel.height
|
||||
|
||||
Label
|
||||
UM.Label
|
||||
{
|
||||
id: intentCategoryLabel
|
||||
text: model.name
|
||||
|
|
@ -119,8 +119,6 @@ Item
|
|||
anchors.left: parent.left
|
||||
anchors.leftMargin: UM.Theme.getSize("section_icon").width + UM.Theme.getSize("narrow_margin").width
|
||||
font: UM.Theme.getFont("medium")
|
||||
color: UM.Theme.getColor("text")
|
||||
renderType: Text.NativeRendering
|
||||
elide: Text.ElideRight
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue