summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Donofry <joedonofry@gmail.com>2020-05-07 22:21:06 -0400
committerJoseph Donofry <joedonofry@gmail.com>2020-05-07 22:21:06 -0400
commit5b9611dcd3ec033b8206081dfc76fcba68811af6 (patch)
tree22b214429c415cc7e00b7bcf0cf1ac4018aca5f7
parentmerge master into reactions (diff)
parentFix redaction color change that accidentally got committed (diff)
downloadnheko-5b9611dcd3ec033b8206081dfc76fcba68811af6.tar.xz
Merge branch 'master' into reactions
-rw-r--r--resources/qml/delegates/Pill.qml6
1 files changed, 3 insertions, 3 deletions
diff --git a/resources/qml/delegates/Pill.qml b/resources/qml/delegates/Pill.qml

index 23a69b10..22677141 100644 --- a/resources/qml/delegates/Pill.qml +++ b/resources/qml/delegates/Pill.qml
@@ -8,11 +8,11 @@ Label { color: colors.brightText horizontalAlignment: Text.AlignHCenter - height: fontMetrics.height * 1.4 - width: contentWidth * 1.2 - + height: contentHeight * 1.2 + width: contentWidth * 1.2 background: Rectangle { radius: parent.height / 2 color: Qt.rgba(userColor.r, userColor.g, userColor.b, 0.2) } + }