From ddee1e3bb5b7bc1c765e1dc768d64797da0b57bb Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Fri, 1 Dec 2017 15:34:21 -0500
Subject: [PATCH] A bunch of CSS tweaks. Add chat appearance features to
 whisper messages. Fix various layout options now that the player has been
 modified for Mini Player support. Fix alternating row colors and subscription
 messages.

---
 .../css_tweaks/styles/chat-borders-3d-inset.scss   | 14 ++++++++++++++
 .../modules/css_tweaks/styles/chat-borders-3d.scss | 14 ++++++++++++++
 .../css_tweaks/styles/chat-borders-wide.scss       | 14 ++++++++++++++
 .../modules/css_tweaks/styles/chat-borders.scss    | 14 ++++++++++++++
 .../modules/css_tweaks/styles/chat-font.scss       |  1 +
 .../modules/css_tweaks/styles/chat-rows.scss       | 11 ++++++++---
 .../modules/css_tweaks/styles/chat-width.scss      |  2 +-
 .../css_tweaks/styles/minimal-navigation.scss      |  6 ++++++
 .../modules/css_tweaks/styles/swap-sidebars.scss   |  1 +
 src/sites/twitch-twilight/styles/fixes.scss        |  4 ++++
 src/sites/twitch-twilight/styles/main.scss         |  3 ++-
 11 files changed, 79 insertions(+), 5 deletions(-)
 create mode 100644 src/sites/twitch-twilight/styles/fixes.scss

diff --git a/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-borders-3d-inset.scss b/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-borders-3d-inset.scss
index c53241b1..328e2247 100644
--- a/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-borders-3d-inset.scss
+++ b/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-borders-3d-inset.scss
@@ -1,3 +1,7 @@
+.thread-message__message,
+.thread-message__timestamp,
+.thread-message__warning,
+
 .chat-line__message,
 .chat-line__moderation,
 .chat-line__status,
@@ -16,4 +20,14 @@
 	&:first-child {
 		border-top-color: transparent !important;
 	}
+}
+
+.thread-message__message,
+.thread-message__timestamp,
+.thread-message__warning {
+	padding-top: 0 !important;
+
+	& > .pd-y-05 {
+		padding-top: calc(.5rem - 1px) !important;
+	}
 }
\ No newline at end of file
diff --git a/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-borders-3d.scss b/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-borders-3d.scss
index 5eaa40a2..f12e06e3 100644
--- a/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-borders-3d.scss
+++ b/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-borders-3d.scss
@@ -1,3 +1,7 @@
+.thread-message__message,
+.thread-message__timestamp,
+.thread-message__warning,
+
 .chat-line__message,
 .chat-line__moderation,
 .chat-line__status,
@@ -16,4 +20,14 @@
 	&:first-child {
 		border-top-color: transparent !important;
 	}
+}
+
+.thread-message__message,
+.thread-message__timestamp,
+.thread-message__warning {
+	padding-top: 0 !important;
+
+	& > .pd-y-05 {
+		padding-top: calc(.5rem - 1px) !important;
+	}
 }
\ No newline at end of file
diff --git a/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-borders-wide.scss b/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-borders-wide.scss
index 3a36f602..266b05c5 100644
--- a/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-borders-wide.scss
+++ b/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-borders-wide.scss
@@ -1,3 +1,7 @@
+.thread-message__message,
+.thread-message__timestamp,
+.thread-message__warning,
+
 .chat-line__message,
 .chat-line__moderation,
 .chat-line__status,
@@ -14,4 +18,14 @@
 	&:first-child {
 		border-top-color: transparent !important;
 	}
+}
+
+.thread-message__message,
+.thread-message__timestamp,
+.thread-message__warning {
+	padding-top: 0 !important;
+
+	& > .pd-y-05 {
+		padding-top: calc(.5rem - 1px) !important;
+	}
 }
\ No newline at end of file
diff --git a/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-borders.scss b/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-borders.scss
index ae72edf0..c2ec26ee 100644
--- a/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-borders.scss
+++ b/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-borders.scss
@@ -1,3 +1,7 @@
+.thread-message__message,
+.thread-message__timestamp,
+.thread-message__warning,
+
 .chat-line__message,
 .chat-line__moderation,
 .chat-line__status,
@@ -14,4 +18,14 @@
 	&:last-child:nth-child(odd) {
 		border-bottom-color: transparent !important;
 	}
+}
+
+.thread-message__message,
+.thread-message__timestamp,
+.thread-message__warning {
+	padding-bottom: 0 !important;
+
+	& > .pd-y-05 {
+		padding-bottom: calc(.5rem - 1px) !important;
+	}
 }
\ No newline at end of file
diff --git a/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-font.scss b/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-font.scss
index 8d4ef20c..6a6fe9d1 100644
--- a/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-font.scss
+++ b/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-font.scss
@@ -1,3 +1,4 @@
+.whispers-thread__content,
 .chat-list {
 	font-size: var(--ffz-chat-font-size);
 	line-height: var(--ffz-chat-line-height);
diff --git a/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-rows.scss b/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-rows.scss
index 2fc500a7..8dd7d3b3 100644
--- a/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-rows.scss
+++ b/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-rows.scss
@@ -1,15 +1,20 @@
+.thread-message__message,
+.thread-message__timestamp,
+.thread-message__warning,
+
 .chat-line__moderation,
 .chat-line__status,
 .chat-line__raid,
+.chat-list__lines .chat-line__subscribe,
 .chat-line__subscribe,
 .chat-line__message {
-	background-color: transparent;
+	background-color: transparent !important;
 
 	&:nth-child(2n+0) {
-		background-color: rgba(0,0,0,0.1);
+		background-color: rgba(0,0,0,0.1) !important;
 
 		.theme--dark & {
-			background-color: rgba(255,255,255,0.05);
+			background-color: rgba(255,255,255,0.05) !important;
 		}
 	}
 }
diff --git a/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-width.scss b/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-width.scss
index 815a321c..d248212f 100644
--- a/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-width.scss
+++ b/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-width.scss
@@ -4,7 +4,7 @@ body .whispers--theatre-mode.whispers--right-column-expanded {
 
 body .persistent-player--theatre,
 body .channel-page__video-player--theatre-mode {
-	width: calc(100% - var(--ffz-chat-width));
+	width: calc(100% - var(--ffz-chat-width)) !important;
 }
 
 body .video-watch-page__right-column,
diff --git a/src/sites/twitch-twilight/modules/css_tweaks/styles/minimal-navigation.scss b/src/sites/twitch-twilight/modules/css_tweaks/styles/minimal-navigation.scss
index 483c88ad..e73af813 100644
--- a/src/sites/twitch-twilight/modules/css_tweaks/styles/minimal-navigation.scss
+++ b/src/sites/twitch-twilight/modules/css_tweaks/styles/minimal-navigation.scss
@@ -2,6 +2,8 @@
 	top: 1rem !important;
 
 	.top-nav {
+		z-index: 9999;
+
 		top: -4rem !important;
 		transition: top ease-in-out 75ms, bottom ease-in-out 75ms;
 
@@ -9,4 +11,8 @@
 			top: 0 !important;
 		}
 	}
+
+	.channel-header {
+		top: -4rem;
+	}
 }
\ No newline at end of file
diff --git a/src/sites/twitch-twilight/modules/css_tweaks/styles/swap-sidebars.scss b/src/sites/twitch-twilight/modules/css_tweaks/styles/swap-sidebars.scss
index af5e7fca..470fbd56 100644
--- a/src/sites/twitch-twilight/modules/css_tweaks/styles/swap-sidebars.scss
+++ b/src/sites/twitch-twilight/modules/css_tweaks/styles/swap-sidebars.scss
@@ -38,6 +38,7 @@
 	left: 0 !important;
 }
 
+.persistent-player--theatre,
 .channel-page__video-player--theatre-mode {
 	left: unset !important;
 	right: 0;
diff --git a/src/sites/twitch-twilight/styles/fixes.scss b/src/sites/twitch-twilight/styles/fixes.scss
new file mode 100644
index 00000000..0eb46621
--- /dev/null
+++ b/src/sites/twitch-twilight/styles/fixes.scss
@@ -0,0 +1,4 @@
+.theme--dark .live-channel-card__boxart {
+	border-right: none;
+	border-bottom: none;
+}
\ No newline at end of file
diff --git a/src/sites/twitch-twilight/styles/main.scss b/src/sites/twitch-twilight/styles/main.scss
index f19abbf8..56d70d2c 100644
--- a/src/sites/twitch-twilight/styles/main.scss
+++ b/src/sites/twitch-twilight/styles/main.scss
@@ -5,4 +5,5 @@
 @import 'player';
 @import 'channel';
 
-@import 'chat';
\ No newline at end of file
+@import 'chat';
+@import 'fixes';
\ No newline at end of file