From e33266aa2fc92b57fdea674bbadcdd7dfe003622 Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Fri, 26 Mar 2021 17:33:23 -0400 Subject: [PATCH] fix: fix emoji popup and create community popop text color --- .../Chat/CommunityComponents/CreateCommunityPopup.qml | 1 - ui/shared/status/StatusEmojiSection.qml | 4 ++-- ui/shared/status/StatusSettingsLineButton.qml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ui/app/AppLayouts/Chat/CommunityComponents/CreateCommunityPopup.qml b/ui/app/AppLayouts/Chat/CommunityComponents/CreateCommunityPopup.qml index a958b1c20b..0fffd76f13 100644 --- a/ui/app/AppLayouts/Chat/CommunityComponents/CreateCommunityPopup.qml +++ b/ui/app/AppLayouts/Chat/CommunityComponents/CreateCommunityPopup.qml @@ -142,7 +142,6 @@ ModalPopup { anchors.top: descriptionTextArea.bottom anchors.topMargin: Style.current.smallPadding font.pixelSize: 15 - color: Style.current.secondaryText } diff --git a/ui/shared/status/StatusEmojiSection.qml b/ui/shared/status/StatusEmojiSection.qml index d6730abd61..b3cd5a517e 100644 --- a/ui/shared/status/StatusEmojiSection.qml +++ b/ui/shared/status/StatusEmojiSection.qml @@ -26,7 +26,7 @@ Item { StyledText { id: categoryText text: modelData && modelData.length ? modelData[0].category.toUpperCase() : "" - color: Style.current.darkGrey + color: Style.current.secondaryText font.pixelSize: 13 } @@ -35,7 +35,7 @@ Item { visible: !!(allEmojis && allEmojis.length && allEmojis[0].empty) //% "No recent emojis" text: qsTrId("no-recent-emojis") - color: Style.current.darkGrey + color: Style.current.secondaryText font.pixelSize: 10 anchors.top: categoryText.bottom anchors.topMargin: Style.current.smallPadding diff --git a/ui/shared/status/StatusSettingsLineButton.qml b/ui/shared/status/StatusSettingsLineButton.qml index 11823487ca..0a8687532d 100644 --- a/ui/shared/status/StatusSettingsLineButton.qml +++ b/ui/shared/status/StatusSettingsLineButton.qml @@ -33,7 +33,7 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter text: root.text font.pixelSize: 15 - color: !root.isEnabled ? Style.current.darkGrey : Style.current.textColor + color: !root.isEnabled ? Style.current.secondaryText : Style.current.textColor } StyledText {