summary refs log tree commit diff
path: root/resources/styles
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2019-07-25 11:40:18 +0200
committerNicolas Werner <nicolas.werner@hotmail.de>2019-07-25 11:49:15 +0200
commit78ed78c410b2aeed2dd9c5de249cb625fb5153be (patch)
tree07e521fc5f9317a16ee0e1a6baa6a2e08440871e /resources/styles
parentMerge branch '0.7.0-dev' of ssh://github.com/Nheko-Reborn/nheko into 0.7.0-dev (diff)
downloadnheko-78ed78c410b2aeed2dd9c5de249cb625fb5153be.tar.xz
Improve layout of Emoji Picker
Respect system styling
Increase size of emojis (to remove empty space)
Add hover effect (partially adresses #41)
Less hardcoding of sizes
Use emoji font (color)
Diffstat (limited to 'resources/styles')
-rw-r--r--resources/styles/nheko-dark.qss4
-rw-r--r--resources/styles/nheko.qss4
-rw-r--r--resources/styles/system.qss22
3 files changed, 27 insertions, 3 deletions
diff --git a/resources/styles/nheko-dark.qss b/resources/styles/nheko-dark.qss
index 7b5486b0..1e1333b2 100644
--- a/resources/styles/nheko-dark.qss
+++ b/resources/styles/nheko-dark.qss
@@ -232,6 +232,10 @@ emoji--Panel > * {
     color: #caccd1;
 }
 
+emoji--Category {
+    qproperty-hoverBackgroundColor: rgba(230, 230, 230, 30);
+}
+
 emoji--Category,
 emoji--Category > * {
     background-color: #2d3139;
diff --git a/resources/styles/nheko.qss b/resources/styles/nheko.qss
index c352956a..a70441be 100644
--- a/resources/styles/nheko.qss
+++ b/resources/styles/nheko.qss
@@ -200,6 +200,10 @@ emoji--Panel > * {
     color: #333;
 }
 
+emoji--Category {
+    qproperty-hoverBackgroundColor: rgba(200, 200, 200, 70);
+}
+
 emoji--Category,
 emoji--Category > * {
     background-color: white;
diff --git a/resources/styles/system.qss b/resources/styles/system.qss
index c1e8898a..dfb8ce65 100644
--- a/resources/styles/system.qss
+++ b/resources/styles/system.qss
@@ -85,10 +85,10 @@ QListWidget {
     background-color: palette(window);
 }
 
-RoomInfoListItem {
+RoomInfoListItem, UserMentionsWidget {
     qproperty-mentionedColor: palette(alternate-base);
     qproperty-highlightedBackgroundColor: palette(highlight);
-    qproperty-hoverBackgroundColor: palette(base);
+    qproperty-hoverBackgroundColor: palette(light);
     qproperty-backgroundColor: palette(window);
 
     qproperty-titleColor: palette(text);
@@ -116,7 +116,7 @@ RoomInfoListItem {
 
 CommunitiesListItem {
     qproperty-highlightedBackgroundColor: palette(highlight);
-    qproperty-hoverBackgroundColor: palette(base);
+    qproperty-hoverBackgroundColor: palette(light);
     qproperty-backgroundColor: palette(window);
 
     qproperty-avatarBgColor: palette(base);
@@ -131,6 +131,22 @@ LoadingIndicator {
     qproperty-color: palette(light);
 }
 
+emoji--Panel,
+emoji--Panel > * {
+    background-color: palette(base);
+    color: palette(text);
+}
+
+emoji--Category {
+    qproperty-hoverBackgroundColor: palette(highlight);
+}
+
+emoji--Category,
+emoji--Category > * {
+    background-color: palette(window);
+    color: palette(text);
+}
+
 FloatingButton {
     qproperty-backgroundColor: palette(base);
     qproperty-foregroundColor: palette(text);