Remove customization for font color from EnforcedPlainTextLabel.

Signed-off-by: Camila Ayres <hello@camilasan.com>

diff --git a/src/gui/EmojiPicker.qml b/src/gui/EmojiPicker.qml
index bf3a0dfd0610dcb3978af8cb615c58fadf0724d1..486965ebd79f7c5fba149f42443be065dde2adc7 100644 (file)
--- a/src/gui/EmojiPicker.qml
+++ b/src/gui/EmojiPicker.qml
@@ -134,7 +134,6 @@ ColumnLayout {
             width: parent.width * 0.8
             anchors.centerIn: parent
             text: qsTr("No recent emojis")
-            color: palette.midlight
             wrapMode: Text.Wrap
             font.bold: true
             visible: emojiView.count === 0

diff --git a/src/gui/UserStatusSelectorButton.qml b/src/gui/UserStatusSelectorButton.qml
index 01b499dafe1408a3f13e5619b11aff9e3bdeadc8..db622f917b5a53ee799ccbf97432d77b12686bab 100644 (file)
--- a/src/gui/UserStatusSelectorButton.qml
+++ b/src/gui/UserStatusSelectorButton.qml
@@ -71,7 +71,6 @@ AbstractButton {
 
             text: root.text
             wrapMode: Text.Wrap
-            color: root.colored ? palette.brightText : palette.buttonText
             font.bold: root.primary
         }
 
@@ -85,7 +84,6 @@ AbstractButton {
 
             text: root.secondaryText
             wrapMode: Text.Wrap
-            color: palette.midlight
             visible: root.secondaryText !== ""
         }
     }

diff --git a/src/gui/filedetails/FileDetailsPage.qml b/src/gui/filedetails/FileDetailsPage.qml
index 86b3d59d697732fcfb1b4f159ab84e53b47423e9..231d4fc9e1eff33e23e8c8965a7f9530ba020757 100644 (file)
--- a/src/gui/filedetails/FileDetailsPage.qml
+++ b/src/gui/filedetails/FileDetailsPage.qml
@@ -153,7 +153,6 @@ Page {
                 Layout.rightMargin: headerGridLayout.textRightMargin
 
                 text: `${root.fileDetails.sizeString} · ${root.fileDetails.lastChangedString}`
-                color: palette.midlight
                 wrapMode: Text.Wrap
             }
 
@@ -164,7 +163,6 @@ Page {
                 Layout.rightMargin: headerGridLayout.textRightMargin
 
                 text: root.fileDetails.lockExpireString
-                color: palette.midlight
                 wrapMode: Text.Wrap
                 visible: headerGridLayout.showFileLockedString
             }

diff --git a/src/gui/filedetails/FileTag.qml b/src/gui/filedetails/FileTag.qml
index 67903b3f8dc174d21b5dc3b513c7e78454492653..425c1024bb1d1894f55625b1044381c51fdd4e4f 100644 (file)
--- a/src/gui/filedetails/FileTag.qml
+++ b/src/gui/filedetails/FileTag.qml
@@ -27,7 +27,6 @@ EnforcedPlainTextLabel {
         color: palette.base
     }
 
-    color: palette.midlight
     elide: Text.ElideRight
     padding: Style.smallSpacing
 }

diff --git a/src/gui/filedetails/NCTabButton.qml b/src/gui/filedetails/NCTabButton.qml
index 53091974e3700c287b07648b850c732ee5c4f3eb..c06f73ff233a2fa4926af020b791eac939ffe48a 100644 (file)
--- a/src/gui/filedetails/NCTabButton.qml
+++ b/src/gui/filedetails/NCTabButton.qml
@@ -64,7 +64,6 @@ TabButton {
             Layout.fillWidth: true
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
-            color: tabButtonLayout.elementColors
             text: tabButton.text
             font.bold: tabButton.checked
         }

diff --git a/src/gui/filedetails/ShareDelegate.qml b/src/gui/filedetails/ShareDelegate.qml
index 20faca9eaa482795dcafb4135017730b33ca0df8..45838ae44db07f22342956d6847cdfd92434f417 100644 (file)
--- a/src/gui/filedetails/ShareDelegate.qml
+++ b/src/gui/filedetails/ShareDelegate.qml
@@ -140,7 +140,6 @@ GridLayout {
         Layout.column: 1
 
         text: root.detailText
-        color: palette.midlight
         elide: Text.ElideRight
         visible: text !== ""
     }

diff --git a/src/gui/filedetails/ShareDetailsPage.qml b/src/gui/filedetails/ShareDetailsPage.qml
index 8df4e60c460e8224d055101c50c32488469e2b2d..223468ee9b168a36bdb12f4b6d349f69ac5328d6 100644 (file)
--- a/src/gui/filedetails/ShareDetailsPage.qml
+++ b/src/gui/filedetails/ShareDetailsPage.qml
@@ -241,7 +241,6 @@ Page {
                 Layout.rightMargin: root.padding
 
                 text: root.fileDetails.name
-                color: palette.midlight
                 wrapMode: Text.Wrap
             }
         }

diff --git a/src/gui/filedetails/ShareView.qml b/src/gui/filedetails/ShareView.qml
index ef8500601805ca0dd739e8fb6cc007b86c1837d4..425e442800ba85966c59b0bb9424cff682aa144b 100644 (file)
--- a/src/gui/filedetails/ShareView.qml
+++ b/src/gui/filedetails/ShareView.qml
@@ -282,7 +282,6 @@ ColumnLayout {
                 id: sharingDisabledLabel
                 width: parent.width
                 text: qsTr("Sharing is disabled")
-                color: palette.midlight
                 wrapMode: Text.Wrap
                 horizontalAlignment: Text.AlignHCenter
                 verticalAlignment: Text.AlignVCenter
@@ -290,7 +289,6 @@ ColumnLayout {
             EnforcedPlainTextLabel {
                 width: parent.width
                 text: qsTr("This item cannot be shared.")
-                color: palette.midlight
                 wrapMode: Text.Wrap
                 horizontalAlignment: Text.AlignHCenter
                 verticalAlignment: Text.AlignVCenter
@@ -299,7 +297,6 @@ ColumnLayout {
             EnforcedPlainTextLabel {
                 width: parent.width
                 text: qsTr("Sharing is disabled.")
-                color: palette.midlight
                 wrapMode: Text.Wrap
                 horizontalAlignment: Text.AlignHCenter
                 verticalAlignment: Text.AlignVCenter

diff --git a/src/gui/tray/ActivityItemContent.qml b/src/gui/tray/ActivityItemContent.qml
index 00599b0b72024ffe511bda7817da0b82b5605ea4..afd7a6dbff091f2c748ed8954a51e85792ec14fe 100644 (file)
--- a/src/gui/tray/ActivityItemContent.qml
+++ b/src/gui/tray/ActivityItemContent.qml
@@ -244,7 +244,6 @@ RowLayout {
                 wrapMode: Text.Wrap
                 maximumLineCount: 2
                 font.pixelSize: Style.topLinePixelSize
-                color: palette.midlight
                 visible: text !== ""
             }
 

diff --git a/src/gui/tray/ActivityList.qml b/src/gui/tray/ActivityList.qml
index 1a97ebc026a0eab739c80f87a95dd8a7983e5481..0e57289f8644a23a4156de619d85cbbf8784557d 100644 (file)
--- a/src/gui/tray/ActivityList.qml
+++ b/src/gui/tray/ActivityList.qml
@@ -132,7 +132,6 @@ ScrollView {
             EnforcedPlainTextLabel {
                width: parent.width
                text: qsTr("No activities yet")
-               color: palette.midlight
                font.bold: true
                wrapMode: Text.Wrap
                horizontalAlignment: Text.AlignHCenter

diff --git a/src/gui/tray/CallNotificationDialog.qml b/src/gui/tray/CallNotificationDialog.qml
index 2eb297a269775bc37685c1ccb9508087ecf8c704..0ea9cb0f82736823fda56513282970959ce308a2 100644 (file)
--- a/src/gui/tray/CallNotificationDialog.qml
+++ b/src/gui/tray/CallNotificationDialog.qml
@@ -195,7 +195,6 @@ ApplicationWindow {
             EnforcedPlainTextLabel {
                 id: message
                 text: root.subject
-                color: root.usingUserAvatar ? palette.brightText : palette.windowText
                 font.pixelSize: Style.topLinePixelSize
                 wrapMode: Text.WordWrap
                 horizontalAlignment: Text.AlignHCenter

diff --git a/src/gui/tray/ListItemLineAndSubline.qml b/src/gui/tray/ListItemLineAndSubline.qml
index 56b962946df8c2f270c52519d10c273b45fb93fd..84a0f1c6a56eef07fe4550e0737ee0e9a2e921eb 100644 (file)
--- a/src/gui/tray/ListItemLineAndSubline.qml
+++ b/src/gui/tray/ListItemLineAndSubline.qml
@@ -38,7 +38,6 @@ ColumnLayout {
         text: root.lineText
         elide: Text.ElideRight
         font.pixelSize: root.titleFontSize
-        color: root.titleColor
     }
     EnforcedPlainTextLabel {
         id: subline
@@ -47,6 +46,5 @@ ColumnLayout {
         visible: text !== ""
         elide: Text.ElideRight
         font.pixelSize: root.sublineFontSize
-        color: root.sublineColor
     }
 }

diff --git a/src/gui/tray/NCToolTip.qml b/src/gui/tray/NCToolTip.qml
index c953ad7a792c501f74fb03e949604a5d39c45453..ab27a57b4eaf3aec56c15c52171b00cf70f38ea5 100644 (file)
--- a/src/gui/tray/NCToolTip.qml
+++ b/src/gui/tray/NCToolTip.qml
@@ -25,6 +25,5 @@ ToolTip {
     contentItem: EnforcedPlainTextLabel {
         text: toolTip.text
         wrapMode: Text.Wrap
-        color: palette.toolTipText
     }
 }

diff --git a/src/gui/tray/SyncStatus.qml b/src/gui/tray/SyncStatus.qml
index 7b1f20f2e191fb09ec30a6d5d14e9b5a33e09189..e8bb97518966384671742e227ef5bcbae2ae48a3 100644 (file)
--- a/src/gui/tray/SyncStatus.qml
+++ b/src/gui/tray/SyncStatus.qml
@@ -79,7 +79,6 @@ RowLayout {
 
             text: syncStatus.syncStatusDetailString
             visible: syncStatus.syncStatusDetailString !== ""
-            color: palette.midlight
             font.pixelSize: Style.subLinePixelSize
             wrapMode: Text.Wrap
         }

diff --git a/src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml b/src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml
index 152b2805a52f414a910630782f36dede5cbb6546..7a39991ccafec467d49c4d1e025dab0c15834247 100644 (file)
--- a/src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml
+++ b/src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml
@@ -45,7 +45,6 @@ ColumnLayout {
         text: qsTr("Load more results")
         wrapMode: Text.Wrap
         font.pixelSize: unifiedSearchResultItemFetchMore.fontSize
-        color: unifiedSearchResultItemFetchMore.textColor
         visible: !unifiedSearchResultItemFetchMore.isFetchMoreInProgress
     }
 

diff --git a/src/gui/tray/UnifiedSearchResultNothingFound.qml b/src/gui/tray/UnifiedSearchResultNothingFound.qml
index 79a2aee120d2f6808ff2cf730c45a722a3c3f4ff..281d20e12b137433f4c61ec556f16479ca6448ef 100644 (file)
--- a/src/gui/tray/UnifiedSearchResultNothingFound.qml
+++ b/src/gui/tray/UnifiedSearchResultNothingFound.qml
@@ -38,7 +38,6 @@ ColumnLayout {
     EnforcedPlainTextLabel {
         id: unifiedSearchResultsNoResultsLabel
         text: qsTr("No results for")
-        color: palette.dark
         font.pixelSize: Style.subLinePixelSize * 1.25
         wrapMode: Text.Wrap
         Layout.fillWidth: true

diff --git a/src/gui/tray/UnifiedSearchResultSectionItem.qml b/src/gui/tray/UnifiedSearchResultSectionItem.qml
index c9bbf151e01298a2928cc7c14b789727cb6b8274..31acaf202d2793b57d2a9d956e5eb6a4c50f8cda 100644 (file)
--- a/src/gui/tray/UnifiedSearchResultSectionItem.qml
+++ b/src/gui/tray/UnifiedSearchResultSectionItem.qml
@@ -28,7 +28,6 @@ EnforcedPlainTextLabel {
 
     text: section
     font.pixelSize: Style.unifiedSearchResultTitleFontSize
-    color: UserModel.currentUser.accentColor
 
     Accessible.role: Accessible.Separator
     Accessible.name: qsTr("Search results section %1").arg(section)

diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index 55bd53f6cf3054f0b1a72bd2e5f0524c1b3f452b..2d85816e142df84daba6e8c66f4db223d966196b 100644 (file)
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -463,7 +463,6 @@ ApplicationWindow {
                                 width: Style.currentAccountLabelWidth\r
                                 text: UserModel.currentUser ? UserModel.currentUser.name : ""\r
                                 elide: Text.ElideRight\r
-                                color: Style.currentUserHeaderTextColor\r
 \r
                                 font.pixelSize: Style.topLinePixelSize\r
                                 font.bold: true\r
@@ -475,7 +474,6 @@ ApplicationWindow {
                                 width: Style.currentAccountLabelWidth\r
                                 text: UserModel.currentUser ? UserModel.currentUser.server : ""\r
                                 elide: Text.ElideRight\r
-                                color: Style.currentUserHeaderTextColor\r
                                 visible: UserModel.numUsers() > 1\r
                             }\r
 \r
@@ -502,7 +500,6 @@ ApplicationWindow {
                                           ? UserModel.currentUser.statusMessage\r
                                           : UserModel.currentUser ? UserModel.currentUser.server : ""\r
                                     elide: Text.ElideRight\r
-                                    color: Style.currentUserHeaderTextColor\r
                                     font.pixelSize: Style.subLinePixelSize\r
                                 }\r
                             }\r