rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #127 from adasauce/cleanup-dark-qss 

Dark Theme qss cleanup
This commit is contained in:
DeepBlueV7.X 2020-02-21 03:59:13 +01:00 committed by GitHub
parent 55fb5532ee 5cdc5304ec
commit fa829bebd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 109 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

202
resources/styles/nheko-dark.qss
View File

@ -3,13 +3,64 @@ QLabel {
color: #caccd1; color: #caccd1;
} }
TimelineItem { QuickSwitcher,
qproperty-backgroundColor: #202228; ReplyPopup,
SuggestionsPopup,
UserSettingsPage,
#scroll_widget,
#UserSettingScrollWidget {
background-color: #202228;
} }
#chatPage, #chatPage,
#chatPage > * { #chatPage > *,
CommunitiesList,
CommunitiesList > *,
RoomList,
RoomList > *,
TimelineView,
TimelineView > *,
UserMentionsWidget,
UserMentionsWidget > * {
background-color: #2d3139;
border: none;
}
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; background-color: #202228;
color: #caccd1;
}
emoji--Category,
emoji--Category > * {
background-color: #2d3139;
color: #caccd1;
}
TimelineItem {
qproperty-backgroundColor: #202228;
} }
#sideBar { #sideBar {
@ -18,55 +69,21 @@ TimelineItem {
border-left: 1px solid #202228; border-left: 1px solid #202228;
} }
TimelineView,
TimelineView > * {
background-color: #202228;
border: none;
}
UserMentionsWidget,
UserMentionsWidget > * {
background-color: #202228;
border: none;
}
UserMentionsWidget > TimelineItem { UserMentionsWidget > TimelineItem {
qproperty-backgroundColor: #202228; qproperty-backgroundColor: #202228;
qproperty-hoverColor: rgba(45, 49, 57, 120); qproperty-hoverColor: rgba(45, 49, 57, 120);
} }
#scroll_widget {
background-color: #202228;
}
QuickSwitcher {
background-color: #202228;
}
InfoMessage { InfoMessage {
qproperty-textColor: #caccd1; qproperty-textColor: #caccd1;
qproperty-boxColor: rgba(45, 49, 57, 120); qproperty-boxColor: rgba(45, 49, 57, 120);
} }
SuggestionsPopup {
background-color: #202228;
}
ReplyPopup {
background-color: #202228;
}
PopupItem { PopupItem {
background-color: #202228; background-color: #202228;
qproperty-hoverColor: rgba(45, 49, 57, 120); qproperty-hoverColor: rgba(45, 49, 57, 120);
} }
RoomList,
RoomList > * {
background-color: #2d3139;
border: none;
}
TypingDisplay { TypingDisplay {
qproperty-textColor: #caccd1; qproperty-textColor: #caccd1;
qproperty-backgroundColor: #202228; qproperty-backgroundColor: #202228;
@ -76,65 +93,25 @@ TypingDisplay {
background-color: #2d3139; background-color: #2d3139;
} }
CommunitiesList,
CommunitiesList > * {
border-style: none;
background-color: #2d3139;
}
FlatButton { FlatButton {
qproperty-foregroundColor: #727274; qproperty-foregroundColor: #727274;
qproperty-backgroundColor: #333; qproperty-backgroundColor: #333;
qproperty-disabledForegroundColor: #222; qproperty-disabledForegroundColor: #222;
} }
AudioItem,
FileItem { FileItem {
qproperty-textColor: #caccd1; qproperty-textColor: #caccd1;
qproperty-backgroundColor: #2d3139; qproperty-backgroundColor: #2d3139;
qproperty-iconColor: #caccd1; qproperty-iconColor: #caccd1;
} }
AudioItem {
qproperty-textColor: #caccd1;
qproperty-backgroundColor: #2d3139;
qproperty-iconColor: #caccd1;
}
RaisedButton { RaisedButton {
qproperty-foregroundColor: #caccd1; qproperty-foregroundColor: #caccd1;
qproperty-backgroundColor: #333; qproperty-backgroundColor: #333;
} }
RoomInfoListItem { 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;
}
UserMentionsWidget { UserMentionsWidget {
qproperty-mentionedColor: #a82353; qproperty-mentionedColor: #a82353;
qproperty-highlightedBackgroundColor: #4d84c7; qproperty-highlightedBackgroundColor: #4d84c7;
@ -187,12 +164,8 @@ UserInfoWidget {
border-bottom: 1px solid #202228; border-bottom: 1px solid #202228;
} }
UserSettingsPage { #UserSettingScrollWidget > QComboBox {
background-color: #202228; color: #202228;
}
#UserSettingScrollWidget {
background-color: #202228;
} }
#UserSettingScrollWidget > QComboBox { #UserSettingScrollWidget > QComboBox {
@ -204,61 +177,19 @@ Avatar {
qproperty-backgroundColor: #2d3139; qproperty-backgroundColor: #2d3139;
} }
#displayNameLabel { #displayNameLabel,
color: #f2f2f2;
}
#userIdLabel { #userIdLabel {
color: #f2f2f2; 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 { TopSection {
qproperty-textColor: #caccd1; qproperty-textColor: #caccd1;
} }
QListWidget,
WelcomePage,
LoginPage,
RegisterPage {
background-color: #202228;
color: #caccd1;
}
emoji--Panel,
emoji--Panel > * {
background-color: #202228;
color: #caccd1;
}
emoji--Category { emoji--Category {
qproperty-hoverBackgroundColor: rgba(230, 230, 230, 30); qproperty-hoverBackgroundColor: rgba(230, 230, 230, 30);
} }
emoji--Category,
emoji--Category > * {
background-color: #2d3139;
color: #caccd1;
}
FloatingButton { FloatingButton {
qproperty-backgroundColor: #2d3139; qproperty-backgroundColor: #2d3139;
qproperty-foregroundColor: white; qproperty-foregroundColor: white;
@ -275,23 +206,14 @@ ScrollBar {
qproperty-backgroundColor: #202228; qproperty-backgroundColor: #202228;
} }
SideBarActions { SideBarActions,
TopRoomBar
{
border: none; border: none;
border-top: 1px solid #202228; border-top: 1px solid #202228;
background-color: #2d3139; background-color: #2d3139;
} }
TopRoomBar {
border: none;
border-bottom: 1px solid #202228;
background-color: #2d3139;
}
QLineEdit {
background-color: #202228;
color: #caccd1;
}
TextInputWidget { TextInputWidget {
border: none; border: none;
border-top: 1px solid #2d3139; border-top: 1px solid #2d3139;

83
resources/styles/nheko.qss
View File

@ -3,13 +3,33 @@ QLabel {
color: #333; color: #333;
} }
TimelineItem { QuickSwitcher,
qproperty-backgroundColor: white; ReplyPopup,
SuggestionsPopup,
UserSettingsPage,
#scroll_widget,
#UserSettingScrollWidget {
background-color: white;
} }
#chatPage, #chatPage,
#chatPage > * { #chatPage > *,
CommunitiesList,
CommunitiesList > *,
RoomList,
RoomList > *,
TimelineView,
TimelineView > *,
UserMentionsWidget,
UserMentionsWidget > *,
TimelineView,
TimelineView > * {
background-color: white; background-color: white;
border: none;
}
TimelineItem {
qproperty-backgroundColor: white;
} }
#sideBar { #sideBar {
@ -18,31 +38,11 @@ TimelineItem {
border-left: 1px solid #dee1f3; border-left: 1px solid #dee1f3;
} }
TimelineView,
TimelineView > * {
background-color: white;
border: none;
}
UserMentionsWidget,
UserMentionsWidget > * {
background-color: white;
border: none;
}
UserMentionsWidget > TimelineItem { UserMentionsWidget > TimelineItem {
qproperty-backgroundColor: white; qproperty-backgroundColor: white;
qproperty-hoverColor: rgba(192, 193, 195, 120); qproperty-hoverColor: rgba(192, 193, 195, 120);
} }
#scroll_widget {
background-color: white;
}
QuickSwitcher {
background-color: white;
}
InfoMessage { InfoMessage {
qproperty-textColor: #333; qproperty-textColor: #333;
qproperty-boxColor: rgba(220, 220, 220, 120); qproperty-boxColor: rgba(220, 220, 220, 120);
@ -53,21 +53,15 @@ TypingDisplay {
qproperty-backgroundColor: white; qproperty-backgroundColor: white;
} }
SuggestionsPopup {
background-color: white;
}
ReplyPopup {
background-color: white;
}
PopupItem { PopupItem {
background-color: white; background-color: white;
qproperty-hoverColor: rgba(192, 193, 195, 120); qproperty-hoverColor: rgba(192, 193, 195, 120);
} }
RoomList, RoomList,
RoomList > * { RoomList > *,
CommunitiesList,
CommunitiesList > * {
background-color: #2e3649; background-color: #2e3649;
border: none; border: none;
} }
@ -76,28 +70,17 @@ RoomList > * {
background-color: #2e3649; background-color: #2e3649;
} }
CommunitiesList,
CommunitiesList > * {
border-style: none;
background-color: #2e3649;
}
FlatButton { FlatButton {
qproperty-foregroundColor: #495057; qproperty-foregroundColor: #495057;
} }
AudioItem,
FileItem { FileItem {
qproperty-textColor: #333; qproperty-textColor: #333;
qproperty-backgroundColor: #f2f2f2; qproperty-backgroundColor: #f2f2f2;
qproperty-iconColor: white; qproperty-iconColor: white;
} }
AudioItem {
qproperty-textColor: #333;
qproperty-backgroundColor: #f2f2f2;
qproperty-iconColor: white;
}
RaisedButton { RaisedButton {
qproperty-foregroundColor: white; qproperty-foregroundColor: white;
} }
@ -105,7 +88,7 @@ RaisedButton {
RoomInfoListItem { RoomInfoListItem {
qproperty-mentionedColor: #a82353; qproperty-mentionedColor: #a82353;
qproperty-highlightedBackgroundColor: #38A3D8; qproperty-highlightedBackgroundColor: #38A3D8;
qproperty-hoverBackgroundColor: rgba(200, 200, 200, 70); qproperty-hoverBackgroundColor: rgba(200, 200, 200, 40);
qproperty-hoverTitleColor: #f2f5f8; qproperty-hoverTitleColor: #f2f5f8;
qproperty-hoverSubtitleColor: white; qproperty-hoverSubtitleColor: white;
qproperty-backgroundColor: #f2f5f8; qproperty-backgroundColor: #f2f5f8;
@ -132,7 +115,7 @@ RoomInfoListItem {
CommunitiesListItem { CommunitiesListItem {
qproperty-highlightedBackgroundColor: #38A3D8; qproperty-highlightedBackgroundColor: #38A3D8;
qproperty-hoverBackgroundColor: rgba(200, 200, 200, 70); qproperty-hoverBackgroundColor: rgba(200, 200, 200, 40);
qproperty-backgroundColor: #f2f5f8; qproperty-backgroundColor: #f2f5f8;
qproperty-avatarBgColor: #eee; qproperty-avatarBgColor: #eee;
@ -157,14 +140,6 @@ UserInfoWidget {
border-bottom: 2px solid #ccc; border-bottom: 2px solid #ccc;
} }
UserSettingsPage {
background-color: white;
}
#UserSettingScrollWidget {
background-color: white;
}
Avatar { Avatar {
qproperty-textColor: black; qproperty-textColor: black;
qproperty-backgroundColor: #eee; qproperty-backgroundColor: #eee;

54
resources/styles/system.qss
View File

@ -1,3 +1,16 @@
#chatPage,
#chatPage > *,
CommunitiesList,
CommunitiesList > *,
RoomList,
RoomList > *,
TimelineView,
TimelineView > *,
UserMentionsWidget,
UserMentionsWidget > * {
border: none;
}
TypingDisplay { TypingDisplay {
qproperty-textColor: palette(text); qproperty-textColor: palette(text);
qproperty-backgroundColor: palette(window); qproperty-backgroundColor: palette(window);
@ -7,31 +20,18 @@ TimelineItem {
qproperty-backgroundColor: palette(window); qproperty-backgroundColor: palette(window);
} }
TimelineView,
TimelineView > * {
border: none;
}
UserMentionsWidget,
UserMentionsWidget > * {
border: none;
}
UserMentionsWidget > TimelineItem { UserMentionsWidget > TimelineItem {
qproperty-backgroundColor: palette(window); qproperty-backgroundColor: palette(window);
qproperty-hoverColor: palette(base); qproperty-hoverColor: palette(base);
} }
SideBarActions,
TextInputWidget { TextInputWidget {
border: none; border: none;
border-top: 1px solid palette(mid); border-top: 1px solid palette(mid);
} }
SideBarActions { UserInfoWidget,
border: none;
border-top: 1px solid palette(mid);
}
TopRoomBar { TopRoomBar {
border: none; border: none;
border-bottom: 1px solid palette(mid); border-bottom: 1px solid palette(mid);
@ -43,11 +43,6 @@ RoomList > * {
border: none; border: none;
} }
UserInfoWidget {
border: none;
border-bottom: 1px solid palette(mid);
}
#sideBar { #sideBar {
border: none; border: none;
border-right: 1px solid palette(mid); border-right: 1px solid palette(mid);
@ -67,18 +62,13 @@ FlatButton {
qproperty-foregroundColor: palette(text); qproperty-foregroundColor: palette(text);
} }
AudioItem,
FileItem { FileItem {
qproperty-textColor: palette(text); qproperty-textColor: palette(text);
qproperty-backgroundColor: palette(base); qproperty-backgroundColor: palette(base);
qproperty-iconColor: palette(window); qproperty-iconColor: palette(window);
} }
AudioItem {
qproperty-textColor: palette(text);
qproperty-backgroundColor: palette(base);
qproperty-iconColor: palette(window);
}
RaisedButton { RaisedButton {
qproperty-foregroundColor: palette(buttonText); qproperty-foregroundColor: palette(buttonText);
} }
@ -95,7 +85,8 @@ QListWidget {
background-color: palette(window); background-color: palette(window);
} }
RoomInfoListItem, UserMentionsWidget { RoomInfoListItem,
UserMentionsWidget {
qproperty-mentionedColor: palette(alternate-base); qproperty-mentionedColor: palette(alternate-base);
qproperty-highlightedBackgroundColor: palette(highlight); qproperty-highlightedBackgroundColor: palette(highlight);
qproperty-hoverBackgroundColor: palette(light); qproperty-hoverBackgroundColor: palette(light);
@ -124,11 +115,6 @@ RoomInfoListItem, UserMentionsWidget {
qproperty-bubbleFgColor: palette(text); qproperty-bubbleFgColor: palette(text);
} }
CommunitiesList,
CommunitiesList > * {
border-style: none;
}
CommunitiesListItem { CommunitiesListItem {
qproperty-highlightedBackgroundColor: palette(highlight); qproperty-highlightedBackgroundColor: palette(highlight);
qproperty-hoverBackgroundColor: palette(light); qproperty-hoverBackgroundColor: palette(light);
@ -172,10 +158,6 @@ SnackBar {
qproperty-bgColor: palette(base); qproperty-bgColor: palette(base);
} }
MemberItem {
background-color: palette(window);
}
Toggle { Toggle {
qproperty-activeColor: palette(highlight); qproperty-activeColor: palette(highlight);
qproperty-disabledColor: palette(dark); qproperty-disabledColor: palette(dark);