diff --git a/resources/styles/nheko-dark.qss b/resources/styles/nheko-dark.qss
index 35627008..8597eccb 100644
--- a/resources/styles/nheko-dark.qss
+++ b/resources/styles/nheko-dark.qss
@@ -3,44 +3,75 @@ QLabel {
color: #caccd1;
}
-TimelineItem {
- qproperty-backgroundColor: #202228;
-}
-
-#chatPage,
-#chatPage > * {
+QuickSwitcher,
+ReplyPopup,
+SuggestionsPopup,
+UserSettingsPage,
+#scroll_widget,
+#UserSettingScrollWidget {
background-color: #202228;
}
-#sideBar {
+#chatPage,
+#chatPage > *,
+CommunitiesList,
+CommunitiesList > *,
+RoomList,
+RoomList > *,
+TimelineView,
+TimelineView > *,
+UserMentionsWidget,
+UserMentionsWidget > * {
+ background-color: #2d3139;
border: none;
- border-right: 1px solid #202228;
- border-left: 1px solid #202228;
}
-TimelineView,
-TimelineView > * {
+QLineEdit,
+QListWidget,
+WelcomePage,
+LoginPage,
+RegisterPage,
+EditModal,
+emoji--Panel,
+emoji--Panel > *,
+dialogs--Logout,
+dialogs--ReCaptcha,
+dialogs--LeaveRoom,
+dialogs--CreateRoom,
+dialogs--RoomSettings,
+dialogs--InviteUsers,
+dialogs--ReadReceipts,
+dialogs--JoinRoom,
+dialogs--MemberList,
+dialogs--PreviewUploadOverlay,
+dialogs--UserProfile,
+dialogs--CreateRoom > QLineEdit,
+dialogs--InviteUsers > QLineEdit,
+dialogs--JoinRoom > QLineEdit {
background-color: #202228;
- border: none;
+ color: #caccd1;
}
-UserMentionsWidget,
-UserMentionsWidget > * {
- background-color: #202228;
- border: none;
+emoji--Category,
+emoji--Category > * {
+ background-color: #2d3139;
+ color: #caccd1;
+
}
-UserMentionsWidget > TimelineItem {
+TimelineItem {
qproperty-backgroundColor: #202228;
- qproperty-hoverColor: rgba(45, 49, 57, 120);
}
-#scroll_widget {
- background-color: #202228;
+#sideBar {
+ border: none;
+ border-right: 1px solid #202228;
+ border-left: 1px solid #202228;
}
-QuickSwitcher {
- background-color: #202228;
+UserMentionsWidget > TimelineItem {
+ qproperty-backgroundColor: #202228;
+ qproperty-hoverColor: rgba(45, 49, 57, 120);
}
InfoMessage {
@@ -48,25 +79,11 @@ InfoMessage {
qproperty-boxColor: rgba(45, 49, 57, 120);
}
-SuggestionsPopup {
- background-color: #202228;
-}
-
-ReplyPopup {
- background-color: #202228;
-}
-
PopupItem {
background-color: #202228;
qproperty-hoverColor: rgba(45, 49, 57, 120);
}
-RoomList,
-RoomList > * {
- background-color: #2d3139;
- border: none;
-}
-
TypingDisplay {
qproperty-textColor: #caccd1;
qproperty-backgroundColor: #202228;
@@ -76,65 +93,25 @@ TypingDisplay {
background-color: #2d3139;
}
-CommunitiesList,
-CommunitiesList > * {
- border-style: none;
- background-color: #2d3139;
-}
-
-
FlatButton {
qproperty-foregroundColor: #727274;
qproperty-backgroundColor: #333;
qproperty-disabledForegroundColor: #222;
}
+AudioItem,
FileItem {
qproperty-textColor: #caccd1;
qproperty-backgroundColor: #2d3139;
qproperty-iconColor: #caccd1;
}
-AudioItem {
- qproperty-textColor: #caccd1;
- qproperty-backgroundColor: #2d3139;
- qproperty-iconColor: #caccd1;
-}
-
RaisedButton {
qproperty-foregroundColor: #caccd1;
qproperty-backgroundColor: #333;
}
-RoomInfoListItem {
- qproperty-mentionedColor: #a82353;
- qproperty-highlightedBackgroundColor: #4d84c7;
- qproperty-hoverBackgroundColor: rgba(230, 230, 230, 30);
- qproperty-backgroundColor: #2d3139;
-
- qproperty-titleColor: #e4e5e8;
- qproperty-subtitleColor: #caccd1;
-
- qproperty-hoverTitleColor: #f4f5f8;
- qproperty-hoverSubtitleColor: white;
-
- qproperty-highlightedTitleColor: #f4f4f5;
- qproperty-highlightedSubtitleColor: #e4e5e8;
-
- qproperty-btnColor: #414A59;
- qproperty-btnTextColor: white;
-
- qproperty-timestampColor: #727274;
- qproperty-highlightedTimestampColor: #e7e7e9;
- qproperty-hoverTimestampColor: #f4f5f8;
-
- qproperty-avatarBgColor: #202228;
- qproperty-avatarFgColor: white;
-
- qproperty-bubbleFgColor: white;
- qproperty-bubbleBgColor: #4d84c7;
-}
-
+RoomInfoListItem,
UserMentionsWidget {
qproperty-mentionedColor: #a82353;
qproperty-highlightedBackgroundColor: #4d84c7;
@@ -187,12 +164,8 @@ UserInfoWidget {
border-bottom: 1px solid #202228;
}
-UserSettingsPage {
- background-color: #202228;
-}
-
-#UserSettingScrollWidget {
- background-color: #202228;
+#UserSettingScrollWidget > QComboBox {
+ color: #202228;
}
#UserSettingScrollWidget > QComboBox {
@@ -204,61 +177,19 @@ Avatar {
qproperty-backgroundColor: #2d3139;
}
-#displayNameLabel {
- color: #f2f2f2;
-}
-
+#displayNameLabel,
#userIdLabel {
color: #f2f2f2;
}
-dialogs--Logout,
-dialogs--ReCaptcha,
-dialogs--LeaveRoom,
-dialogs--CreateRoom,
-dialogs--RoomSettings,
-dialogs--InviteUsers,
-dialogs--ReadReceipts,
-dialogs--JoinRoom,
-dialogs--MemberList,
-dialogs--PreviewUploadOverlay,
-dialogs--UserProfile,
-dialogs--CreateRoom > QLineEdit,
-dialogs--InviteUsers > QLineEdit,
-EditModal,
-dialogs--JoinRoom > QLineEdit {
- background-color: #202228;
- color: #caccd1;
-}
-
TopSection {
qproperty-textColor: #caccd1;
}
-QListWidget,
-WelcomePage,
-LoginPage,
-RegisterPage {
- background-color: #202228;
- color: #caccd1;
-}
-
-emoji--Panel,
-emoji--Panel > * {
- background-color: #202228;
- color: #caccd1;
-}
-
emoji--Category {
qproperty-hoverBackgroundColor: rgba(230, 230, 230, 30);
}
-emoji--Category,
-emoji--Category > * {
- background-color: #2d3139;
- color: #caccd1;
-}
-
FloatingButton {
qproperty-backgroundColor: #2d3139;
qproperty-foregroundColor: white;
@@ -275,23 +206,14 @@ ScrollBar {
qproperty-backgroundColor: #202228;
}
-SideBarActions {
+SideBarActions,
+TopRoomBar
+{
border: none;
border-top: 1px solid #202228;
background-color: #2d3139;
}
-TopRoomBar {
- border: none;
- border-bottom: 1px solid #202228;
- background-color: #2d3139;
-}
-
-QLineEdit {
- background-color: #202228;
- color: #caccd1;
-}
-
TextInputWidget {
border: none;
border-top: 1px solid #2d3139;
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,31 +3,39 @@ QLabel {
color: #333;
}
-TimelineItem {
- qproperty-backgroundColor: white;
-}
-
-#chatPage,
-#chatPage > * {
+QuickSwitcher,
+ReplyPopup,
+SuggestionsPopup,
+UserSettingsPage,
+#scroll_widget,
+#UserSettingScrollWidget {
background-color: white;
}
-#sideBar {
- border: none;
- border-right: 1px solid #dee1f3;
- border-left: 1px solid #dee1f3;
-}
-
+#chatPage,
+#chatPage > *,
+CommunitiesList,
+CommunitiesList > *,
+RoomList,
+RoomList > *,
+TimelineView,
+TimelineView > *,
+UserMentionsWidget,
+UserMentionsWidget > *,
TimelineView,
TimelineView > * {
background-color: white;
border: none;
}
-UserMentionsWidget,
-UserMentionsWidget > * {
- background-color: white;
+TimelineItem {
+ qproperty-backgroundColor: white;
+}
+
+#sideBar {
border: none;
+ border-right: 1px solid #dee1f3;
+ border-left: 1px solid #dee1f3;
}
UserMentionsWidget > TimelineItem {
@@ -35,14 +43,6 @@ UserMentionsWidget > TimelineItem {
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);
|
