summary refs log tree commit diff
path: root/resources
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2020-04-08 23:08:43 +0200
committerNicolas Werner <nicolas.werner@hotmail.de>2020-04-08 23:10:00 +0200
commit6794b6472d3b447954df5d56e36f83f008fd0110 (patch)
tree97cd5b73346b1e47d502c3a387006d27964b0304 /resources
parentFix UserProfile resizing (diff)
downloadnheko-6794b6472d3b447954df5d56e36f83f008fd0110.tar.xz
Add a few missing palette colors
Diffstat (limited to 'resources')
-rw-r--r--resources/qml/delegates/FileMessage.qml2
-rw-r--r--resources/qml/delegates/PlayableMediaMessage.qml2
-rw-r--r--resources/styles/nheko-dark.qss21
-rw-r--r--resources/styles/nheko.qss12
4 files changed, 2 insertions, 35 deletions
diff --git a/resources/qml/delegates/FileMessage.qml b/resources/qml/delegates/FileMessage.qml

index 2fe0a490..9a5300bb 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.base + color: colors.dark height: row.height + 24 width: parent ? parent.width : undefined diff --git a/resources/qml/delegates/PlayableMediaMessage.qml b/resources/qml/delegates/PlayableMediaMessage.qml
index a4096864..20177a04 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.base + color: colors.dark height: content.height + 24 width: parent ? parent.width : undefined diff --git a/resources/styles/nheko-dark.qss b/resources/styles/nheko-dark.qss
index d89a61bb..875a3828 100644 --- a/resources/styles/nheko-dark.qss +++ b/resources/styles/nheko-dark.qss
@@ -176,27 +176,6 @@ UserInfoWidget { border-bottom: 1px solid #202228; } -QPushButton, -QComboBox, -QAbstractItemView, -QComboBox > * { - background: white; - color: #202228; -} - -QComboBox:hover, -QAbstractItemView::item:hover, -QPushButton:hover { - background: #38a3d8; - selection-background-color: #38a3d8; -} - - -QAbstractItemView::item:selected { - border-color: darkblue; - background: grey; -} - Avatar { qproperty-textColor: white; qproperty-backgroundColor: #2d3139; diff --git a/resources/styles/nheko.qss b/resources/styles/nheko.qss
index 1a7cb80f..51e5d64e 100644 --- a/resources/styles/nheko.qss +++ b/resources/styles/nheko.qss
@@ -190,18 +190,6 @@ RegisterPage { color: #333; } -QComboBox:hover, -QAbstractItemView::item:hover, -QPushButton:hover { - background: #38a3d8; - selection-background-color: #38a3d8; -} - -QAbstractItemView::item:selected { - border-color: darkblue; - background: grey; -} - emoji--Panel, emoji--Panel > * { background-color: #eee;