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

Revert "fix merge conflict"

Browse source 
This reverts commit ec03b012a7, reversing
changes made to 2af33738d1.
This commit is contained in:
Daniel Schiavini 2018-12-07 10:22:32 +01:00
parent 3ebefa4f8a
commit 4bffa6d90f
73 changed files with 1223 additions and 3054 deletions
Download patch file Download diff file Expand all files Collapse all files

8
resources/qml/ActionPanel/PrintJobInformation.qml
View file

@ -30,7 +30,7 @@ Column
{
text: catalog.i18nc("@label", "Time specification").toUpperCase()
color: UM.Theme.getColor("primary")
font: UM.Theme.getFont("default_bold")
font: UM.Theme.getFont("small")
renderType: Text.NativeRendering
}
@ -61,7 +61,7 @@ Column
}
width: parent.width - 2 * UM.Theme.getSize("default_margin").width
color: UM.Theme.getColor("text")
font: UM.Theme.getFont("default")
font: UM.Theme.getFont("very_small")
renderType: Text.NativeRendering
textFormat: Text.RichText
}
@ -79,7 +79,7 @@ Column
{
text: catalog.i18nc("@label", "Material specification").toUpperCase()
color: UM.Theme.getColor("primary")
font: UM.Theme.getFont("default_bold")
font: UM.Theme.getFont("small")
renderType: Text.NativeRendering
}
@ -151,7 +151,7 @@ Column
}
width: parent.width - 2 * UM.Theme.getSize("default_margin").width
color: UM.Theme.getColor("text")
font: UM.Theme.getFont("default")
font: UM.Theme.getFont("very_small")
renderType: Text.NativeRendering
textFormat: Text.RichText
}