3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 13:17:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Remove superfluous theme entry.

Browse source 
It was messing with the dark side. Theme. I mean theme.
part of CURA-7627
This commit is contained in:
Remco Burema 2020-08-05 08:16:10 +02:00
parent 60dd4f411b
commit b394be3583
No known key found for this signature in database
GPG key ID: 215C49431D43F98C
5 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/MonitorStage/MonitorMain.qml
View file

@ -136,7 +136,7 @@ Rectangle
{
id: externalLinkIcon
anchors.verticalCenter: parent.verticalCenter
color: UM.Theme.getColor("monitor_text_link")
color: UM.Theme.getColor("text_link")
source: UM.Theme.getIcon("external_link")
width: UM.Theme.getSize("monitor_external_link_icon").width
height: UM.Theme.getSize("monitor_external_link_icon").height
@ -150,9 +150,8 @@ Rectangle
leftMargin: UM.Theme.getSize("narrow_margin").width
verticalCenter: externalLinkIcon.verticalCenter
}
color: UM.Theme.getColor("monitor_text_link")
color: UM.Theme.getColor("text_link")
font: UM.Theme.getFont("medium")
linkColor: UM.Theme.getColor("monitor_text_link")
text: catalog.i18nc("@label link to technical assistance", "View user manuals online")
renderType: Text.NativeRendering
}

5
plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
View file

@ -149,9 +149,8 @@ Item
{
id: managePrinterText
anchors.verticalCenter: managePrinterLink.verticalCenter
color: UM.Theme.getColor("monitor_text_link")
color: UM.Theme.getColor("text_link")
font: UM.Theme.getFont("default")
linkColor: UM.Theme.getColor("monitor_text_link")
text: catalog.i18nc("@label link to Connect and Cloud interfaces", "Manage printer")
renderType: Text.NativeRendering
}
@ -164,7 +163,7 @@ Item
leftMargin: 6 * screenScaleFactor
verticalCenter: managePrinterText.verticalCenter
}
color: UM.Theme.getColor("monitor_text_link")
color: UM.Theme.getColor("text_link")
source: UM.Theme.getIcon("external_link")
width: 12 * screenScaleFactor
height: 12 * screenScaleFactor

5
plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml
View file

@ -47,7 +47,7 @@ Item
{
id: externalLinkIcon
anchors.verticalCenter: manageQueueLabel.verticalCenter
color: UM.Theme.getColor("monitor_text_link")
color: UM.Theme.getColor("text_link")
source: UM.Theme.getIcon("external_link")
width: 16 * screenScaleFactor // TODO: Theme! (Y U NO USE 18 LIKE ALL OTHER ICONS?!)
height: 16 * screenScaleFactor // TODO: Theme! (Y U NO USE 18 LIKE ALL OTHER ICONS?!)
@ -61,9 +61,8 @@ Item
leftMargin: 6 * screenScaleFactor // TODO: Theme!
verticalCenter: externalLinkIcon.verticalCenter
}
color: UM.Theme.getColor("monitor_text_link")
color: UM.Theme.getColor("text_link")
font: UM.Theme.getFont("medium") // 14pt, regular
linkColor: UM.Theme.getColor("monitor_text_link")
text: catalog.i18nc("@label link to connect manager", "Manage in browser")
renderType: Text.NativeRendering
}

1
resources/themes/cura-dark/theme.json
View file

@ -174,7 +174,6 @@
"monitor_printer_family_tag": [86, 86, 106, 255],
"monitor_text_primary": [229, 229, 229, 255],
"monitor_text_disabled": [102, 102, 102, 255],
"monitor_text_link": [103, 160, 252, 255],
"monitor_icon_primary": [229, 229, 229, 255],
"monitor_icon_accent": [51, 53, 54, 255],
"monitor_icon_disabled": [102, 102, 102, 255],

1
resources/themes/cura-light/theme.json
View file

@ -407,7 +407,6 @@
"monitor_printer_family_tag": [228, 228, 242, 255],
"monitor_text_primary": [65, 64, 84, 255],
"monitor_text_disabled": [238, 238, 238, 255],
"monitor_text_link": [50, 130, 255, 255],
"monitor_icon_primary": [10, 8, 80, 255],
"monitor_icon_accent": [255, 255, 255, 255],
"monitor_icon_disabled": [238, 238, 238, 255],