Merge pull request #7725 from nextcloud/bugfix/tray-ui-colours

gui/tray: Fix colour for secondary text items being too pale
nextcloud · Jan 7, 2025 · 7f0ea06 · 7f0ea06
2 parents dd888a1 + 0daec76
commit 7f0ea06
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git 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: palette.midlight
+                    color: palette.dark
                 }
             }
         }

diff --git 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: palette.midlight
+                    color: palette.dark
                 }
 
                 FileProviderSyncStatus {

diff --git 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: palette.midlight
+        color: palette.dark
         horizontalAlignment: Text.AlignRight
     }
 

diff --git a/src/gui/tray/ActivityList.qml b/src/gui/tray/ActivityList.qml
@@ -126,7 +126,7 @@ ScrollView {
                 verticalAlignment: Image.AlignVCenter
                 horizontalAlignment: Image.AlignHCenter
                 fillMode: Image.PreserveAspectFit
-                source: "image://svgimage-custom-color/activity.svg/" + palette.midlight
+                source: "image://svgimage-custom-color/activity.svg/" + palette.dark
             }
 
             EnforcedPlainTextLabel {

diff --git a/src/gui/tray/ListItemLineAndSubline.qml b/src/gui/tray/ListItemLineAndSubline.qml
@@ -30,7 +30,7 @@ ColumnLayout {
     property int sublineFontSize: Style.unifiedSearchResultSublineFontSize
 
     property color titleColor: palette.windowText
-    property color sublineColor: palette.midlight
+    property color sublineColor: palette.dark
 
     EnforcedPlainTextLabel {
         id: title

diff --git a/src/gui/tray/NCBusyIndicator.qml b/src/gui/tray/NCBusyIndicator.qml
@@ -19,7 +19,7 @@ import Style
 BusyIndicator {
     id: root
 
-    property color color: palette.midlight
+    property color color: palette.dark
     property string imageSource: "image://svgimage-custom-color/change.svg/"
 
     property int imageSourceSizeWidth: 64

diff --git a/src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml b/src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml
@@ -26,7 +26,7 @@ ColumnLayout {
 
     property int fontSize: Style.unifiedSearchResultTitleFontSize
 
-    property string textColor: palette.midlight
+    property string textColor: palette.dark
 
     Accessible.role: Accessible.ListItem
     Accessible.name: unifiedSearchResultItemFetchMoreText.text

diff --git a/src/gui/tray/UnifiedSearchResultItem.qml b/src/gui/tray/UnifiedSearchResultItem.qml
@@ -36,7 +36,7 @@ RowLayout {
     property int sublineFontSize: Style.unifiedSearchResultSublineFontSize
 
     property color titleColor: palette.buttonText
-    property color sublineColor: palette.midlight
+    property color sublineColor: palette.dark
 
 
     Accessible.role: Accessible.ListItem