status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(StatusSwitchTabBar): Update and unify colors of tabBar

This commit is contained in:
mishkarogachev 2022-05-05 13:24:48 +03:00 committed by Michał Cieślak
parent f52d052051
commit adbae92730
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/StatusQ/src/StatusQ/Controls/StatusSwitchTabBar.qml
View File

@ -8,7 +8,7 @@ TabBar {
background: Rectangle {
implicitHeight: 36
color: Theme.palette.directColor7
color: Theme.palette.statusSwitchTab.barBackgroundColor
radius: 8
}
}

6
ui/StatusQ/src/StatusQ/Controls/StatusSwitchTabButton.qml
View File

@ -22,7 +22,9 @@ TabButton {
StatusBaseText {
id: label
text: statusSwitchTabButton.text
color: Theme.palette.primaryColor1
color: statusSwitchTabButton.checked ?
Theme.palette.statusSwitchTab.selectedTextColor :
Theme.palette.statusSwitchTab.textColor
font.weight: Font.Medium
font.pixelSize: 15
horizontalAlignment: Text.AlignHCenter
@ -36,7 +38,7 @@ TabButton {
implicitHeight: 36
implicitWidth: 148
color: statusSwitchTabButton.checked ?
Theme.palette.statusSwitchTab.backgroundColor :
Theme.palette.statusSwitchTab.buttonBackgroundColor :
"transparent"
radius: 8
layer.enabled: true

5
ui/StatusQ/src/StatusQ/Core/Theme/StatusDarkTheme.qml
View File

@ -230,7 +230,10 @@ ThemePalette {
}
property QtObject statusSwitchTab: QtObject {
property color backgroundColor: baseColor3
property color buttonBackgroundColor: primaryColor1
property color barBackgroundColor: primaryColor3
property color selectedTextColor: white
property color textColor: primaryColor1
}
property QtObject statusSelect: QtObject {

5
ui/StatusQ/src/StatusQ/Core/Theme/StatusLightTheme.qml
View File

@ -228,7 +228,10 @@ ThemePalette {
}
property QtObject statusSwitchTab: QtObject {
property color backgroundColor: white
property color buttonBackgroundColor: primaryColor1
property color barBackgroundColor: primaryColor3
property color selectedTextColor: white
property color textColor: primaryColor1
}
property QtObject statusSelect: QtObject {

7
ui/StatusQ/src/StatusQ/Core/Theme/ThemePalette.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.13
QtObject {
id: theme
property string name
@ -156,7 +156,10 @@ QtObject {
}
property QtObject statusSwitchTab: QtObject {
property color backgroundColor
property color buttonBackgroundColor
property color barBackgroundColor
property color selectedTextColor
property color textColor
}
property QtObject statusSelect: QtObject {