Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gui/tray: Fix colour for secondary text items being too pale #7725

Merged
merged 2 commits into from
Jan 7, 2025
Merged

gui/tray: Fix colour for secondary text items being too pale #7725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b89bd88
Replace use of midlight palette colour for secondary text with mid co…
claucambra Jan 7, 2025
0daec76
Use dark palette colour for secondary text
claucambra Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/gui/macOS/ui/FileProviderFileDelegate.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ Item {
EnforcedPlainTextLabel {
id: fileTypeLabel
text: root.fileTypeString
color: palette.midlight
color: palette.dark
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/gui/macOS/ui/FileProviderSettings.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Page {
Rectangle {
Layout.fillWidth: true
height: Style.normalBorderWidth
color: palette.midlight
color: palette.dark
}

FileProviderSyncStatus {
Expand Down
2 changes: 1 addition & 1 deletion src/gui/macOS/ui/FileProviderStorageInfo.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion src/gui/tray/ActivityList.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/gui/tray/ListItemLineAndSubline.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/gui/tray/NCBusyIndicator.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/gui/tray/UnifiedSearchResultItem.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading