Move remaining uses of secondary text color to use palette midlight, remove this...

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

diff --git a/src/gui/macOS/ui/FileProviderFileDelegate.qml b/src/gui/macOS/ui/FileProviderFileDelegate.qml
index 7f59c7e89238d5454b32444d39df65b2811d0f2e..8bfdd034a559b048c43959d6d72e1801b10832be 100644 (file)
--- a/src/gui/macOS/ui/FileProviderFileDelegate.qml
+++ b/src/gui/macOS/ui/FileProviderFileDelegate.qml
@@ -81,7 +81,7 @@ Item {
                 EnforcedPlainTextLabel {
                     id: fileTypeLabel
                     text: root.fileTypeString
-                    color: Style.ncSecondaryTextColor
+                    color: palette.midlight
                 }
             }
         }

diff --git a/src/gui/macOS/ui/FileProviderSettings.qml b/src/gui/macOS/ui/FileProviderSettings.qml
index b49288a20a18edf7a85e84484c1f9aaf1091c5a8..8b11c0322021d0c7e673e843454e25044a3bb6b9 100644 (file)
--- a/src/gui/macOS/ui/FileProviderSettings.qml
+++ b/src/gui/macOS/ui/FileProviderSettings.qml
@@ -74,7 +74,7 @@ Page {
                 Rectangle {
                     Layout.fillWidth: true
                     height: Style.normalBorderWidth
-                    color: Style.ncSecondaryTextColor
+                    color: palette.midlight
                 }
 
                 FileProviderSyncStatus {

diff --git a/src/gui/macOS/ui/FileProviderStorageInfo.qml b/src/gui/macOS/ui/FileProviderStorageInfo.qml
index b84991d2df167d9e4db74b9cd6e48efc34897af7..107f2abe536162bc0dc25371301e605fc85c2487 100644 (file)
--- a/src/gui/macOS/ui/FileProviderStorageInfo.qml
+++ b/src/gui/macOS/ui/FileProviderStorageInfo.qml
@@ -48,7 +48,7 @@ GridLayout {
         Layout.fillWidth: true
         text: qsTr("%1 GB of %2 GB remote files synced").arg(root.localUsedStorage.toFixed(2)).arg(root.remoteUsedStorage.toFixed(2));
         elide: Text.ElideRight
-        color: Style.ncSecondaryTextColor
+        color: palette.midlight
         horizontalAlignment: Text.AlignRight
     }
 

diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
index 301c42fbf40e77ddc732e0f14ecb6f34b41f9b35..3866bb82db2abba1e2abb878312134015c9d6126 100644 (file)
--- a/theme/Style/Style.qml
+++ b/theme/Style/Style.qml
@@ -13,7 +13,6 @@ QtObject {
     readonly property color ncHeaderTextColor: Theme.wizardHeaderTitleColor\r
     readonly property color ncTextColor: Theme.systemPalette.windowText\r
     readonly property color ncTextBrightColor: "white"\r
-    readonly property color ncSecondaryTextColor: "#808080"\r
     readonly property color backgroundColor: Theme.systemPalette.base\r
     readonly property color positiveColor: Qt.rgba(0.38, 0.74, 0.38, 1)\r
 \r