From 5cdc5304ecfc6b4f038e71a75895fe0bd854fd6b Mon Sep 17 00:00:00 2001
From: Adasauce <adasauce@with.parts>
Date: Thu, 20 Feb 2020 22:51:03 -0400
Subject: [PATCH] clean up the light and system themes too

---
 resources/styles/nheko-dark.qss |  1 -
 resources/styles/nheko.qss      | 83 ++++++++++++---------------------
 resources/styles/system.qss     | 54 +++++++--------------
 3 files changed, 47 insertions(+), 91 deletions(-)

diff --git a/resources/styles/nheko-dark.qss b/resources/styles/nheko-dark.qss
index 055d6290..8597eccb 100644
--- a/resources/styles/nheko-dark.qss
+++ b/resources/styles/nheko-dark.qss
@@ -74,7 +74,6 @@ UserMentionsWidget > TimelineItem {
     qproperty-hoverColor: rgba(45, 49, 57, 120);
 }
 
-
 InfoMessage {
     qproperty-textColor: #caccd1;
     qproperty-boxColor: rgba(45, 49, 57, 120);
diff --git a/resources/styles/nheko.qss b/resources/styles/nheko.qss
index 6bcde529..ffaba4e1 100644
--- a/resources/styles/nheko.qss
+++ b/resources/styles/nheko.qss
@@ -3,13 +3,33 @@ QLabel {
     color: #333;
 }
 
-TimelineItem {
-    qproperty-backgroundColor: white;
+QuickSwitcher,
+ReplyPopup,
+SuggestionsPopup,
+UserSettingsPage,
+#scroll_widget,
+#UserSettingScrollWidget {
+    background-color: white;
 }
 
 #chatPage,
-#chatPage > * {
+#chatPage > *,
+CommunitiesList,
+CommunitiesList > *,
+RoomList,
+RoomList > *,
+TimelineView,
+TimelineView > *,
+UserMentionsWidget,
+UserMentionsWidget > *,
+TimelineView,
+TimelineView > * {
     background-color: white;
+    border: none;
+}
+
+TimelineItem {
+    qproperty-backgroundColor: white;
 }
 
 #sideBar {
@@ -18,31 +38,11 @@ TimelineItem {
     border-left: 1px solid #dee1f3;
 }
 
-TimelineView,
-TimelineView > * {
-    background-color: white;
-    border: none;
-}
-
-UserMentionsWidget,
-UserMentionsWidget > * {
-    background-color: white;
-    border: none;
-}
-
 UserMentionsWidget > TimelineItem {
     qproperty-backgroundColor: white;
     qproperty-hoverColor: rgba(192, 193, 195, 120);
 }
 
-#scroll_widget {
-    background-color: white;
-}
-
-QuickSwitcher {
-    background-color: white;
-}
-
 InfoMessage {
     qproperty-textColor: #333;
     qproperty-boxColor: rgba(220, 220, 220, 120);
@@ -53,21 +53,15 @@ TypingDisplay {
     qproperty-backgroundColor: white;
 }
 
-SuggestionsPopup {
-    background-color: white;
-}
-
-ReplyPopup {
-    background-color: white;
-}
-
 PopupItem {
     background-color: white;
     qproperty-hoverColor: rgba(192, 193, 195, 120);
 }
 
 RoomList,
-RoomList > * {
+RoomList > *,
+CommunitiesList,
+CommunitiesList > * {
     background-color: #2e3649;
     border: none;
 }
@@ -76,28 +70,17 @@ RoomList > * {
     background-color: #2e3649;
 }
 
-CommunitiesList,
-CommunitiesList > * {
-    border-style: none;
-    background-color: #2e3649;
-}
-
 FlatButton {
     qproperty-foregroundColor: #495057;
 }
 
+AudioItem,
 FileItem {
     qproperty-textColor: #333;
     qproperty-backgroundColor: #f2f2f2;
     qproperty-iconColor: white;
 }
 
-AudioItem {
-    qproperty-textColor: #333;
-    qproperty-backgroundColor: #f2f2f2;
-    qproperty-iconColor: white;
-}
-
 RaisedButton {
     qproperty-foregroundColor: white;
 }
@@ -105,7 +88,7 @@ RaisedButton {
 RoomInfoListItem {
     qproperty-mentionedColor: #a82353;
     qproperty-highlightedBackgroundColor: #38A3D8;
-    qproperty-hoverBackgroundColor: rgba(200, 200, 200, 70);
+    qproperty-hoverBackgroundColor: rgba(200, 200, 200, 40);
     qproperty-hoverTitleColor: #f2f5f8;
     qproperty-hoverSubtitleColor: white;
     qproperty-backgroundColor: #f2f5f8;
@@ -132,7 +115,7 @@ RoomInfoListItem {
 
 CommunitiesListItem {
     qproperty-highlightedBackgroundColor: #38A3D8;
-    qproperty-hoverBackgroundColor: rgba(200, 200, 200, 70);
+    qproperty-hoverBackgroundColor: rgba(200, 200, 200, 40);
     qproperty-backgroundColor: #f2f5f8;
 
     qproperty-avatarBgColor: #eee;
@@ -157,14 +140,6 @@ UserInfoWidget {
     border-bottom: 2px solid #ccc;
 }
 
-UserSettingsPage {
-    background-color: white;
-}
-
-#UserSettingScrollWidget {
-    background-color: white;
-}
-
 Avatar {
     qproperty-textColor: black;
     qproperty-backgroundColor: #eee;
diff --git a/resources/styles/system.qss b/resources/styles/system.qss
index b60b3776..2d4b2d8c 100644
--- a/resources/styles/system.qss
+++ b/resources/styles/system.qss
@@ -1,3 +1,16 @@
+#chatPage,
+#chatPage > *,
+CommunitiesList,
+CommunitiesList > *,
+RoomList,
+RoomList > *,
+TimelineView,
+TimelineView > *,
+UserMentionsWidget,
+UserMentionsWidget > * {
+    border: none;
+}
+
 TypingDisplay {
     qproperty-textColor: palette(text);
     qproperty-backgroundColor: palette(window);
@@ -7,31 +20,18 @@ TimelineItem {
     qproperty-backgroundColor: palette(window);
 }
 
-TimelineView,
-TimelineView > * {
-    border: none;
-}
-
-UserMentionsWidget,
-UserMentionsWidget > * {
-    border: none;
-}
-
 UserMentionsWidget > TimelineItem {
     qproperty-backgroundColor: palette(window);
     qproperty-hoverColor: palette(base);
 }
 
+SideBarActions,
 TextInputWidget {
     border: none;
     border-top: 1px solid palette(mid);
 }
 
-SideBarActions {
-    border: none;
-    border-top: 1px solid palette(mid);
-}
-
+UserInfoWidget,
 TopRoomBar {
     border: none;
     border-bottom: 1px solid palette(mid);
@@ -43,11 +43,6 @@ RoomList > * {
     border: none;
 }
 
-UserInfoWidget {
-    border: none;
-    border-bottom: 1px solid palette(mid);
-}
-
 #sideBar {
     border: none;
     border-right: 1px solid palette(mid);
@@ -67,18 +62,13 @@ FlatButton {
     qproperty-foregroundColor: palette(text);
 }
 
+AudioItem,
 FileItem {
     qproperty-textColor: palette(text);
     qproperty-backgroundColor: palette(base);
     qproperty-iconColor: palette(window);
 }
 
-AudioItem {
-    qproperty-textColor: palette(text);
-    qproperty-backgroundColor: palette(base);
-    qproperty-iconColor: palette(window);
-}
-
 RaisedButton {
     qproperty-foregroundColor: palette(buttonText);
 }
@@ -95,7 +85,8 @@ QListWidget {
     background-color: palette(window);
 }
 
-RoomInfoListItem, UserMentionsWidget {
+RoomInfoListItem,
+UserMentionsWidget {
     qproperty-mentionedColor: palette(alternate-base);
     qproperty-highlightedBackgroundColor: palette(highlight);
     qproperty-hoverBackgroundColor: palette(light);
@@ -124,11 +115,6 @@ RoomInfoListItem, UserMentionsWidget {
     qproperty-bubbleFgColor: palette(text);
 }
 
-CommunitiesList,
-CommunitiesList > * {
-    border-style: none;
-}
-
 CommunitiesListItem {
     qproperty-highlightedBackgroundColor: palette(highlight);
     qproperty-hoverBackgroundColor: palette(light);
@@ -172,10 +158,6 @@ SnackBar {
     qproperty-bgColor: palette(base);
 }
 
-MemberItem {
-    background-color: palette(window);
-}
-
 Toggle {
     qproperty-activeColor: palette(highlight);
     qproperty-disabledColor: palette(dark);