mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-21 12:35:52 +03:00
Code Issues Projects Releases Packages Wiki Activity

Remove background color from Style, use palette base in its place

Browse source 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
This commit is contained in:
Claudio Cambra 2024-11-19 10:37:29 +08:00
parent 5688cc1d27
commit 6b91a7e43d
No known key found for this signature in database
GPG key ID: C839200C384636B0
6 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/ResolveConflictsDialog.qml
View file

@ -167,7 +167,7 @@ ApplicationWindow {
}
Rectangle {
color: Style.backgroundColor
color: palette.base
anchors.fill: parent
z: 1
}

2
src/gui/macOS/ui/FileProviderEvictionDialog.qml
View file

@ -31,7 +31,7 @@ ApplicationWindow {
property string accountUserIdAtHost: ""
title: qsTr("Evict materialised files")
color: Style.backgroundColor
color: palette.base
flags: Qt.Dialog | Qt.WindowStaysOnTopHint
width: 640
height: 480

2
src/gui/tray/CallNotificationDialog.qml
View file

@ -86,7 +86,7 @@ ApplicationWindow {
width: parent.width
height: contentLayout.height + (root.windowSpacing * 2)
radius: Systray.useNormalWindow ? 0.0 : Style.trayWindowRadius
color: Style.backgroundColor
color: palette.base
border.width: Style.trayWindowBorderWidth
border.color: palette.dark
clip: true

2
src/gui/tray/EditFileLocallyLoadingDialog.qml
View file

@ -30,7 +30,7 @@ ApplicationWindow {
Rectangle {
id: windowBackground
color: Style.backgroundColor
color: palette.base
radius: Style.trayWindowRadius
border.color: palette.dark
anchors.fill: parent

2
src/gui/tray/NCProgressBar.qml
View file

@ -23,7 +23,7 @@ ProgressBar {
implicitWidth: Style.progressBarWidth
implicitHeight: Style.progressBarBackgroundHeight
radius: Style.progressBarRadius
color: Style.progressBarBackgroundColor
color: palette.base
border.color: palette.dark
border.width: Style.progressBarBackgroundBorderWidth
}

2
theme/Style/Style.qml
View file

@ -15,7 +15,6 @@ QtObject {
readonly property color ncTextBrightColor: "white"
readonly property color ncSecondaryTextColor: "#808080"
readonly property color backgroundColor: Theme.systemPalette.base
readonly property color buttonBackgroundColor: Theme.systemPalette.button
readonly property color positiveColor: Qt.rgba(0.38, 0.74, 0.38, 1)
readonly property color currentUserHeaderColor: UserModel.currentUser ? UserModel.currentUser.headerColor : ncBlue
@ -191,7 +190,6 @@ QtObject {
property int progressBarContentBorderWidth: 1
property int progressBarBackgroundBorderWidth: 1
property color progressBarContentColor: ncBlue
property color progressBarBackgroundColor: backgroundColor
property int newActivitiesButtonWidth: 150
property int newActivitiesButtonHeight: 40