Merge branch 'theme'

3 files changed, 99 insertions, 3 deletions

diff --git a/resources/res.qrc b/resources/res.qrc

index 55962275..9bd977a2 100644
--- a/resources/res.qrc
+++ b/resources/res.qrc
@@ -42,7 +42,6 @@
         <file>icons/emoji-categories/flags.png</file>
         <file>icons/emoji-categories/flags@2x.png</file>
     </qresource>
-
     <qresource prefix="/logos">
         <file>nheko.png</file>
 
@@ -62,13 +61,15 @@
         <file>nheko-32.png</file>
         <file>nheko-16.png</file>
     </qresource>
-
     <qresource prefix="/fonts">
         <file>fonts/OpenSans/OpenSans-Regular.ttf</file>
         <file>fonts/OpenSans/OpenSans-Italic.ttf</file>
         <file>fonts/OpenSans/OpenSans-Bold.ttf</file>
         <file>fonts/OpenSans/OpenSans-Semibold.ttf</file>
-
         <file>fonts/EmojiOne/emojione-android.ttf</file>
     </qresource>
+    <qresource prefix="/styles">
+        <file>styles/system.qss</file>
+        <file>styles/nheko.qss</file>
+    </qresource>
 </RCC>
diff --git a/resources/styles/nheko.qss b/resources/styles/nheko.qss
new file mode 100644

index 00000000..caaac6b9
--- /dev/null
+++ b/resources/styles/nheko.qss
@@ -0,0 +1,56 @@
+* {
+        color: #333;
+}
+
+QLabel {
+        color: #333;
+}
+
+#chatPage, #chatPage > * { background-color: white; }
+
+TimelineView, TimelineView > * { background-color: white; }
+
+QMenu, QMenu > * { background-color: white; }
+
+FlatButton { qproperty-foregroundColor: #333; }
+
+RaisedButton { qproperty-foregroundColor: white; }
+
+RoomInfoListItem
+{
+        qproperty-highlightedBackgroundColor: #38A3D8;
+        qproperty-hoverBackgroundColor: rgba(200, 200, 200, 128);
+        qproperty-backgroundColor: white;
+
+        qproperty-titleColor: #333;
+        qproperty-subtitleColor: #5d6565;
+
+        qproperty-highlightedTitleColor: white;
+        qproperty-highlightedSubtitleColor: white;
+}
+
+#ChatPageLoadSpinner {
+        qproperty-color: #acc7dc;
+}
+
+#FileUploadSpinner {
+        qproperty-color: #333;
+}
+
+UserInfoWidget, UserInfoWidget > * {
+        background-color: #d6dde3;
+        color: #ebebeb;
+}
+
+Avatar {
+        qproperty-textColor: black;
+        qproperty-backgroundColor: #eee;
+}
+
+#displayNameLabel {
+        color: #171919;
+}
+
+#userIdLabel {
+        color: #555459;
+}
diff --git a/resources/styles/system.qss b/resources/styles/system.qss
new file mode 100644

index 00000000..2f15271f
--- /dev/null
+++ b/resources/styles/system.qss
@@ -0,0 +1,39 @@
+OverlayWidget, OverlayWidget > * {
+        background-color: palette(window);
+}
+
+#mainContent, #mainContent > * {
+        background-color: palette(base);
+}
+
+TimelineView, TimelineView > *, TimelineItem, TimelineItem > * {
+        background-color: palette(base);
+}
+
+FlatButton {
+        qproperty-foregroundColor: palette(text);
+}
+
+RoomInfoListItem {
+        qproperty-highlightedBackgroundColor: palette(highlight);
+        qproperty-hoverBackgroundColor: palette(dark);
+        qproperty-backgroundColor: palette(window);
+
+        qproperty-titleColor: palette(text);
+        qproperty-subtitleColor: palette(text);
+
+        qproperty-highlightedTitleColor: palette(text);
+        qproperty-highlightedSubtitleColor: palette(text);
+}
+
+LoadingIndicator {
+        qproperty-color: palette(text);
+}
+
+#ChatPageLoadSpinner {
+        qproperty-color: #acc7dc;
+}
+
+UserInfoWidget, UserInfoWidget > * {
+        background-color: palette(window);
+}