Commit 1b806057 authored by Simon Redman's avatar Simon Redman Committed by LNJ

Rename all instances of "Kirigami.theme.buttonTextColor" on GUI elements which are not buttons

parent 388b44e6
Pipeline #5819 passed with stages
in 38 minutes and 19 seconds
...@@ -176,7 +176,7 @@ RowLayout { ...@@ -176,7 +176,7 @@ RowLayout {
Controls.Label { Controls.Label {
id: dateLabeltest id: dateLabeltest
text: spoilerHint == "" ? qsTr("Spoiler") : spoilerHint text: spoilerHint == "" ? qsTr("Spoiler") : spoilerHint
color: sentByMe ? Kirigami.Theme.buttonTextColor color: sentByMe ? Kirigami.Theme.textColor
: Kirigami.Theme.complementaryTextColor : Kirigami.Theme.complementaryTextColor
font.pixelSize: Kirigami.Units.gridUnit * 0.8 font.pixelSize: Kirigami.Units.gridUnit * 0.8
} }
...@@ -190,7 +190,7 @@ RowLayout { ...@@ -190,7 +190,7 @@ RowLayout {
height: 28 height: 28
width: 28 width: 28
source: isShowingSpoiler ? "password-show-off" : "password-show-on" source: isShowingSpoiler ? "password-show-off" : "password-show-on"
color: sentByMe ? Kirigami.Theme.buttonTextColor : Kirigami.Theme.complementaryTextColor color: sentByMe ? Kirigami.Theme.textColor : Kirigami.Theme.complementaryTextColor
} }
} }
Kirigami.Separator { Kirigami.Separator {
...@@ -198,7 +198,7 @@ RowLayout { ...@@ -198,7 +198,7 @@ RowLayout {
Layout.fillWidth: true Layout.fillWidth: true
color: { color: {
var bgColor = sentByMe ? Kirigami.Theme.backgroundColor : Kirigami.Theme.highlightColor var bgColor = sentByMe ? Kirigami.Theme.backgroundColor : Kirigami.Theme.highlightColor
var textColor = sentByMe ? Kirigami.Theme.textColor : Kirigami.Theme.buttonTextColor var textColor = sentByMe ? Kirigami.Theme.textColor : Kirigami.Theme.highlightedTextColor
return Qt.tint(textColor, Qt.rgba(bgColor.r, bgColor.g, bgColor.b, 0.7)) return Qt.tint(textColor, Qt.rgba(bgColor.r, bgColor.g, bgColor.b, 0.7))
} }
} }
...@@ -244,7 +244,7 @@ RowLayout { ...@@ -244,7 +244,7 @@ RowLayout {
text: kaidan.utils.formatMessage(messageBody) text: kaidan.utils.formatMessage(messageBody)
textFormat: Text.StyledText textFormat: Text.StyledText
wrapMode: Text.Wrap wrapMode: Text.Wrap
color: sentByMe ? Kirigami.Theme.buttonTextColor color: sentByMe ? Kirigami.Theme.textColor
: Kirigami.Theme.complementaryTextColor : Kirigami.Theme.complementaryTextColor
onLinkActivated: Qt.openUrlExternally(link) onLinkActivated: Qt.openUrlExternally(link)
...@@ -257,7 +257,7 @@ RowLayout { ...@@ -257,7 +257,7 @@ RowLayout {
Layout.fillWidth: true Layout.fillWidth: true
color: { color: {
var bgColor = sentByMe ? Kirigami.Theme.backgroundColor : Kirigami.Theme.highlightColor var bgColor = sentByMe ? Kirigami.Theme.backgroundColor : Kirigami.Theme.highlightColor
var textColor = sentByMe ? Kirigami.Theme.textColor : Kirigami.Theme.buttonTextColor var textColor = sentByMe ? Kirigami.Theme.textColor : Kirigami.Theme.highlightedTextColor
return Qt.tint(textColor, Qt.rgba(bgColor.r, bgColor.g, bgColor.b, 0.7)) return Qt.tint(textColor, Qt.rgba(bgColor.r, bgColor.g, bgColor.b, 0.7))
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment