From 280e7275a691324ac8fa7bfb829a56796fd825d7 Mon Sep 17 00:00:00 2001
From: Ben Rog-Wilhelm <zorba@pavlovian.net>
Date: Sun, 21 Aug 2022 06:16:39 -0500
Subject: [PATCH] Rejigger theme pretty heavily. I apologize for this change
 not being neatly split apart in any way.

---
 files/assets/css/TheMotte.css                 |  12 +-
 files/assets/css/main.css                     | 302 ++++----
 .../assets/js/comments+submission_listing.js  |   2 +-
 files/templates/comments.html                 |   2 +-
 files/templates/submission.html               |   2 +-
 files/templates/submission_listing.html       | 696 ++++++++----------
 6 files changed, 490 insertions(+), 526 deletions(-)

diff --git a/files/assets/css/TheMotte.css b/files/assets/css/TheMotte.css
index c5f51bcb9..5f624d1d1 100644
--- a/files/assets/css/TheMotte.css
+++ b/files/assets/css/TheMotte.css
@@ -6,12 +6,16 @@
 
 	--primary-dark1: #165476;
 	--primary-dark2: #134662;
+	--primary-dark3: #1d323d;
 
 	--primary-light1: #2280B3;
 	--primary-light2: #2F9CD7;
 
-	--dark: #c7c7c7;
+	--primary-muted: #95a9b4;
+
+	--dark: #686868;
 	--secondary: #c7c7c7;
+	--tertiary: #e0e0e0;
 	--gray: #c7c7c7;
 	--gray-300: #c7c7c7;
 	--gray-400: #cfcfcf;
@@ -21,12 +25,13 @@
 	--gray-800: #ffffff;
 	--gray-900: #ffffff;
 	--light: #ffffff;
-	--muted: #1e1e1e;
+	--muted: #9e9d9d;
 	--gray-100: #1e1e1e;
 	--gray-200: #1e1e1e;
 	--white: #1e1e1e;
 	--black: #303030;
 	--background: #ffffff;
+	--background-odd: #fafafa;
 }
 
 * {
@@ -166,7 +171,8 @@ div.deleted.banned {
 #search .post-info,
 #userpage .post-info,
 #frontpage .post-info {
-	display:flex;
+	display: flex;
+	flex-wrap: wrap;
 }
 #search .post-actions,
 #userpage .post-actions,
diff --git a/files/assets/css/main.css b/files/assets/css/main.css
index 9748726ae..f8c884d01 100644
--- a/files/assets/css/main.css
+++ b/files/assets/css/main.css
@@ -519,29 +519,29 @@ textarea.form-control {
 		align-items: center;
 		justify-content: center;
 		margin-bottom: 0;
-}
+	}
 	.form-inline .form-group {
 		display: flex;
 		flex: 0 0 auto;
 		flex-flow: row wrap;
 		align-items: center;
 		margin-bottom: 0;
-}
+	}
 	.form-inline .form-control {
 		display: inline-block;
 		width: auto;
 		vertical-align: middle;
-}
+	}
 	.form-inline .input-group {
 		width: auto;
-}
+	}
 	.form-inline .custom-control {
 		align-items: center;
 		justify-content: center;
-}
+	}
 	.form-inline .custom-control-label {
 		margin-bottom: 0;
-}
+	}
 }
 .btn {
 	display: inline-block;
@@ -797,7 +797,7 @@ input[type=submit].btn-block, input[type=reset].btn-block, input[type=button].bt
 	.dropdown-menu-lg-left {
 		right: auto;
 		left: 0;
-}
+	}
 }
 .dropup .dropdown-menu {
 	top: auto;
@@ -1142,65 +1142,65 @@ input[type=submit].btn-block, input[type=reset].btn-block, input[type=button].bt
 	.navbar-expand-md > .container, .navbar-expand-md > .container-fluid {
 		padding-right: 0;
 		padding-left: 0;
-}
+	}
 }
 @media (min-width: 768px) {
 	.navbar-expand-md {
 		flex-flow: row nowrap;
 		justify-content: flex-start;
-}
+	}
 	.navbar-expand-md .navbar-nav {
 		flex-direction: row;
-}
+	}
 	.navbar-expand-md .navbar-nav .dropdown-menu {
 		position: absolute;
-}
+	}
 	.navbar-expand-md .navbar-nav .nav-link {
 		padding-right: 0.5rem;
 		padding-left: 0.5rem;
-}
+	}
 	.navbar-expand-md > .container, .navbar-expand-md > .container-fluid {
 		flex-wrap: nowrap;
-}
+	}
 	.navbar-expand-md .navbar-collapse {
 		display: flex !important;
 		flex-basis: auto;
-}
+	}
 	.navbar-expand-md .navbar-toggler {
 		display: none;
-}
+	}
 }
 @media (max-width: 991.98px) {
 	.navbar-expand-lg > .container, .navbar-expand-lg > .container-fluid {
 		padding-right: 0;
 		padding-left: 0;
-}
+	}
 }
 @media (min-width: 992px) {
 	.navbar-expand-lg {
 		flex-flow: row nowrap;
 		justify-content: flex-start;
-}
+	}
 	.navbar-expand-lg .navbar-nav {
 		flex-direction: row;
-}
+	}
 	.navbar-expand-lg .navbar-nav .dropdown-menu {
 		position: absolute;
-}
+	}
 	.navbar-expand-lg .navbar-nav .nav-link {
 		padding-right: 0.5rem;
 		padding-left: 0.5rem;
-}
+	}
 	.navbar-expand-lg > .container, .navbar-expand-lg > .container-fluid {
 		flex-wrap: nowrap;
-}
+	}
 	.navbar-expand-lg .navbar-collapse {
 		display: flex !important;
 		flex-basis: auto;
-}
+	}
 	.navbar-expand-lg .navbar-toggler {
 		display: none;
-}
+	}
 }
 .navbar-light .navbar-brand {
 	color: rgba(0, 0, 0, 0.9);
@@ -1249,7 +1249,6 @@ input[type=submit].btn-block, input[type=reset].btn-block, input[type=button].bt
 	flex-direction: column;
 	min-width: 0;
 	word-wrap: break-word;
-	background-color: #fff;
 	background-clip: border-box;
 	border: 1px solid rgba(0, 0, 0, 0.125);
 	border-radius: 0.35rem;
@@ -1277,11 +1276,16 @@ input[type=submit].btn-block, input[type=reset].btn-block, input[type=button].bt
 .card-text:last-child {
 	margin-bottom: 0;
 }
+
+.card-block {
+	gap: 0.4rem;	
+}
 .card-header {
 	padding: 0.75rem 1.25rem;
 	margin-bottom: 0;
 	background-color: rgba(0, 0, 0, 0.03);
 	border-bottom: 1px solid rgba(0, 0, 0, 0.125);
+	align-self: center;
 }
 .card-header:first-child {
 	border-radius: calc(0.35rem - 1px) calc(0.35rem - 1px) 0 0;
@@ -1290,9 +1294,7 @@ input[type=submit].btn-block, input[type=reset].btn-block, input[type=button].bt
 	border-top: 0;
 }
 .card-footer {
-	padding: 0.75rem 1.25rem;
-	background-color: rgba(0, 0, 0, 0.03);
-	border-top: 1px solid rgba(0, 0, 0, 0.125);
+	padding: 0 1.25rem;
 }
 .card-footer:last-child {
 	border-radius: 0 0 calc(0.35rem - 1px) calc(0.35rem - 1px);
@@ -1314,11 +1316,11 @@ input[type=submit].btn-block, input[type=reset].btn-block, input[type=button].bt
 		column-gap: 1.25rem;
 		orphans: 1;
 		widows: 1;
-}
+	}
 	.card-columns .card {
 		display: inline-block;
 		width: 100%;
-}
+	}
 }
 .pagination {
 	display: flex;
@@ -1443,7 +1445,7 @@ a.badge-danger:focus, a.badge-danger.focus {
 @media (min-width: 576px) {
 	.jumbotron {
 		padding: 4rem 2rem;
-}
+	}
 }
 .jumbotron-fluid {
 	padding-right: 0;
@@ -1738,29 +1740,29 @@ button.close {
 	.modal-dialog {
 		max-width: 500px;
 		margin: 1.75rem auto;
-}
+	}
 	.modal-dialog-scrollable {
 		max-height: calc(100% - 3.5rem);
-}
+	}
 	.modal-dialog-scrollable .modal-content {
 		max-height: calc(100vh - 3.5rem);
-}
+	}
 	.modal-dialog-centered {
 		min-height: calc(100% - 3.5rem);
-}
+	}
 	.modal-dialog-centered::before {
 		height: calc(100vh - 3.5rem);
-}
+	}
 }
 @media (min-width: 992px) {
 	.modal-xl {
 		max-width: 800px;
-}
+	}
 }
 @media (min-width: 1200px) {
 	.modal-xl {
 		max-width: 1140px;
-}
+	}
 }
 .tooltip {
 	position: absolute;
@@ -2386,7 +2388,7 @@ a.bg-light:hover, a.bg-light:focus, button.bg-light:hover, button.bg-light:focus
 		margin-bottom: 0.25rem !important;
 }
 	.mr-md-2 {
-		margin-right: 0.5rem !important;
+		margin-right: 0.8rem !important;
 }
 	.mb-md-2 {
 		margin-bottom: 0.5rem !important;
@@ -3067,6 +3069,7 @@ small, .small {
 	text-align: center;
 	word-break: keep-all;
 	min-width: 40px;
+	line-height: 1.4;
 }
 #thread .voting {
 	min-width: 10px;
@@ -3074,7 +3077,7 @@ small, .small {
 	overflow-wrap: normal;
 }
 #frontpage .voting, #search .voting, #userpage .voting {
-	margin: auto 0;
+	margin: 0 0;
 }
 .active.arrow-up::before {
 	color: var(--primary);
@@ -3082,7 +3085,7 @@ small, .small {
 .arrow-up::before {
 	cursor: pointer;
 	font-size: 1.3rem;
-	color: var(--gray-200);
+	color: var(--muted);
 	font-family: "font awesome 5 pro" !important;
 	font-weight: 900;
 	content: "\f357";
@@ -3097,7 +3100,7 @@ small, .small {
 .arrow-down::before {
 	cursor: pointer;
 	font-size: 1.3rem;
-	color: var(--gray-200);
+	color: var(--muted);
 	font-family: "font awesome 5 pro" !important;
 	font-weight: 900;
 	content: "\f354";
@@ -3260,8 +3263,19 @@ small, .small {
 	padding: 0.5rem 1rem;
 	border-bottom: 0.1px solid var(--gray-400);
 }
-.card {
-	background-color: var(--gray-900);
+.card-container {
+	background-color: var(--background);
+}
+@media (min-width: 768px) {
+	.card-container {
+		padding-right: 1em;
+	}
+}
+.card-container ~ .card-container {
+	border-top: 1px solid var(--tertiary);
+}
+.card-container:nth-child(odd) {
+	background-color: var(--background-odd);
 }
 #thread .card {
 	background-color: var(--background);
@@ -3270,36 +3284,25 @@ small, .small {
 	border-top-left-radius: 0.35rem;
 	border-top-right-radius: 0.35rem;
 }
-#frontpage .posts .card, #userpage .posts .card, #search .posts .card {
-	border-width: 0.1px 0.1px 0 0.1px;
-	border-color: #303030;
-	border-style: solid;
-	border-radius: 0;
-	padding: 0.5rem;
-	padding-bottom: 0.1rem !important;
-}
-#frontpage .posts .card:hover, #userpage .posts .card:hover, #search .posts .card:hover {
-	background-color: var(--gray-600);
-}
 .post-title {
-	font-size: 16px;
+	font-size: 1.4rem;
 	font-weight: 600;
 	word-break: break-word;
 	overflow: hidden;
 }
 .post-title a {
-	color: var(--black);
+	color: var(--primary);
 }
 .post-title a:hover, .post-title a:active, .post-title a:focus {
 	text-decoration: none;
 	color: var(--primary);
 }
 #frontpage .post-title a {
-	color: var(--black);
+	color: var(--primary);
 }
 #frontpage .post-title a:hover, #frontpage .post-title a:active, #frontpage .post-title a:focus {
 	text-decoration: none;
-	color: var(--black);
+	color: var(--primary);
 }
 .stretched-link a:hover {
 	color: #6f42c1;
@@ -3373,14 +3376,32 @@ small, .small {
 	width: 1.25rem;
 	font-size: 1rem;
 }
+.post-info {
+	font-size: 0.8rem;
+}
+.post-author {
+	color: var(--muted);
+}
+.post-author a {
+	color: var(--primary-muted);
+}
+.post-author > * {
+	margin-right: 0.3em;
+	display: inline-block;
+}
+.post-author .user-name {
+	color: var(--primary-muted);
+}
+.post-traffic-info {
+	color: var(--dark);
+}
 .post-actions {
 	position: relative;
 	color: var(--muted);
 	font-weight: 600;
-	font-size: 12px;
+	white-space: nowrap;
 }
 .post-actions .fa, .post-actions .fas, .post-actions .far {
-	font-size: 12px;
 	margin-right: 0.5rem;
 	width: 1rem;
 }
@@ -3500,19 +3521,19 @@ small, .small {
 	color: var(--white);
 }
 .post-actions a, .post-actions button {
-	color: var(--gray-100);
+	color: var(--muted);
 	text-decoration: none;
 	text-transform: none;
 }
-.post-actions a, .post-actions button:hover {
+.post-actions a:hover, .post-actions button:hover {
 	color: var(--black);
 }
 .post-actions .dropdown-item:hover {
 	color: var(--black);
 }
 .post-img {
-	width: 100px;
-	height: 70px;
+	width: 90px;
+	height: 60px;
 	object-fit: cover;
 	border: 0.1px solid var(--primary);
 	border-radius: 0.35rem;
@@ -3521,7 +3542,7 @@ small, .small {
 }
 @media (max-width: 767.98px) {
 	.post-img {
-		width: 80px;
+		width: 60px;
 		height: 60px;
 }
 }
@@ -4034,239 +4055,224 @@ pre .com, code .com {
 @media (max-width: 767.98px) {
 	html {
 		font-size: 14px;
-}
+	}
 	.container {
 		overflow: hidden;
 		max-width: none;
-}
+	}
 	body, #settings, #notifications, #submit {
 		background-color: var(--background);
-}
+	}
 	#thread, #userpage {
 		background-color: var(--gray-600);
-}
+	}
 	.custom-gutters, .user-gutters {
-		padding-left: 2px;
-		padding-right: 2px;
-}
+		padding-left: 0px;
+		padding-right: 0px;
+	}
 	.navbar.bg-primary {
 		background-color: var(--dark) !important;
-}
+	}
 	.navbar-nav {
 		height: 100vh;
-}
+	}
 	.navbar-nav .nav-link, .navbar-expand-md .navbar-nav .nav-link {
 		padding: 0.5rem;
-}
+	}
 	.navbar-dark .navbar-nav .nav-link:hover {
 		background-color: transparent;
 		border-radius: 0;
-}
+	}
 	.navbar-dark .navbar-nav .nav-link:active {
 		background-color: rgba(0, 0, 0, 0.15);
 		border-radius: 0;
-}
+	}
 	.navbar-dark .navbar-nav .nav-link .fa, .navbar-dark .navbar-nav .nav-link .fas, .navbar-dark .navbar-nav .nav-link .far, .navbar-dark .navbar-nav .nav-link .fab {
 		font-size: 1rem;
-}
+	}
 	.navbar-light .navbar-nav .nav-link .fa, .navbar-light .navbar-nav .nav-link .fas, .navbar-light .navbar-nav .nav-link .far, .navbar-light .navbar-nav .nav-link .fab {
 		color: var(--primary);
 		font-size: 1.25rem;
-}
+	}
 	#fixed-bar-mobile {
 		box-shadow: none;
-}
+	}
 	.mobile-nav-icon {
 		padding: 0.25rem 0.6rem;
-}
+	}
 	#thread, #submit {
 		background-color: var(--light);
-}
+	}
 	#search .search-results.card {
 		border-bottom: 0.1px solid var(--gray-400);
 		border-width: 0 0 0.1px 0;
 		border-radius: 0;
-}
+	}
 	#frontpage .posts .card, #userpage .posts .card, #search .posts .card {
 		padding: 7px;
 		border-width: 0 0 0.1px 0;
-}
+	}
 	#frontpage .posts .card:first-of-type, #userpage .posts .card:first-of-type, #search .posts .card:first-of-type {
 		border-radius: 0;
-}
+	}
 	#frontpage .posts .card, #userpage .posts .card, #search .posts .card, #userpage .posts .card {
-		background-color: var(--gray-600);
 		padding-bottom: 0.5rem !important;
-}
+	}
 	#frontpage .posts .card:hover .post-title a, #search .posts .card:hover .post-title a {
 		color: var(--primary);
-}
+	}
 	#frontpage .posts .card .post-img, #search .posts .card .post-img {
 		z-index: 3;
-}
+	}
 	.toast {
 		bottom: 1.5rem;
 		margin: 0 auto;
 		left: 0;
 		right: 0;
-}
-	#thread .card {
-		background-color: var(--gray-600);
-}
-	.card {
-		background-color: var(--gray-600);
-}
+	}
 	.posts, #thread #main-content-col {
 		box-shadow: none;
 		border: none;
 		border-radius: 0;
-}
+	}
 	#thread #main-content-col {
 		margin: 0;
-}
+	}
 	.post-title a {
 		color: var(--black);
-}
+	}
 	.post-title a:hover, .post-title a:active, .post-title a:focus {
 		color: var(--primary);
-}
+	}
 	#thread .voting {
 		min-width: 0;
 		margin-right: 0;
 		margin-top: 0;
-}
+	}
 	.voting {
 		font-weight: 400;
 		font-size: 1.2rem;
-}
+	}
 	#frontpage .voting, #search .voting, #userpage .voting {
 		margin: 0;
-}
+	}
 	.post-title {
-		font-size: 14px;
-		font-weight: 400;
+		font-size: 18px;
 		line-height: normal;
 		overflow: hidden;
-}
+	}
 	.post-meta {
 		font-size: 1rem;
-		padding-left: 3px;
-}
+	}
 	.post-actions {
 		font-weight: 400;
-}
+	}
 	.post-actions a, .post-actions button {
 		font-size: 1rem;
-		color: var(--gray-200);
-}
+	}
 	.post-actions .fa, .post-actions .fas, .post-actions .far {
 		font-size: 1rem;
-}
+	}
 	.post-actions .voting .fa, .post-actions .voting .fas, .post-actions .voting .far {
 		font-size: 1.25rem;
-}
+	}
 	.comment-actions .score {
 		color: var(--gray-200);
-}
+	}
 	.score {
 		color: var(--gray-200);
-}
-	.arrow-up::before, .arrow-down::before, .arrow-up:hover::before, .arrow-down:hover::before {
-		font-size: 1.5rem;
-		color: var(--gray-200);
-		opacity: 1;
-}
+	}
 	.active.arrow-up::before, .active.arrow-up:hover::before {
 		color: var(--primary);
-}
+	}
 	.active.arrow-down::before, .active.arrow-down:hover::before {
 		color: #38B2AC;
-}
+	}
 	.dropdown-actions a {
 		font-size: 1rem;
-}
+	}
 	.dropdown-actions .fa, .dropdown-actions .fas, .dropdown-actions .far {
 		font-size: 1rem;
-}
+	}
 	.comment-section {
 		background-color: var(--gray-600);
-}
+	}
 	.comment-section > .comment {
 		padding-left: 12px;
-}
+	}
 	.comment {
 		margin-top: 1.5rem;
-}
+	}
 	.comment.collapsed .user-info {
 		padding-top: 0.5rem;
-}
+	}
 	.comment.collapsed .comment-body:hover {
 		opacity: 0.5;
-}
+	}
 	.comment-actions .fa, .comment-actions .fas, .comment-actions .far {
 		color: var(--gray-100);
-}
+	}
 	.banner-pic-135 {
 		max-width: 100%;
-}
+	}
 	.x-scroll-parent {
 		overflow: hidden;
-}
+	}
 	.x-scroll {
 		width: 100%;
 		overflow-x: scroll;
 		white-space: nowrap;
 		scrollbar-width: none;
 		-ms-overflow-style: none;
-}
+	}
 	.x-scroll::-webkit-scrollbar {
 		width: 100%;
 		overflow-x: scroll;
 		white-space: nowrap;
 		background: transparent;
-}
+	}
 	#thread .post-title {
 		font-size: 16px;
-}
+	}
 	#submit .submission {
 		border: none;
-}
+	}
 	#submit .submission .body {
 		padding: 0;
-}
+	}
 	#submit .submission .footer {
 		background: transparent;
 		padding: 1rem 0;
-}
+	}
 	.footer .list-inline-item {
 		line-height: 3;
-}
+	}
 	.comments-count .total {
 		font-weight: 400;
 		font-size: 1rem;
-}
+	}
 	.comment-actions {
 		font-weight: 400;
 		font-size: 1.2rem;
-}
+	}
 	.user-name {
 		font-weight: 400;
-}
+	}
 	.comment .comment-body .user-name {
 		color: var(--black);
 		font-weight: 600;
-}
+	}
 	.pagination {
 		padding: 1rem;
-}
+	}
 	input[type=color], input[type=date], input[type=email], input[type=month], input[type=number], input[type=password], input[type=search], input[type=tel], input[type=text], input[type=time], input[type=url], input[type=week], select:focus, textarea {
 		font-size: 16px !important;
-}
+	}
 	textarea, input[type=text] {
 		-webkit-appearance: none;
 		-moz-appearance: none;
 		appearance: none;
-}
+	}
 }
 .bg-white {
 	background-color: var(--gray-600) !important;
@@ -5090,3 +5096,7 @@ th, td {
 .text-green {
 	color: green !important;
 }
+
+.mobile-comment-link {
+	color: var(--dark);
+}
\ No newline at end of file
diff --git a/files/assets/js/comments+submission_listing.js b/files/assets/js/comments+submission_listing.js
index 4f63f13ab..5cd9446fd 100644
--- a/files/assets/js/comments+submission_listing.js
+++ b/files/assets/js/comments+submission_listing.js
@@ -133,7 +133,7 @@ function send_note() {
 
 document.addEventListener("click", function(){
 	active = document.activeElement.getAttributeNode("class");
-	if (active && active.nodeValue == "user-name text-decoration-none"){
+	if (active && active.nodeValue == "user-name"){
 		pops = document.getElementsByClassName('popover')
 		if (pops.length > 1) pops[0].remove()
 	}
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 89b4752ee..682e53fab 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -202,7 +202,7 @@
 					{% if not c.author %}
 						{{c.print()}}
 					{% endif %}
-					<a href="/@{{c.author_name}}" class="user-name text-decoration-none" onclick='popclick({{c.author.json_popover(v) | tojson}})' data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="click" data-content-id="popover" role="button" tabindex="0" style="color:var(--primary-light1); font-size:12px; font-weight:bold;"><img loading="lazy" src="{{c.author.profile_url}}" class="profile-pic-25 mr-2"><span {% if c.author.patron and not c.distinguish_level %}class="patron" style="background-color:#{{c.author.namecolor}};"{% elif c.distinguish_level %}class="mod"{% endif %}>{{c.author_name}}</span></a>
+					<a href="/@{{c.author_name}}" class="user-name" onclick='popclick({{c.author.json_popover(v) | tojson}})' data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="click" data-content-id="popover" role="button" tabindex="0" style="font-size:12px; font-weight:bold;"><img loading="lazy" src="{{c.author.profile_url}}" class="profile-pic-25 mr-2"><span {% if c.author.patron and not c.distinguish_level %}class="patron" style="background-color:#{{c.author.namecolor}};"{% elif c.distinguish_level %}class="mod"{% endif %}>{{c.author_name}}</span></a>
 					{% if v and v.admin_level > 2 %}
 					<span 
 						class="usernote-link" 
diff --git a/files/templates/submission.html b/files/templates/submission.html
index c396ad9d0..7d2168664 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -184,7 +184,7 @@
 							{% if p.author.verified %}<i class="fas fa-badge-check align-middle ml-1 {% if p.author.verified=='Glowiefied' %}glow{% endif %}" style="color:{% if p.author.verifiedcolor %}#{{p.author.verifiedcolor}}{% else %}var(--primary){% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{p.author.verified}}"></i>
 							{% endif %}
 
-            				<a href="/@{{p.author_name}}" class="user-name text-decoration-none" onclick='popclick({{p.author.json_popover(v) | tojson}})' data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="click" data-content-id="popover" role="button" tabindex="0" style="color: var(--primary-light1); font-weight: bold"><img loading="lazy" src="{{p.author.profile_url}}" class="profile-pic-25 mr-2"><span {% if p.author.patron and not p.distinguish_level %}class="patron" style="background-color:#{{p.author.namecolor}};"{% elif p.distinguish_level %}class="mod"{% endif %}>{{p.author_name}}</span></a>{% if p.author.customtitle %}&nbsp;<bdi style="color: #{{p.author.titlecolor}}">&nbsp;{{p.author.customtitle | safe}}</bdi>{% endif %}
+            				<a href="/@{{p.author_name}}" class="user-name" onclick='popclick({{p.author.json_popover(v) | tojson}})' data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="click" data-content-id="popover" role="button" tabindex="0" style="font-weight: bold"><img loading="lazy" src="{{p.author.profile_url}}" class="profile-pic-25 mr-2"><span {% if p.author.patron and not p.distinguish_level %}class="patron" style="background-color:#{{p.author.namecolor}};"{% elif p.distinguish_level %}class="mod"{% endif %}>{{p.author_name}}</span></a>{% if p.author.customtitle %}&nbsp;<bdi style="color: #{{p.author.titlecolor}}">&nbsp;{{p.author.customtitle | safe}}</bdi>{% endif %}
 							{% if v and v.admin_level > 2 %}
 								<span 
 									class="usernote-link" 
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 33e498c4e..9182d0b09 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -49,415 +49,363 @@
 {% include 'usernote.html' %}
 
 {% for p in listing %}
+<div class="card-container">
 
-{% set ups=p.upvotes %}
-{% set downs=p.downvotes %}
-{% set score=ups-downs %}
+	{% set ups=p.upvotes %}
+	{% set downs=p.downvotes %}
+	{% set score=ups-downs %}
 
-{% if v %}
-	{% set voted= p.voted %}
-{% else %}
-	{% set voted=-2 %}
-{% endif %}
+	{% if v %}
+		{% set voted= p.voted %}
+	{% else %}
+		{% set voted=-2 %}
+	{% endif %}
 
-{% if v and p.filter_state == 'reported' and v.can_manage_reports() %}
-	<div id="flaggers-{{p.id}}" class="flaggers d-none">
-		<strong><i class="far fa-fw fa-flag"></i> Reports:</strong>
-		<a class="btn btn-primary" style="margin:1px 5px" onclick="filter_new_status({{p.id}}, 'normal')">Approve</a>
-		<a class="btn btn-secondary" style="margin:1px 5px" onclick="filter_new_status({{p.id}}, 'ignored')">Approve and Ignore</a>
-		<a class="btn btn-danger" style="margin:1px 5px" onclick="filter_new_status({{p.id}}, 'removed')">Remove</a>
-		<pre></pre>
-		<ul style="padding-left:20px; margin-bottom: 0;word-wrap:break-word">
-			{% for f in p.flags(v) %}
-				<li><a style="font-weight:bold" href="{{f.user.url}}">{{f.user.username}}</a>{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %}</li>
-			{% endfor %}
-		</ul>
-	</div>
-{% endif %}
+	{% if v and p.filter_state == 'reported' and v.can_manage_reports() %}
+		<div id="flaggers-{{p.id}}" class="flaggers d-none">
+			<strong><i class="far fa-fw fa-flag"></i> Reports:</strong>
+			<a class="btn btn-primary" style="margin:1px 5px" onclick="filter_new_status({{p.id}}, 'normal')">Approve</a>
+			<a class="btn btn-secondary" style="margin:1px 5px" onclick="filter_new_status({{p.id}}, 'ignored')">Approve and Ignore</a>
+			<a class="btn btn-danger" style="margin:1px 5px" onclick="filter_new_status({{p.id}}, 'removed')">Remove</a>
+			<pre></pre>
+			<ul style="padding-left:20px; margin-bottom: 0;word-wrap:break-word">
+				{% for f in p.flags(v) %}
+					<li><a style="font-weight:bold" href="{{f.user.url}}">{{f.user.username}}</a>{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %}</li>
+				{% endfor %}
+			</ul>
+		</div>
+	{% endif %}
 
-<div id="post-{{p.id}}" class="card{% if p.is_banned %} banned{% endif %}{% if p.deleted_utc %} deleted{% endif %}{% if p.stickied %} stickied{% endif %}{% if voted==1 %} upvoted{% elif voted==-1 %} downvoted{% endif %}{% if p.over_18 %} nsfw{% endif %}">
+	<div id="post-{{p.id}}" class="card{% if p.is_banned %} banned{% endif %}{% if p.deleted_utc %} deleted{% endif %}{% if p.stickied %} stickied{% endif %}{% if voted==1 %} upvoted{% elif voted==-1 %} downvoted{% endif %}{% if p.over_18 %} nsfw{% endif %}">
 
-	<div class="d-flex flex-row-reverse flex-md-row flex-nowrap justify-content-end">
+		<div class="d-flex flex-row flex-nowrap justify-content-end align-items-center">
 
-		{% if not postembed %}
-			<div class="voting my-2 d-none d-md-block pr-2">
-				{% if v and request.path.startswith('/@') and v.admin_level < 2 %}
+			{% if not postembed %}
+				<div class="voting my-0 my-md-2 d-block pr-2">
+					{% if v and request.path.startswith('/@') and v.admin_level < 2 %}
 
-					{% if voted==1 %}
-					<div class="mx-auto arrow-up post-{{p.id}}-up active"></div>
-					{% endif %}
+						{% if voted==1 %}
+						<div class="mx-auto arrow-up post-{{p.id}}-up active"></div>
+						{% endif %}
+
+						<span class="post-score-{{p.id}} score post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}{% if p.controversial %} controversial{% endif %}"{% if not p.is_banned %} data-bs-toggle="tooltip" data-bs-placement="right" title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
+
+						{% if voted==-1 %}
+							<div class="text-muted mx-auto arrow-down post-{{p.id}}-down active"></div>
+						{% endif %}
+
+					{% elif v %}
+
+					<div tabindex="0" role="button" onclick="vote('post', '{{p.id}}', '1', '{{v.id}}')" class="post-{{p.id}}-up mx-auto arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% endif %}"></div>
 
 					<span class="post-score-{{p.id}} score post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}{% if p.controversial %} controversial{% endif %}"{% if not p.is_banned %} data-bs-toggle="tooltip" data-bs-placement="right" title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
 
-					{% if voted==-1 %}
-						<div class="text-muted mx-auto arrow-down post-{{p.id}}-down active"></div>
+					<div {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} tabindex="0" role="button" onclick="vote('post', '{{p.id}}', '-1', '{{v.id}}')" class="post-{{p.id}}-down text-muted mx-auto arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% endif %}"></div>
+
+					{% else %}
+
+					<div tabindex="0" role="button" onclick="vote('post', '{{p.id}}', '1', '{{v.id}}')" class="post-{{p.id}}-up mx-auto arrow-up" onclick="location.href='/login';"></div>
+
+					<span class="post-{{p.id}}-score-none score{% if p.controversial %} controversial{% endif %}"{% if not p.is_banned %} data-bs-toggle="tooltip" data-bs-placement="right" title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
+
+					<div {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} tabindex="0" role="button" onclick="vote('post', '{{p.id}}', '-1', '{{v.id}}')" class="post-{{p.id}}-down text-muted mx-auto arrow-down" onclick="location.href='/login';"></div>
+
 					{% endif %}
 
-				{% elif v %}
+				</div>
+			{% endif %}
 
-				<div tabindex="0" role="button" onclick="vote('post', '{{p.id}}', '1', '{{v.id}}')" class="post-{{p.id}}-up mx-auto arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% endif %}"></div>
+			<div class="card-header bg-transparent border-0 d-flex flex-row flex-nowrap p-0 mr-3">
 
-				<span class="post-score-{{p.id}} score post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}{% if p.controversial %} controversial{% endif %}"{% if not p.is_banned %} data-bs-toggle="tooltip" data-bs-placement="right" title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
+				<div style="z-index: 3;">
+					{% if not p.url %}
+						<a {% if v and v.newtab and not g.webview %}target="_blank"{% endif %} href="{{p.permalink}}">
+							<img alt="post thumbnail" loading="lazy" src="{{p.thumb_url}}" class="post-img">
+						</a>
+					{% elif p.is_image %}
+						<img role="button" data-bs-toggle="modal" data-bs-target="#expandImageModal" onclick="expandDesktopImage('{{p.realurl(v)}}')" alt="post thumbnail" loading="lazy" src="{{p.thumb_url}}" class="post-img">
+					{% elif p.is_video %}
+						<a role="button" onclick="togglevideo({{p.id}})">
+							<img alt="post thumbnail" loading="lazy" src="{{p.thumb_url}}" class="post-img">
+						</a>
+					{% elif p.is_youtube %}
+						<a role="button" onclick="document.getElementById('video-{{p.id}}').classList.toggle('d-none')">
+							<img alt="post thumbnail" loading="lazy" src="{{p.thumb_url}}" class="post-img">
+						</a>
+					{% else %}
+						<a {% if not v or v.newtabexternal %}target="_blank"{% endif %} rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}">
+							<img alt="post thumbnail" loading="lazy" src="{{p.thumb_url}}" class="post-img">
+						</a>
+					{% endif %}
+				</div>
+			</div>
+			
+			
+			<div class="card-block d-flex flex-column text-left x-scroll-parent my-md-auto w-100">
 
-				<div {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} tabindex="0" role="button" onclick="vote('post', '{{p.id}}', '-1', '{{v.id}}')" class="post-{{p.id}}-down text-muted mx-auto arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% endif %}"></div>
+				<div class="post-meta text-left mb-md-2">
+					<h5 class="card-title post-title text-left mb-0 pb-0 pb-md-1">
+						<a id="{{p.id}}-title" {% if v and v.newtab and not g.webview %}target="_blank"{% endif %} href="{{p.permalink}}" class="{% if voted and v.id == AEVANN_ID %}visited{% endif %}">
+						{% if p.club %}<span class="patron font-weight-bolder mr-1" style="background-color:red; font-size:12px; line-height:2;">{{CC}}</span>{% endif %}
+						{% if p.flair %}<span class="patron font-weight-bolder mr-1" style="background-color:var(--primary); font-size:12px; line-height:2;">{{p.flair | safe}}</span>{% endif %}
+						{{p.realtitle(v) | safe}}
+					</a></h5>
 
-				{% else %}
+					{% if p.sub %}
+						<a href='/h/{{p.sub}}'>/h/{{p.sub}}</a>&nbsp;&nbsp;
+					{% endif %}
 
-				<div tabindex="0" role="button" onclick="vote('post', '{{p.id}}', '1', '{{v.id}}')" class="post-{{p.id}}-up mx-auto arrow-up" onclick="location.href='/login';"></div>
+					{% if p.sub and p.author.exiled_from(p.sub) %}
+						<a role="button"><i class="fas fa-campfire text-danger" data-bs-toggle="tooltip" data-bs-placement="bottom" title="User has been exiled from /h/{{p.sub}}"></i></a>
+					{% endif %}
+				</div>
 
-				<span class="post-{{p.id}}-score-none score{% if p.controversial %} controversial{% endif %}"{% if not p.is_banned %} data-bs-toggle="tooltip" data-bs-placement="right" title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
+				<div class="post-info text-left">
+					<div class="post-author">
+						<span class="post-traffic-info d-none d-md-inline-block">{{p.comment_count}} comments - {{p.views}} thread views</span>
 
-				<div {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} tabindex="0" role="button" onclick="vote('post', '{{p.id}}', '-1', '{{v.id}}')" class="post-{{p.id}}-down text-muted mx-auto arrow-down" onclick="location.href='/login';"></div>
+						{% if p.bannedfor %}
+							<a role="button"><i class="fas fa-hammer-crash text-danger" data-bs-toggle="tooltip" data-bs-placement="bottom" title="User was banned for this post{% if p.author.banned_by %} by @{{p.author.banned_by.username}}{% endif %}"></i></a>
+						{% endif %}
 
+						{% for a in p.awards|reverse %}
+							<i class="{{a.class_list}} px-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{a.title}} Award given by @{{a.user.username}}"></i>
+						{% endfor %}
+
+						{% if v and v.admin_level > 1 and p.author.shadowbanned %}
+							<i class="fas fa-user-times text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Shadowbanned by @{{p.author.shadowbanned}}"></i>
+						{% endif %}
+
+						{% if p.stickied %}
+							<i id='pinned-{{p.id}}' class="fas fa-thumbtack fa-rotate--45 text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Pinned by @{{p.stickied}}" {% if p.stickied_utc %}onmouseover="pinned_timestamp('pinned-{{p.id}}')" data-timestamp={{p.stickied_utc}} {% endif %}></i>
+						{% endif %}
+
+						{% if p.distinguish_level %}<i class="fas fa-broom text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{SITE_TITLE}} Admin, speaking officially"></i>{% endif %}
+						{% if p.is_pinned and request.path.startswith('/@') %}<i class="fas fa-thumbtack fa-rotate--45 text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Pinned to profile"></i>{% endif %}
+						{% if p.over_18 %}<span class="badge badge-danger text-small-extra mr-1">+18</span>{% endif %}
+						{% if p.is_bot %} <i class="fas fa-robot text-info" data-bs-toggle="tooltip" data-bs-placement="bottom"	title="Bot"></i>{% endif %}
+						{% if p.is_blocking %}<i class="fas fa-user-minus text-warning" data-bs-toggle="tooltip" data-bs-placement="bottom" title="You're blocking this user, but you can see this post because you're an admin."></i>{% endif %}
+						{% if p.is_blocked %}<i class="fas fa-user-minus text-danger" data-bs-toggle="tooltip" data-bs-placement="bottom" title="This user is blocking you."></i>{% endif %}
+						{% if p.private %}<span class="badge border-warning border-1 text-small-extra">Draft</span>{% endif %}
+						{% if v and p.filter_state == 'reported' and v.can_manage_reports() %}
+						<a class="btn btn-primary" id="report-btn-{{p.id}}" role="button" style="padding:1px 5px; font-size:10px"onclick="document.getElementById('flaggers-{{p.id}}').classList.toggle('d-none')">{{p.active_flags(v)}} Reports</a>
+						{% endif %}
+							
+
+						<span>
+							<span data-bs-toggle="tooltip" data-bs-placement="bottom" onmouseover="timestamp('timestamp-{{p.id}}','{{p.created_utc}}')" id="timestamp-{{p.id}}">{{p.age_string}} by </span>
+
+							{% if not p.author %}
+								{{p.print()}}
+							{% endif %}
+
+							{% if p.ghost %}
+								👻
+							{% else %}
+
+								{% if p.author.verified %}<i class="fas fa-badge-check align-middle ml-1 {% if p.author.verified=='Glowiefied' %}glow{% endif %}" style="color:{% if p.author.verifiedcolor %}#{{p.author.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{p.author.verified}}"></i>
+								{% endif %}
+								<a href="/@{{p.author_name}}" 
+									class="user-name" 
+
+									data-bs-placement="bottom" 
+									data-bs-toggle="popover" 
+									data-bs-trigger="click" 
+									data-content-id="popover" 
+									role="button" 
+									tabindex="0" 
+									style="font-weight: bold;">
+										<span 
+											{% if p.author.patron and not p.distinguish_level %}
+												class="patron" 
+												style="background-color:#{{p.author.namecolor}};"
+											{% elif p.distinguish_level %}
+												class="mod"
+											{% endif %}>{{p.author_name}}</span>
+								</a>{% if p.author.customtitle %}<bdi style="color: #{{p.author.titlecolor}}">&nbsp;&nbsp;{{p.author.customtitle | safe}}</bdi>{% endif %}
+								{% if v and v.admin_level > 2 %}
+									<span 
+										class="usernote-link" 
+										data-micromodal-trigger="modal-1" 
+										onclick='fillnote( {{p.author.json_popover(v) | tojson}}, {{p.id}}, null )'>_U_</span>
+								{% endif %}
+							{% endif %}
+						</span>
+						
+						<span>
+							({% if p.is_image %}image post{% elif p.is_video %}video post{% elif p.domain %}<a href="/search/posts/?q=domain%3A{{p.domain}}&sort=new&t=all" class="post-meta-domain" {% if v and v.newtab and not g.webview %}target="_blank"{% endif %}>{{p.domain|truncate(35, True)}}</a>{% else %}text post{% endif %})
+						</span>
+
+						{% if p.edited_utc %}
+							<span>Edited <span data-bs-toggle="tooltip" data-bs-placement="bottom" id="edited_timestamp-{{p.id}}" onmouseover="timestamp('edited_timestamp-{{p.id}}','{{p.edited_utc}}')">{{p.edited_string}}</span></span>
+						{% endif %}
+					</div>
+					<div class="post-actions d-none d-md-block">
+						<ul class="list-inline text-right d-flex">
+							{% if p.realbody(v) %}
+								<a class="list-inline-item" role="button" onclick="expandText('{{p.id}}')"><i class="fas fa-expand-alt mr-0 text-expand-icon-{{p.id}}"></i></a>
+							{% endif %}
+							{% include 'post_actions.html' %}
+						</ul>
+					</div>
+				</div>
+
+				<div class="card-footer d-md-none mt-auto {% if request.path == '/changelog' %}px-0{% endif %}">
+					<div class="post-actions">
+						<ul class="list-inline text-right d-flex">
+							<li class="list-inline-item mr-auto">
+								<a {% if v and v.newtab and not g.webview %}target="_blank"{% endif %} href="{{p.permalink}}">
+									<i class="fas fa-comment-dots mobile-comment-link"></i>{{p.comment_count}}
+									<span class="text-info d-none {{p.id}}-new-comments"></span>
+								</a>
+			
+								{% if v and v.admin_level > 1 %}
+									<a class="ml-2" role="button" data-bs-toggle="modal" data-bs-target="#adminModal-{{p.id}}">
+										<i class="fas fa-broom"></i>
+									</a>
+								{% endif %}
+			
+							</li>
+							
+							{% if p.realbody(v) and request.path != "/changelog"%}
+								<a class="list-inline-item" role="button" onclick="expandText('{{p.id}}')"><i class="fas fa-expand-alt mr-0 text-expand-icon-{{p.id}}"></i></a>
+							{% endif %}
+			
+							{% if v %}
+								<li class="list-inline-item">
+									<a role="button" data-bs-toggle="modal" data-bs-target="#actionsModal-{{p.id}}">
+										<i class="fas fa-ellipsis-h"></i>
+									</a>
+								</li>
+							{% endif %}
+						</ul>
+					</div>
+				</div>
+			
+				{% if v %}
+					<div class="modal fade d-md-none" id="actionsModal-{{p.id}}" tabindex="-1" role="dialog" aria-labelledby="actionsModalTitle" aria-hidden="true">
+						<div class="modal-dialog modal-dialog-centered" role="document">
+							<div class="modal-content">
+								<div class="modal-header p-3">
+									<h5 class="col modal-title text-center h6">More options</h5>
+									<button class="close position-absolute py-3" style="right: 1rem"data-bs-dismiss="modal" aria-label="Close">
+										<span aria-hidden="true"><i class="fas fa-times-circle text-gray-500"></i></span>
+									</button>
+								</div>
+								<div class="modal-body">
+									<ul class="list-group post-actions">
+										{% include "post_actions_mobile.html" %}
+									</ul>
+								</div>
+							</div>
+						</div>
+					</div>
 				{% endif %}
+			</div>
+		</div>
+	</div>
 
+	<script>
+		{% if not v or v.highlightcomments %}
+			showNewCommentCounts({{p.id}}, {{p.comment_count}})
+		{% endif %}
+	</script>
+
+
+	{% if v and v.admin_level > 1 %}
+		{% include "post_admin_actions_mobile.html" %}
+	{% endif %}
+
+
+	{% if not p.club or v and (v.paid_dues or v.id == p.author_id) %}
+		{% if p.realbody(v) %}
+			<div class="d-none card rounded border pt-3 pb-2 my-2" id="post-text-{{p.id}}">
+				{{p.realbody(v) | safe}}
 			</div>
 		{% endif %}
 
-		<div class="card-header bg-transparent border-0 d-flex flex-row flex-nowrap pl-2 pl-md-0 p-0 mr-md-2">
-
-			<div style="z-index: 3;">
-				{% if not p.url %}
-					<a {% if v and v.newtab and not g.webview %}target="_blank"{% endif %} href="{{p.permalink}}">
-						<img alt="post thumnail" loading="lazy" src="{{p.thumb_url}}" class="post-img">
-					</a>
-				{% elif p.is_image %}
-					<img role="button" data-bs-toggle="modal" data-bs-target="#expandImageModal" onclick="expandDesktopImage('{{p.realurl(v)}}')" alt="post thumnail" loading="lazy" src="{{p.thumb_url}}" class="post-img">
-				{% elif p.is_video %}
-					<a role="button" onclick="togglevideo({{p.id}})">
-						<img alt="post thumnail" loading="lazy" src="{{p.thumb_url}}" class="post-img">
-					</a>
-				{% elif p.is_youtube %}
-					<a role="button" onclick="document.getElementById('video-{{p.id}}').classList.toggle('d-none')">
-						<img alt="post thumnail" loading="lazy" src="{{p.thumb_url}}" class="post-img">
-					</a>
-				{% else %}
-					<a {% if not v or v.newtabexternal %}target="_blank"{% endif %} rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}">
-						<img alt="post thumnail" loading="lazy" src="{{p.thumb_url}}" class="post-img">
-					</a>
-				{% endif %}
-			</div>
-
-
-		</div>
-		 
-		 
-		<div class="card-block text-left x-scroll-parent my-md-auto w-100">
-
-			<div class="post-meta text-left x-scroll mb-md-2">
-				<h5 class="card-title post-title text-left mb-0 pb-0 pb-md-1">
-					<a id="{{p.id}}-title" {% if v and v.newtab and not g.webview %}target="_blank"{% endif %} href="{{p.permalink}}" class="{% if voted and v.id == AEVANN_ID %}visited{% endif %}">
-					{% if p.club %}<span class="patron font-weight-bolder mr-1" style="background-color:red; font-size:12px; line-height:2;">{{CC}}</span>{% endif %}
-					{% if p.flair %}<span class="patron font-weight-bolder mr-1" style="background-color:var(--primary); font-size:12px; line-height:2;">{{p.flair | safe}}</span>{% endif %}
-					{{p.realtitle(v) | safe}}
-				</a></h5>
-
-				{% if p.sub %}
-					<a href='/h/{{p.sub}}'>/h/{{p.sub}}</a>&nbsp;&nbsp;
-				{% endif %}
-
-				{% if p.sub and p.author.exiled_from(p.sub) %}
-					<a role="button"><i class="fas fa-campfire text-danger" data-bs-toggle="tooltip" data-bs-placement="bottom" title="User has been exiled from /h/{{p.sub}}"></i></a>
-				{% endif %}
-			</div>
-
-			<div class="post-info text-left">
-				<div class="post-author x-scroll">
-					{% if p.bannedfor %}
-						<a role="button"><i class="fas fa-hammer-crash text-danger" data-bs-toggle="tooltip" data-bs-placement="bottom" title="User was banned for this post{% if p.author.banned_by %} by @{{p.author.banned_by.username}}{% endif %}"></i></a>
-					{% endif %}
-
-					{% for a in p.awards|reverse %}
-						<i class="{{a.class_list}} px-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{a.title}} Award given by @{{a.user.username}}"></i>
-					{% endfor %}
-
-					{% if v and v.admin_level > 1 and p.author.shadowbanned %}
-						<i class="fas fa-user-times text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Shadowbanned by @{{p.author.shadowbanned}}"></i>
-					{% endif %}
-
-					{% if p.stickied %}
-						<i id='pinned-{{p.id}}' class="fas fa-thumbtack fa-rotate--45 text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Pinned by @{{p.stickied}}" {% if p.stickied_utc %}onmouseover="pinned_timestamp('pinned-{{p.id}}')" data-timestamp={{p.stickied_utc}} {% endif %}></i>
-					{% endif %}
-
-					{% if p.distinguish_level %}<i class="fas fa-broom text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{SITE_TITLE}} Admin, speaking officially"></i>{% endif %}
-					{% if p.is_pinned and request.path.startswith('/@') %}<i class="fas fa-thumbtack fa-rotate--45 text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Pinned to profile"></i>{% endif %}
-					{% if p.over_18 %}<span class="badge badge-danger text-small-extra mr-1">+18</span>{% endif %}
-					{% if p.is_bot %} <i class="fas fa-robot text-info" data-bs-toggle="tooltip" data-bs-placement="bottom"	title="Bot"></i>{% endif %}
-					{% if p.is_blocking %}<i class="fas fa-user-minus text-warning" data-bs-toggle="tooltip" data-bs-placement="bottom" title="You're blocking this user, but you can see this post because you're an admin."></i>{% endif %}
-					{% if p.is_blocked %}<i class="fas fa-user-minus text-danger" data-bs-toggle="tooltip" data-bs-placement="bottom" title="This user is blocking you."></i>{% endif %}
-					{% if p.private %}<span class="badge border-warning border-1 text-small-extra">Draft</span>{% endif %}
-					{% if v and p.filter_state == 'reported' and v.can_manage_reports() %}
-					<a class="btn btn-primary" id="report-btn-{{p.id}}" role="button" style="padding:1px 5px; font-size:10px"onclick="document.getElementById('flaggers-{{p.id}}').classList.toggle('d-none')">{{p.active_flags(v)}} Reports</a>
-					{% endif %}
-						
-
-					<span data-bs-toggle="tooltip" data-bs-placement="bottom" onmouseover="timestamp('timestamp-{{p.id}}','{{p.created_utc}}')" id="timestamp-{{p.id}}">&nbsp;{{p.age_string}} by </span>
-
-					{% if not p.author %}
-						{{p.print()}}
-					{% endif %}
-
-					{% if p.ghost %}
-						👻
-					{% else %}
-
-						{% if p.author.verified %}<i class="fas fa-badge-check align-middle ml-1 {% if p.author.verified=='Glowiefied' %}glow{% endif %}" style="color:{% if p.author.verifiedcolor %}#{{p.author.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{p.author.verified}}"></i>
-						{% endif %}
-						<a href="/@{{p.author_name}}" 
-							class="user-name text-decoration-none" 
-
-							data-bs-placement="bottom" 
-							data-bs-toggle="popover" 
-							data-bs-trigger="click" 
-							data-content-id="popover" 
-							role="button" 
-							tabindex="0" 
-							style="color: var(--primary-light1); font-weight: bold;">
-								<span 
-									{% if p.author.patron and not p.distinguish_level %}
-										class="patron" 
-										style="background-color:#{{p.author.namecolor}};"
-									{% elif p.distinguish_level %}
-										class="mod"
-									{% endif %}>{{p.author_name}}</span>
-						</a>{% if p.author.customtitle %}<bdi style="color: #{{p.author.titlecolor}}">&nbsp;&nbsp;{{p.author.customtitle | safe}}</bdi>{% endif %}
-						{% if v and v.admin_level > 2 %}
-							<span 
-								class="usernote-link" 
-								data-micromodal-trigger="modal-1" 
-								onclick='fillnote( {{p.author.json_popover(v) | tojson}}, {{p.id}}, null )'>_U_</span>
-						{% endif %}
-					{% endif %}
-					
-					&nbsp;
-					({% if p.is_image %}image post{% elif p.is_video %}video post{% elif p.domain %}<a href="/search/posts/?q=domain%3A{{p.domain}}&sort=new&t=all" class="post-meta-domain" {% if v and v.newtab and not g.webview %}target="_blank"{% endif %}>{{p.domain|truncate(35, True)}}</a>{% else %}text post{% endif %})
-					{% if p.edited_utc %}
-						&nbsp;&nbsp;Edited <span data-bs-toggle="tooltip" data-bs-placement="bottom" id="edited_timestamp-{{p.id}}" onmouseover="timestamp('edited_timestamp-{{p.id}}','{{p.edited_utc}}')">{{p.edited_string}}</span>
-					{% endif %}
-					&nbsp;&nbsp;{{p.views}} thread views
-				</div>
-				<div class="post-actions d-none d-md-block">
-					<ul class="list-inline text-right d-flex">
-						{% if p.realbody(v) %}
-							<a class="list-inline-item" role="button" onclick="expandText('{{p.id}}')"><i class="fas fa-expand-alt mr-0 text-expand-icon-{{p.id}}"></i></a>
-						{% endif %}
-						<li class="list-inline-item">
-							<a {% if v and v.newtab and not g.webview %}target="_blank"{% endif %} href="{{p.permalink}}">
-								<i class="fas fa-comment-dots"></i>{{p.comment_count}}
-								<span class="text-info d-none {{p.id}}-new-comments"></span>
-							</a>
-						</li>
-						{% include 'post_actions.html' %}
-					</ul>
-				</div>
-			</div>
-	</div>
-</div>
-
-<div class="card-footer d-md-none mt-2 {% if request.path == '/changelog' %}px-0{% endif %}">
-	<div class="post-actions">
-		<ul class="list-inline text-right d-flex">
-			<li class="list-inline-item mr-auto">
-				<a {% if v and v.newtab and not g.webview %}target="_blank"{% endif %} href="{{p.permalink}}">
-					<i class="fas fa-comment-dots"></i>{{p.comment_count}}
-					<span class="text-info d-none {{p.id}}-new-comments"></span>
+		{% if p.is_image and not p.over_18 and ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}
+			<div style="text-align: center" class="mt-3 mb-4">
+				<a {% if v and v.newtab and not g.webview %}target="_blank"{% endif %} rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}">
+					<img loading="lazy" data-src="{{p.realurl(v)}}" src="/assets/images/loading.webp" class="img-fluid" style="max-height:20rem" alt="Unable to load image">
 				</a>
-
-				{% if v and v.admin_level > 1 %}
-					<a class="ml-2" role="button" data-bs-toggle="modal" data-bs-target="#adminModal-{{p.id}}">
-						<i class="fas fa-broom"></i>
-					</a>
-				{% endif %}
-
-			</li>
-			
-			{% if p.realbody(v) and request.path != "/changelog"%}
-				<a class="list-inline-item" role="button" onclick="expandText('{{p.id}}')"><i class="fas fa-expand-alt mr-0 text-expand-icon-{{p.id}}"></i></a>
-			{% endif %}
-
-			{% if v %}
-				<li class="list-inline-item">
-					<a role="button" data-bs-toggle="modal" data-bs-target="#actionsModal-{{p.id}}">
-						<i class="fas fa-ellipsis-h"></i>
-					</a>
-				</li>
-			{% endif %}
-			{% if not postembed %}
-				{% if v and request.path.startswith('/@') and v.admin_level < 2 %}
-				<li id="voting-{{p.id}}-mobile" class="voting list-inline-item d-md-none">
-
-					{% if voted==1 %}
-					<span class="mr-2 arrow-up post-{{p.id}}-up active">
-					</span>
-					{% endif %}
-
-					<span class="post-mobile-score-{{p.id}} score post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}{% if p.controversial %} controversial{% endif %}"{% if not p.is_banned %} data-bs-toggle="tooltip" data-bs-placement="top" title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
-
-					{% if voted==-1 %}
-						<span class="ml-2 my-0 arrow-down post-{{p.id}}-down active"></span>
-					{% endif %}
-
-
-				</li>
-				{% elif v %}
-				<li id="voting-{{p.id}}-mobile" class="voting list-inline-item d-md-none">
-
-					<span tabindex="0" role="button" onclick="vote('post-mobile', '{{p.id}}', '1', '{{v.id}}')" class="post-mobile-{{p.id}}-up mx-0 pr-1 arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% endif %}">
-					</span>
-
-					<span class="post-mobile-score-{{p.id}} score post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}{% if p.controversial %} controversial{% endif %}"{% if not p.is_banned %} data-bs-toggle="tooltip" data-bs-placement="top" title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
-
-					<span {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} tabindex="0" role="button" onclick="vote('post-mobile', '{{p.id}}', '-1', '{{v.id}}')" class="post-mobile-{{p.id}}-down mx-0 pl-1 my-0 arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% endif %}">
-					</span>
-
-				</li>
-				{% else %}
-				<li id="voting-{{p.id}}-mobile" class="voting list-inline-item d-md-none">
-					<span tabindex="0" class="arrow-{{p.id}}-mobile-up mx-0 pr-1 arrow-mobile-up" onclick="location.href='/login';">
-						<i class="fas fa-arrow-alt-up mx-0" aria-hidden="true"></i>
-					</span>
-
-					<span class="post-mobile-score-{{p.id}} score{% if p.controversial %} controversial{% endif %}"{% if not p.is_banned %} data-bs-toggle="tooltip" data-bs-placement="top" title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
-
-					<span tabindex="0" class="arrow-{{p.id}}-mobile-down arrow-mobile-down mx-0 pl-1 my-0" onclick="location.href='/login';">
-						<i class="fas fa-arrow-alt-down mx-0" aria-hidden="true"></i>
-					</span>
-				</li>
-				{% endif %}
-			{% endif %}
-		</ul>
-	</div>
-</div>
-
-{% if v %}
-	<div class="modal fade d-md-none" id="actionsModal-{{p.id}}" tabindex="-1" role="dialog" aria-labelledby="actionsModalTitle" aria-hidden="true">
-		<div class="modal-dialog modal-dialog-centered" role="document">
-			<div class="modal-content">
-				<div class="modal-header p-3">
-					<h5 class="col modal-title text-center h6">More options</h5>
-					<button class="close position-absolute py-3" style="right: 1rem"data-bs-dismiss="modal" aria-label="Close">
-						<span aria-hidden="true"><i class="fas fa-times-circle text-gray-500"></i></span>
-					</button>
-				</div>
-				<div class="modal-body">
-					<ul class="list-group post-actions">
-						{% include "post_actions_mobile.html" %}
-					</ul>
-				</div>
 			</div>
-		</div>
+		{% elif p.is_video %}
+			<div id="video-{{p.id}}" style="text-align: center" class="{% if p.over_18 or not ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}d-none{% endif %} mt-4">
+				<video id="video2-{{p.id}}" controls preload="none" class="vid">
+					<source src="{{p.realurl(v)}}" type="video/mp4">
+				</video>
+			</div>
+		{% elif p.is_youtube %}
+			<div id="video-{{p.id}}" class="{% if p.over_18 or not ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}d-none{% endif %} mt-3 mb-4 youtube_embed">
+				{{p.embed_url | safe}}
+			</div>
+		{% endif %}
+	{% endif %}
+
+</div>
+{% else %}
+
+	{% if request.path.endswith('/admin/queue') %}
+
+	<div class="row no-gutters">	
+		<div class="col">			
+			<div class="text-center py-7">
+				<div class="h4 p-2">This queue is empty. (That's a good thing.)</div>
+			</div>			
+		</div>	
 	</div>
-{% endif %}
-
-<script>
-	{% if not v or v.highlightcomments %}
-		showNewCommentCounts({{p.id}}, {{p.comment_count}})
-	{% endif %}
-</script>
 
 
-{% if v and v.admin_level > 1 %}
-	{% include "post_admin_actions_mobile.html" %}
-{% endif %}
+	{% elif u %}
+		{% if v and v.id == u.id %}
+		<div class="row no-gutters">	
+			<div class="col">			
+				<div class="text-center px-3 my-3">
+					<span class="fa-stack fa-2x text-muted mb-4">
+						<i class="fas fa-square text-gray-500 opacity-25 fa-stack-2x"></i>
+						<i class="fas text-gray-500 fa-ghost fa-stack-1x text-lg"></i>
+					</span>
+					<h2 class="h5">You haven't {% if "saved" in request.full_path %}saved{% else %}made{% endif %} a post yet</h2>
+					<p class="text-muted mb-md-5">Your {% if "saved" in request.full_path %}saved posts{% else %}posting history{% endif %} will show here.</p>
+					{% if "saved" not in request.full_path %}<a href="{% if sub %}/h/{{sub.name}}{% endif %}/submit" class="btn btn-primary">Create a post</a>{% endif %}
+				</div>			
+			</div>	
+		</div>
 
 
+		{% else %}
+		<div class="row no-gutters">	
+			<div class="col">			
+				<div class="text-center px-3 my-3">
+					<span class="fa-stack fa-2x text-muted mb-4">
+						<i class="fas fa-square text-gray-500 opacity-25 fa-stack-2x"></i>
+						<i class="fas text-gray-500 fa-scroll-old fa-stack-1x text-lg"></i>
+					</span>
+					<h2 class="h5">@{{u.username}} hasn't made a post yet</h2>
+					<p class="text-muted">Their posting history will show here.</p>
+					<pre>
+					</pre>
+				</div>			
+			</div>	
+		</div>
+		{% endif %}
 
-
-
-
-</div>
-
-{% if not p.club or v and (v.paid_dues or v.id == p.author_id) %}
-	{% if p.realbody(v) %}
-		<div class="d-none card rounded border pt-3 pb-2 my-2" id="post-text-{{p.id}}">
-			{{p.realbody(v) | safe}}
+	{% else %}
+		<div class="row no-gutters">	
+			<div class="col">			
+				<div class="text-center px-3 my-3">
+					<span class="fa-stack fa-2x text-muted mb-4">
+						<i class="fas fa-square text-gray-500 opacity-25 fa-stack-2x"></i>
+						<i class="fas text-gray-500 fa-ghost fa-stack-1x text-lg"></i>
+					</span>
+					{% if request.path.startswith('/search') and error %}
+						<h2 class="h5">{{error}}</h2>
+					{% endif %}
+				</div>			
+			</div>	
 		</div>
 	{% endif %}
-
-	{% if p.is_image and not p.over_18 and ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}
-		<div style="text-align: center" class="mt-3 mb-4">
-			<a {% if v and v.newtab and not g.webview %}target="_blank"{% endif %} rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}">
-				<img loading="lazy" data-src="{{p.realurl(v)}}" src="/assets/images/loading.webp" class="img-fluid" style="max-height:20rem" alt="Unable to load image">
-			</a>
-		</div>
-	{% elif p.is_video %}
-		<div id="video-{{p.id}}" style="text-align: center" class="{% if p.over_18 or not ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}d-none{% endif %} mt-4">
-			<video id="video2-{{p.id}}" controls preload="none" class="vid">
-				<source src="{{p.realurl(v)}}" type="video/mp4">
-			</video>
-		</div>
-	{% elif p.is_youtube %}
-		<div id="video-{{p.id}}" class="{% if p.over_18 or not ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}d-none{% endif %} mt-3 mb-4 youtube_embed">
-			{{p.embed_url | safe}}
-		</div>
-	{% endif %}
-{% endif %}
-
-{% else %}
-
-{% if request.path.endswith('/admin/queue') %}
-
-<div class="row no-gutters">	
-	<div class="col">			
-		<div class="text-center py-7">
-			<div class="h4 p-2">This queue is empty. (That's a good thing.)</div>
-		</div>			
-	</div>	
-</div>
-
-
-{% elif u %}
-{% if v and v.id == u.id %}
-<div class="row no-gutters">	
-	<div class="col">			
-		<div class="text-center px-3 my-3">
-			<span class="fa-stack fa-2x text-muted mb-4">
-				<i class="fas fa-square text-gray-500 opacity-25 fa-stack-2x"></i>
-				<i class="fas text-gray-500 fa-ghost fa-stack-1x text-lg"></i>
-			</span>
-			<h2 class="h5">You haven't {% if "saved" in request.full_path %}saved{% else %}made{% endif %} a post yet</h2>
-			<p class="text-muted mb-md-5">Your {% if "saved" in request.full_path %}saved posts{% else %}posting history{% endif %} will show here.</p>
-			{% if "saved" not in request.full_path %}<a href="{% if sub %}/h/{{sub.name}}{% endif %}/submit" class="btn btn-primary">Create a post</a>{% endif %}
-		</div>			
-	</div>	
-</div>
-
-
-{% else %}
-<div class="row no-gutters">	
-	<div class="col">			
-		<div class="text-center px-3 my-3">
-			<span class="fa-stack fa-2x text-muted mb-4">
-				<i class="fas fa-square text-gray-500 opacity-25 fa-stack-2x"></i>
-				<i class="fas text-gray-500 fa-scroll-old fa-stack-1x text-lg"></i>
-			</span>
-			<h2 class="h5">@{{u.username}} hasn't made a post yet</h2>
-			<p class="text-muted">Their posting history will show here.</p>
-			<pre>
-			</pre>
-		</div>			
-	</div>	
-</div>
-{% endif %}
-
-{% else %}
-<div class="row no-gutters">	
-	<div class="col">			
-		<div class="text-center px-3 my-3">
-			<span class="fa-stack fa-2x text-muted mb-4">
-				<i class="fas fa-square text-gray-500 opacity-25 fa-stack-2x"></i>
-				<i class="fas text-gray-500 fa-ghost fa-stack-1x text-lg"></i>
-			</span>
-			{% if request.path.startswith('/search') and error %}
-				<h2 class="h5">{{error}}</h2>
-			{% endif %}
-		</div>			
-	</div>	
-</div>
-
-
-{% endif %}
-
 {% endfor %}
 
 {% if v %}