GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 04:26:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10331 from Ultimaker/CURA-8380_Align_link_style_among_OS_in_whats_new

Browse Source 
CURA-8380: Align link style among os in whats new
This commit is contained in:
Jelle Spijker 2021-08-25 13:16:50 +02:00 committed by GitHub
commit 392cca431f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml
View File

@ -8,7 +8,7 @@ import UM 1.1 as UM
Rectangle Rectangle
{ {
color: UM.Theme.getColor("secondary") color: UM.Theme.getColor("toolbox_premium_packages_background")
height: childrenRect.height height: childrenRect.height
width: parent.width width: parent.width
Column Column

2
plugins/Toolbox/resources/qml/pages/ToolboxInstalledPage.qml
View File

@ -71,6 +71,7 @@ ScrollView
padding: UM.Theme.getSize("default_margin").width padding: UM.Theme.getSize("default_margin").width
text: catalog.i18nc("@info", "No plugin has been installed.") text: catalog.i18nc("@info", "No plugin has been installed.")
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("lining")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
} }
@ -123,6 +124,7 @@ ScrollView
visible: toolbox.materialsInstalledModel.count < 1 visible: toolbox.materialsInstalledModel.count < 1
padding: UM.Theme.getSize("default_margin").width padding: UM.Theme.getSize("default_margin").width
text: catalog.i18nc("@info", "No material has been installed.") text: catalog.i18nc("@info", "No material has been installed.")
color: UM.Theme.getColor("lining")
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }

2
resources/qml/WelcomePages/WhatsNewContent.qml
View File

@ -119,7 +119,7 @@ Item
do_borders: false do_borders: false
textArea.wrapMode: TextEdit.Wrap textArea.wrapMode: TextEdit.Wrap
textArea.text: manager.getSubpageText(index) textArea.text: "<style>a:link { color: " + UM.Theme.getColor("text_link") + "; text-decoration: underline; }</style>" + manager.getSubpageText(index)
textArea.textFormat: Text.RichText textArea.textFormat: Text.RichText
textArea.readOnly: true textArea.readOnly: true
textArea.font: UM.Theme.getFont("default") textArea.font: UM.Theme.getFont("default")

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

@ -177,6 +177,7 @@
"toolbox_header_button_text_active": [255, 255, 255, 255], "toolbox_header_button_text_active": [255, 255, 255, 255],
"toolbox_header_button_text_inactive": [128, 128, 128, 255], "toolbox_header_button_text_inactive": [128, 128, 128, 255],
"toolbox_premium_packages_background": [57, 57, 57, 255],
"monitor_printer_family_tag": [86, 86, 106, 255], "monitor_printer_family_tag": [86, 86, 106, 255],
"monitor_text_disabled": [102, 102, 102, 255], "monitor_text_disabled": [102, 102, 102, 255],

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

@ -428,6 +428,7 @@
"printer_config_mismatch": [127, 127, 127, 255], "printer_config_mismatch": [127, 127, 127, 255],
"toolbox_header_button_text_inactive": [0, 0, 0, 255], "toolbox_header_button_text_inactive": [0, 0, 0, 255],
"toolbox_premium_packages_background": [240, 240, 240, 255],
"favorites_header_bar": [245, 245, 245, 255], "favorites_header_bar": [245, 245, 245, 255],
"favorites_header_hover": [245, 245, 245, 255], "favorites_header_hover": [245, 245, 245, 255],