Skip to content
Snippets Groups Projects
Verified Commit 057e1f5c authored by Nicolas Werner's avatar Nicolas Werner
Browse files

Fix reply and topic colors

parent c793506d
No related branches found
No related tags found
No related merge requests found
Pipeline #5139 passed
...@@ -31,7 +31,7 @@ EventDelegateChooser { ...@@ -31,7 +31,7 @@ EventDelegateChooser {
Layout.fillWidth: true Layout.fillWidth: true
//Layout.maximumWidth: implicitWidth //Layout.maximumWidth: implicitWidth
color: type == MtxEvent.NoticeMessage ? palette.buttonText : palette.text color: type == MtxEvent.NoticeMessage ? palette.active.buttonText : palette.active.text
font.italic: type == MtxEvent.NoticeMessage font.italic: type == MtxEvent.NoticeMessage
formatted: formattedBody formatted: formattedBody
keepFullText: true keepFullText: true
...@@ -48,7 +48,7 @@ EventDelegateChooser { ...@@ -48,7 +48,7 @@ EventDelegateChooser {
Layout.fillWidth: true Layout.fillWidth: true
//Layout.maximumWidth: implicitWidth //Layout.maximumWidth: implicitWidth
color: TimelineManager.userColor(userId, palette.base) color: TimelineManager.userColor(userId, palette.active.base)
font.italic: true font.italic: true
formatted: TimelineManager.escapeEmoji(userName) + " " + formattedBody formatted: TimelineManager.escapeEmoji(userName) + " " + formattedBody
keepFullText: true keepFullText: true
...@@ -63,7 +63,7 @@ EventDelegateChooser { ...@@ -63,7 +63,7 @@ EventDelegateChooser {
required property string userName required property string userName
body: '' body: ''
color: palette.buttonText color: palette.active.buttonText
font.italic: true font.italic: true
font.pointSize: Settings.fontSize * 0.8 font.pointSize: Settings.fontSize * 0.8
formatted: '' formatted: ''
...@@ -83,7 +83,7 @@ EventDelegateChooser { ...@@ -83,7 +83,7 @@ EventDelegateChooser {
Layout.fillWidth: true Layout.fillWidth: true
body: formatted body: formatted
color: palette.buttonText color: palette.active.buttonText
font.italic: true font.italic: true
formatted: { formatted: {
switch (callType) { switch (callType) {
...@@ -109,7 +109,7 @@ EventDelegateChooser { ...@@ -109,7 +109,7 @@ EventDelegateChooser {
Layout.fillWidth: true Layout.fillWidth: true
body: formatted body: formatted
color: palette.buttonText color: palette.active.buttonText
font.italic: true font.italic: true
formatted: { formatted: {
switch (type) { switch (type) {
......
...@@ -125,6 +125,8 @@ Pane { ...@@ -125,6 +125,8 @@ Pane {
Layout.row: 2 Layout.row: 2
clip: true clip: true
enabled: false enabled: false
// don't use the disabled color
color: topBar.palette.text
selectByMouse: false selectByMouse: false
text: roomTopic text: roomTopic
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment