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: Mint tokens screen uses different border colors for boxes 

plus a couple of other dark mode fixes

Fixes #11633
This commit is contained in:
Lukáš Tinkl 2023-07-25 17:25:41 +02:00 committed by Lukáš Tinkl
parent faa425dd29
commit 94c29d1e60
7 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
storybook/pages/IntroPanelPage.qml
View File

@ -23,6 +23,7 @@ SplitView {
anchors.fill: tokenPanel anchors.fill: tokenPanel
border.width: 1 border.width: 1
anchors.margins: -15 anchors.margins: -15
color: "transparent"
} }
IntroPanel { IntroPanel {

22
ui/StatusQ/src/StatusQ/Components/StatusCommunityCard.qml
View File

@ -130,17 +130,17 @@ Rectangle {
QtObject { QtObject {
id: d id: d
property int cardWidth: 335 readonly property int cardWidth: 335
property int bannerHeigth: 64 readonly property int bannerHeigth: 64
property int cardHeigth: 190 readonly property int cardHeigth: 190
property int totalHeigth: 230 readonly property int totalHeigth: 230
property int margins: 12 readonly property int margins: 12
property int bannerRadius: 20 readonly property int bannerRadius: 20
property int cardRadius: 16 readonly property int cardRadius: 16
property color cardColor: Theme.palette.indirectColor1 readonly property color cardColor: Theme.palette.name === "light" ? Theme.palette.indirectColor1 : Theme.palette.baseColor2
property color fontColor: Theme.palette.directColor1 readonly property color fontColor: Theme.palette.directColor1
property color loadingColor1: Theme.palette.baseColor5 readonly property color loadingColor1: Theme.palette.baseColor5
property color loadingColor2: Theme.palette.baseColor4 readonly property color loadingColor2: Theme.palette.baseColor4
function numberFormat(number) { function numberFormat(number) {
var res = number var res = number

17
ui/StatusQ/src/StatusQ/Controls/StatusTagItem.qml
View File

@ -6,11 +6,11 @@ import StatusQ.Core.Theme 0.1
/*! /*!
\qmltype StatusTagItem \qmltype StatusTagItem
\inherits Item \inherits Control
\inqmlmodule StatusQ.Controls \inqmlmodule StatusQ.Controls
\since StatusQ.Controls 0.1 \since StatusQ.Controls 0.1
\brief Reprsents a tag item. \brief Represents a tag item.
Inherits \l{https://doc.qt.io/qt-5/qml-qtquick-rectangle.html}{Item}. Inherits \l{https://doc.qt.io/qt-5/qml-qtquick-controls2-control.html}{Control}.
The \c StatusTagItem represents a tag item where a name and icon can be displayed and can be clicked. The \c StatusTagItem represents a tag item where a name and icon can be displayed and can be clicked.
Example: Example:
@ -54,16 +54,13 @@ Control {
QtObject { QtObject {
id: d id: d
property int tagMargins: 8 readonly property int tagMargins: 8
property int tagIconsSize: 20 readonly property int tagIconsSize: 20
function getTagColor(isReadonly) { function getTagColor(isReadonly) {
if(isReadonly) { if(isReadonly)
return Theme.palette.baseColor1 return Theme.palette.baseColor1
} return mouseArea.containsMouse ? Theme.palette.miscColor1 : Theme.palette.primaryColor1
else {
return mouseArea.containsMouse ? Theme.palette.miscColor1 : Theme.palette.primaryColor1
}
} }
} }

2
ui/app/AppLayouts/Communities/panels/IntroPanel.qml
View File

@ -35,7 +35,7 @@ Control {
background: Rectangle { background: Rectangle {
color: "transparent" color: "transparent"
radius: 16 radius: 16
border.color: Theme.palette.baseColor5 border.color: Theme.palette.baseColor2
} }
contentItem: ColumnLayout { contentItem: ColumnLayout {

1
ui/app/AppLayouts/Communities/views/EditPermissionView.qml
View File

@ -561,6 +561,7 @@ StatusScrollView {
} }
Separator { Separator {
Layout.topMargin: 24 Layout.topMargin: 24
color: Theme.palette.baseColor2
} }
HidePermissionPanel { HidePermissionPanel {

5
ui/app/AppLayouts/Onboarding/views/ProfileFetchingView.qml
View File

@ -74,7 +74,7 @@ Item {
icon: model.icon icon: model.icon
} }
Text { StatusBaseText {
id: entity id: entity
anchors.left: icon.right anchors.left: icon.right
anchors.right: indicator.visible? indicator.left : loaded.left anchors.right: indicator.visible? indicator.left : loaded.left
@ -107,7 +107,7 @@ Item {
visible: model.totalMessages === 0 visible: model.totalMessages === 0
} }
Text { StatusBaseText {
id: loaded id: loaded
anchors.right: parent.right anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -144,7 +144,6 @@ Item {
StatusButton { StatusButton {
id: button id: button
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: root.startupStore.currentStartupState.stateType === Constants.startupState.profileFetching? 80 : -1
focus: true focus: true
enabled: root.startupStore.currentStartupState.stateType !== Constants.startupState.profileFetching enabled: root.startupStore.currentStartupState.stateType !== Constants.startupState.profileFetching

2
ui/imports/shared/views/ExistingContacts.qml
View File

@ -84,7 +84,7 @@ Item {
isContact: model.isContact isContact: model.isContact
status: model.onlineStatus status: model.onlineStatus
height: visible ? implicitHeight : 0 height: visible ? implicitHeight : 0
color: sensor.containsMouse ? Style.current.backgroundHover : Style.current.transparent color: sensor.containsMouse ? Theme.palette.baseColor2 : "transparent"
nickName: model.localNickname nickName: model.localNickname
userName: ProfileUtils.displayName("", model.ensName, model.displayName, model.alias) userName: ProfileUtils.displayName("", model.ensName, model.displayName, model.alias)
asset.name: model.icon asset.name: model.icon