Merge branch 'master' of https://git.openprivacy.ca/openprivacy/opaque
This commit is contained in:
commit
dd8dde1fb3
|
@ -114,6 +114,7 @@ Item {
|
|||
size: root.size
|
||||
onClicked: emojiModel.model = folder_expressions
|
||||
}
|
||||
|
||||
ImageButton {
|
||||
visible: !root.narrowMode && !root.searchMode
|
||||
//: Activities
|
||||
|
|
|
@ -88,6 +88,8 @@ ThemeType {
|
|||
statusbarOnlineColor: mauvePurple
|
||||
statusbarOnlineFontColor: whitePurple
|
||||
|
||||
chatOverlayWarningTextColor: purple
|
||||
|
||||
messageFromMeBackgroundColor: mauvePurple
|
||||
messageFromMeTextColor: whitePurple
|
||||
messageFromOtherBackgroundColor: deepPurple
|
||||
|
|
|
@ -89,6 +89,8 @@ ThemeType {
|
|||
statusbarOnlineColor: darkPurple
|
||||
statusbarOnlineFontColor: whitePurple
|
||||
|
||||
chatOverlayWarningTextColor: purple
|
||||
|
||||
messageFromMeBackgroundColor: darkPurple
|
||||
messageFromMeTextColor: whitePurple
|
||||
messageFromOtherBackgroundColor: purple
|
||||
|
|
|
@ -79,6 +79,7 @@ Item {
|
|||
readonly property color statusbarOnlineColor: theme.statusbarOnlineColor
|
||||
readonly property color statusbarOnlineFontColor: theme.statusbarOnlineFontColor
|
||||
|
||||
readonly property color chatOverlayWarningTextColor: theme.chatOverlayWarningTextColor
|
||||
readonly property color messageFromMeBackgroundColor: theme.messageFromMeBackgroundColor
|
||||
readonly property color messageFromMeTextColor: theme.messageFromMeTextColor
|
||||
readonly property color messageFromOtherBackgroundColor: theme.messageFromOtherBackgroundColor
|
||||
|
|
|
@ -79,6 +79,7 @@ QtObject {
|
|||
property color statusbarOnlineColor: "red"
|
||||
property color statusbarOnlineFontColor: "red"
|
||||
|
||||
property color chatOverlayWarningTextColor: "red"
|
||||
property color messageFromMeBackgroundColor: "red"
|
||||
property color messageFromMeTextColor: "red"
|
||||
property color messageFromOtherBackgroundColor: "red"
|
||||
|
|
Loading…
Reference in New Issue