From aa2a4f4d05d9060a27396df69edbcf155cf2ee0f Mon Sep 17 00:00:00 2001
From: gooseman <16601315+geese-suck@users.noreply.github.com>
Date: Thu, 15 Sep 2022 18:45:31 -0700
Subject: [PATCH] classic dark rework + classic touchups

---
 files/assets/css/classic.css         | 114 +++++++-------
 files/assets/css/classic_dark.css    | 225 +--------------------------
 files/templates/util/assetcache.html |   4 +-
 3 files changed, 59 insertions(+), 284 deletions(-)

diff --git a/files/assets/css/classic.css b/files/assets/css/classic.css
index 46841788ab..72c2b50847 100644
--- a/files/assets/css/classic.css
+++ b/files/assets/css/classic.css
@@ -1,61 +1,59 @@
 /*common*/
 :root {
-    --muted: #666 ;
-    --black: #444;
-    --primary: #b40457;
-    --grey1: #888;
-    --grey2: #999;
-    --upvote: #ff8b60;
+	--muted: #666;
+	--black: #444;
+	--bgc: white;
+	--primary: #b40457;
+	--grey: #888;
+	--upvote: #ff8b60;
 	--downvote: #9393ff;
 	--sticky: #228822;
 }
 
 body {
-    background-image: url(/i/classic2.webp);
+	background-image: url(/i/classic2.webp);
+	background-color: var(--bgc) !important;
 }
 
 * {
-    border-color: var(--muted) !important;
+	border-color: var(--muted) !important;
 }
 
 #frontpage .container, #thread .container {
-    max-width: 2160px;
+	max-width: 2160px;
 }
 
 .sidebar {
-    background-color: white;
-    border-radius: 0px;
-    margin-top: 0;
-    margin-right: 0;
+	background-color: var(--bgc);
+	border-radius: 0px;
+	margin-top: 0;
+	margin-right: 0;
 }
 
 .no-gutters {
-    margin-top: 1rem;
+	margin-top: 1rem;
 }
 
-.navbar {
-    background-color: white !important
+#mobile-bottom-navigation-bar, .navbar {
+	background-color: var(--bgc) !important;
 }
 
 .btn-primary {
-    background-color: var(--primary) !important;
-    color:white;
+	background-color: var(--primary) !important;
+	color:white;
 }
 
 .dropdown-menu {
-    background-color: white;
+	background-color: var(--bgc);
 }
 
 .dropdown-item i {
-    color: var(--muted) !important;
-}
-
-#mobile-bottom-navigation-bar {
-    background-color: white !important;
+	color: var(--muted) !important;
 }
 
 input, textarea, .form-control {
-    background-color:white !important;
+	background-color: var(--bgc) !important;
+	border: 1px solid;
 }
 
 /*decoration*/
@@ -71,10 +69,6 @@ input, textarea, .form-control {
 	color: var(--muted);
 }
 
-.pronouns {
-    background-color: white;
-}
-
 .fa-thumbtack.text-admin {
 	color: var(--sticky);
 }
@@ -84,86 +78,82 @@ input, textarea, .form-control {
 }
 
 .tooltip {
-	background-color:white;
+	background-color: var(--bgc);
 }
 
 /*front page*/
 a.btn-block[href~="/submit"] {
-    display:none;
+	display:none;
 }
 
 .sorting {
-    float:left !important;
-    padding-top: 5px !important;
+	float:left !important;
+	padding-top: 5px !important;
 }
 
 #frontpage #main-content-col .row:first-child {
-    background-image: url(/i/classic1.webp);
-    background-position:center;
-    background-repeat: repeat-x;
-    margin-top: -12px;
-    margin-bottom:-15px;
+	background-image: url(/i/classic1.webp);
+	background-position:center;
+	background-repeat: repeat-x;
+	margin-top: -12px;
+	margin-bottom:-15px;
 }
 
 .sorting .btn {
-    color: white;
-    text-shadow: -1px -1px 0 black,1px -1px 0 black,-1px 1px 0 black,1px 1px 0 black;
-    border:none;
+	color: white;
+	text-shadow: -1px -1px 0 black,1px -1px 0 black,-1px 1px 0 black,1px 1px 0 black;
+	border:none;
 }
 
 #frontpage .sorting .text-primary {
-    color: yellow !important;
-    text-decoration: underline;
-    background-color:transparent !important;
+	color: yellow !important;
+	text-decoration: underline;
+	background-color:transparent !important;
 }
 
 #frontpage #dropdownMenuButton, #frontpage #dropdownMenuButton2, .sorting .dropdown i {
-    color: yellow;
+	color: yellow;
 }
 
 .card {
-    border-color: var(--grey2) !important;
+	border-color: var(--grey) !important;
 }
 
 .modal-content {
-    background-color: white
+	background-color: var(--bgc);
 }
 
 #frontpage .post-title a:not(:visited) {
-    color: #369;
+	color: #369;
 }
 
 #frontpage .card.stickied .post-title a {
-    color: var(--sticky);
+	color: var(--sticky);
 }
 
 /*posts*/
-#thread .container, #thread .card {
-    background: transparent !important;
-}
-
 @media (min-width: 992px){
-    #thread #main-content-col {
-        padding-left:3rem;
-        padding-right: 3rem;
-    }
+	#thread #main-content-col {
+		padding-left:3rem;
+		padding-right: 3rem;
+	}
 }
 
 .comment-section, .comment {
-    background-color: white;
+	background-color: var(--bgc);
 }
 
 blockquote {
-    background-color: var(--grey1);
-    color: white;
+	background-color: var(--grey);
+	color: white;
 }
 
 /*userpage*/
 .jumbotron {
-    color: var(--grey2);
+	color: var(--grey);
 }
 
 /*casino*/
 #casino-game-wrapper .row-cols-1, #casino-game-wrapper .row-cols-2 {
-    background-image: none !important;
+	background-image: none !important;
 }
diff --git a/files/assets/css/classic_dark.css b/files/assets/css/classic_dark.css
index 00fc81a826..9f8a46771e 100644
--- a/files/assets/css/classic_dark.css
+++ b/files/assets/css/classic_dark.css
@@ -1,222 +1,7 @@
-@import 'classic.css?v=4005';
+@import 'classic.css?v=4010';
 
-/*navbar*/
-.navbar-light, .navbar .container-fluid, #mobile-bottom-navigation-bar {
-	background-color: var(--black2) !important;
+:root {
+    --muted: #999 !important;
+    --black: #999 !important;
+    --bgc: #222 !important;
 }
-
-.form-inline.search input {
-	background-color: var(--black1) !important;
-}
-
-.nav-link.active {
-	color: var(--white) !important;
-	box-shadow: inset 0 -2px 0 var(--white) !important;
-}
-
-.nav-link {
-	color: var(--gray) !important;
-}
-
-/*common*/
-body, .card, #main-content-row {
-	background-color: var(--black2) !important;
-	/*background-image: var(--bg2);*/
-	color: var(--white);
-}
-
-.posts .card {
-	border-color: var(--black3) !important;
-}
-
-.arrow-up::before, .arrow-down::before, .score {
-	color: var(--black1);
-}
-
-.post-title a {
-	color: var(--gray) !important;
-}
-
-.flaggers, .flaggers a {
-	background-color: var(--black2) !important;
-	color: var(--black1) !important;
-	border-color: var(--gray);
-}
-
-.dropdown-menu, .dropdown-menu a {
-	color: var(--gray);
-	background-color: var(--black2);
-}
-
-.popover, .pop-username, .pop-bio, .popover-user-profile, .popover-user-profile * {
-	background-color: var(--black2);
-	color: var(--gray);
-	border-color: var(--black1) !important;
-}
-
-.text-muted {
-	color: var(--gray) !important;
-}
-
-/*frontpage*/
-#frontpage .sidebar {
-	background-color: var(--black2) !important;
-	color: var(--gray);
-}
-
-#frontpage .dropdown .btn {
-	background-color:transparent !important;
-	color:yellow;
-	text-shadow: -1px -1px 0 black, 1px -1px 0 black, -1px 1px 0 black, 1px 1px 0 black !important;
-	border-color: transparent;
-	font-size: 1.3rem;
-}
-
-#frontpage .dropdown-toggle, #frontpage i.fas.mr-1 {
-	color:yellow !important;
-}
-
-/*post*/
-.post-meta, .post-actions a, .post-actions button, .nav-link .fas, label, small, .comment-actions * {
-	color: var(--gray) !important;
-}
-
-.comment, .comment-text, .comment-section, .comment-body, .post-body {
-	background-color: var(--black2);
-	color: var(--gray) !important;
-}
-
-blockquote {
-	border-left: 2px solid #c5c1ad !important;
-	background-color: var(--black3) !important;
-	color: var(--gray) !important;
-}
-
-.form-control, .comment-box.form-control.rounded {
-	background-color: var(--black2) !important;
-	color: var(--black1) !important;
-}
-
-#thread #dropdownMenuButton {
-	background-color: var(--red) !important;
-	color: white !important;
-	border-color: transparent;
-}
-
-.btn.format {
-	background-color: transparent !important;
-	color: var(--black1) !important;
-	border-color: transparent !important;
-}
-
-/*leaderboard*/
-#settings2 .bg-white {
-	background-color: var(--black2) !important;
-}
-
-/*submit*/
-#submit .row.fixed-bottom {
-	background-color: var(--black2) !important
-}
-
-/*assorted patches I don't feel like categorizing*/
-#followers-table td {
-	color: var(--black1);
-}
-
-#mobile-bottom-navigation-bar .text-primary {
-	color: var(--red) !important;
-}
-
-#mobile-bottom-navigation-bar .text-muted {
-	color: var(--black1) !important;
-}
-
-#settings2 .nav-link.active .fas {
-	color: var(--gray) !important;
-}
-
-#navbarResponsive .nav-link {
-	color: var(--black1) !important;
-}
-
-.mobile-nav-icon {
-	color: var(--black1);
-}
-
-/*patch*/
-#settings2 .text-muted {
-	color: var(--black3)!important;
-}
-
-.btn-primary:hover, .btn-secondary:hover {
-	background-color: var(--red-hover) !important;
-	color: white!important;
-	border-color: var(--red-hover)
-}
-
-.dropdown-menu a:hover {
-	color: var(--red);
-	background-color: #fff;
-	font-weight: bold;
-}
-
-#navbarResponsive .nav-link:hover i {
-	color: var(--red) !important;
-}
-
-.btn-secondary:focus, .btn-secondary.focus {
-	box-shadow: none;
-	background-color: white!important;
-	color: var(--red)!important;
-	border-color: var(--red);
-}
-
-a.nav-link:hover {
-	color: white !important
-}
-
-.nav.settings-nav {
-	border: 1px solid var(--red-hover)
-}
-
-#thread .anchor.comment {
-	border-left: 2px solid var(--black1)!important;
-}  
-
-.notifs .comment-collapse-desktop {
-	border-left: 2px solid var(--black1)!important;
-}
-
-.srd {
-	background-color: var(--black3) !important
-}
-
-#navbar .form-control.w-100 {
-	color: var(--white) !important;
-}
-
-/*chat*/
-.chat-message {
-	color: var(--white) !important;
-}
-
-.sidebar
-{
-    background-color: #202020 !important;
-    border-radius: 0px;
-    margin-top: 0px;
-}
-
-.modal-content {
-	background-color: var(--black2);
-}
-
-.tooltip-inner {
-	color: #d8d8d8 !important;
-	background-color: #313131 !important;
-}
-
-h5.post-title a:visited {
-	color: #6e6e6e !important;
-}
\ No newline at end of file
diff --git a/files/templates/util/assetcache.html b/files/templates/util/assetcache.html
index 3417131218..98328a38ee 100644
--- a/files/templates/util/assetcache.html
+++ b/files/templates/util/assetcache.html
@@ -3,8 +3,8 @@ set CACHE_VER = {
 	'css/main.css': 4025,
 	'css/catalog.css': 4007,
 	'css/4chan.css': 4007,
-	'css/classic.css': 4009,
-	'css/classic_dark.css': 4007,
+	'css/classic.css': 4010,
+	'css/classic_dark.css': 4008,
 	'css/coffee.css': 4007,
 	'css/dark.css': 4007,
 	'css/dramblr.css': 4007,