diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2023-10-10 01:10:10 +0200 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@hotmail.de> | 2023-10-10 01:10:10 +0200 |
| commit | 057e1f5c67b52d1634b289e78e1a60b6b05233bd (patch) | |
| tree | 225f671c068e49069fb2d2f9dd0e53e6c6a252fc /resources | |
| parent | fix click to go to reply after merge (diff) | |
| download | nheko-057e1f5c67b52d1634b289e78e1a60b6b05233bd.tar.xz | |
Fix reply and topic colors
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/qml/TimelineEvent.qml | 10 | ||||
| -rw-r--r-- | resources/qml/TopBar.qml | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/resources/qml/TimelineEvent.qml b/resources/qml/TimelineEvent.qml index 7e60328d..ed6eb87e 100644 --- a/resources/qml/TimelineEvent.qml +++ b/resources/qml/TimelineEvent.qml @@ -31,7 +31,7 @@ EventDelegateChooser { Layout.fillWidth: true //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 formatted: formattedBody keepFullText: true @@ -48,7 +48,7 @@ EventDelegateChooser { Layout.fillWidth: true //Layout.maximumWidth: implicitWidth - color: TimelineManager.userColor(userId, palette.base) + color: TimelineManager.userColor(userId, palette.active.base) font.italic: true formatted: TimelineManager.escapeEmoji(userName) + " " + formattedBody keepFullText: true @@ -63,7 +63,7 @@ EventDelegateChooser { required property string userName body: '' - color: palette.buttonText + color: palette.active.buttonText font.italic: true font.pointSize: Settings.fontSize * 0.8 formatted: '' @@ -83,7 +83,7 @@ EventDelegateChooser { Layout.fillWidth: true body: formatted - color: palette.buttonText + color: palette.active.buttonText font.italic: true formatted: { switch (callType) { @@ -109,7 +109,7 @@ EventDelegateChooser { Layout.fillWidth: true body: formatted - color: palette.buttonText + color: palette.active.buttonText font.italic: true formatted: { switch (type) { diff --git a/resources/qml/TopBar.qml b/resources/qml/TopBar.qml index aba91763..b7cd3ff0 100644 --- a/resources/qml/TopBar.qml +++ b/resources/qml/TopBar.qml @@ -125,6 +125,8 @@ Pane { Layout.row: 2 clip: true enabled: false + // don't use the disabled color + color: topBar.palette.text selectByMouse: false text: roomTopic } |