summary refs log tree commit diff
path: root/resources/qml
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2020-02-03 19:21:03 +0100
committerNicolas Werner <nicolas.werner@hotmail.de>2020-02-03 19:21:03 +0100
commitd330020fddb22dc7cfddd298ef00e3f3829aa691 (patch)
treecff9c6d5e4c299ccaef5757ec8dbbe60c0ffe608 /resources/qml
parentuse room rules for mentions (diff)
downloadnheko-d330020fddb22dc7cfddd298ef00e3f3829aa691.tar.xz
Improve styling a bit
Diffstat (limited to 'resources/qml')
-rw-r--r--resources/qml/Avatar.qml2
-rw-r--r--resources/qml/TimelineView.qml6
-rw-r--r--resources/qml/delegates/FileMessage.qml2
-rw-r--r--resources/qml/delegates/Pill.qml2
-rw-r--r--resources/qml/delegates/PlayableMediaMessage.qml11
5 files changed, 12 insertions, 11 deletions
diff --git a/resources/qml/Avatar.qml b/resources/qml/Avatar.qml

index 25fff7f3..f19cd09f 100644 --- a/resources/qml/Avatar.qml +++ b/resources/qml/Avatar.qml
@@ -48,5 +48,5 @@ Rectangle { } } } - color: colors.dark + color: colors.base } diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index 69d8d29e..6f5eb42b 100644 --- a/resources/qml/TimelineView.qml +++ b/resources/qml/TimelineView.qml
@@ -196,7 +196,7 @@ Item { horizontalAlignment: Text.AlignHCenter background: Rectangle { radius: parent.height / 2 - color: colors.dark + color: colors.base } } Row { @@ -242,7 +242,7 @@ Item { anchors.bottom: parent.bottom z: 3 - color: colors.window + color: "transparent" Column { id: footerContent @@ -270,7 +270,7 @@ Item { visible: timelineManager.replyingEvent && chat.model // Height of child, plus margins, plus border height: replyPreview.height + 10 - color: colors.dark + color: colors.base Reply { diff --git a/resources/qml/delegates/FileMessage.qml b/resources/qml/delegates/FileMessage.qml
index 9a5300bb..2fe0a490 100644 --- a/resources/qml/delegates/FileMessage.qml +++ b/resources/qml/delegates/FileMessage.qml
@@ -3,7 +3,7 @@ import QtQuick.Layouts 1.2 Rectangle { radius: 10 - color: colors.dark + color: colors.base height: row.height + 24 width: parent ? parent.width : undefined diff --git a/resources/qml/delegates/Pill.qml b/resources/qml/delegates/Pill.qml
index 53a9684e..b19d9a54 100644 --- a/resources/qml/delegates/Pill.qml +++ b/resources/qml/delegates/Pill.qml
@@ -9,6 +9,6 @@ Label { width: contentWidth * 1.2 background: Rectangle { radius: parent.height / 2 - color: colors.dark + color: colors.base } } diff --git a/resources/qml/delegates/PlayableMediaMessage.qml b/resources/qml/delegates/PlayableMediaMessage.qml
index 50202098..a4096864 100644 --- a/resources/qml/delegates/PlayableMediaMessage.qml +++ b/resources/qml/delegates/PlayableMediaMessage.qml
@@ -8,7 +8,7 @@ import im.nheko 1.0 Rectangle { id: bg radius: 10 - color: colors.dark + color: colors.base height: content.height + 24 width: parent ? parent.width : undefined @@ -83,15 +83,16 @@ Rectangle { Rectangle { id: button - color: colors.light + color: colors.window radius: 22 height: 44 width: 44 Image { id: img anchors.centerIn: parent + z: 3 - source: "image://colorimage/:/icons/icons/ui/arrow-pointing-down.png?"+colors.dark + source: "image://colorimage/:/icons/icons/ui/arrow-pointing-down.png?"+colors.text fillMode: Image.Pad } @@ -134,11 +135,11 @@ Rectangle { states: [ State { name: "stopped" - PropertyChanges { target: img; source: "image://colorimage/:/icons/icons/ui/play-sign.png?"+colors.dark } + PropertyChanges { target: img; source: "image://colorimage/:/icons/icons/ui/play-sign.png?"+colors.text } }, State { name: "playing" - PropertyChanges { target: img; source: "image://colorimage/:/icons/icons/ui/pause-symbol.png?"+colors.dark } + PropertyChanges { target: img; source: "image://colorimage/:/icons/icons/ui/pause-symbol.png?"+colors.text } } ] }