diff options
| author | Remco Burema <r.burema@ultimaker.com> | 2020-08-05 09:17:10 +0300 |
|---|---|---|
| committer | Remco Burema <r.burema@ultimaker.com> | 2020-08-05 09:17:10 +0300 |
| commit | deec6506689a8e4bee9c96efc41a1c1595b34ba1 (patch) | |
| tree | ac7f1ff1ce8fafd0f68a2ff1c712efccd7156131 /plugins | |
| parent | 96e631bfda9dc18ddec376e7bf1de9c90bac9ff4 (diff) | |
| parent | b394be35834d4f550ad87ef8ec41f24557822f75 (diff) | |
Merge branch '4.7'
Diffstat (limited to 'plugins')
4 files changed, 8 insertions, 9 deletions
diff --git a/plugins/MonitorStage/MonitorMain.qml b/plugins/MonitorStage/MonitorMain.qml index a70c10ff0f..b24ed4ce1b 100644 --- a/plugins/MonitorStage/MonitorMain.qml +++ b/plugins/MonitorStage/MonitorMain.qml @@ -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 } diff --git a/plugins/Toolbox/resources/qml/pages/ToolboxAuthorPage.qml b/plugins/Toolbox/resources/qml/pages/ToolboxAuthorPage.qml index 74305fb4bd..2fa4224388 100644 --- a/plugins/Toolbox/resources/qml/pages/ToolboxAuthorPage.qml +++ b/plugins/Toolbox/resources/qml/pages/ToolboxAuthorPage.qml @@ -58,6 +58,7 @@ Item } text: details && details.name ? details.name : "" font: UM.Theme.getFont("large_bold") + color: UM.Theme.getColor("text_medium") wrapMode: Text.WordWrap width: parent.width height: UM.Theme.getSize("toolbox_property_label").height @@ -68,6 +69,7 @@ Item id: description text: details && details.description ? details.description : "" font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text_medium") anchors { top: title.bottom diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml index 9242abacdd..da2acc8cf7 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml @@ -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 diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml index ce692168c3..f5122dc685 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml @@ -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 } |