From dd37573f98492f09c5afeb00411e6ecd670e12de Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Wed, 24 Aug 2022 17:36:34 +0200
Subject: [PATCH] fucking with blockquote margins again

---
 files/assets/css/main.css            | 71 +++++++++++++++-------------
 files/templates/util/assetcache.html |  2 +-
 2 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/files/assets/css/main.css b/files/assets/css/main.css
index cd1e5277f..8f6642088 100644
--- a/files/assets/css/main.css
+++ b/files/assets/css/main.css
@@ -63,12 +63,6 @@ dd {
 	margin-bottom: 0.5rem;
 	margin-left: 0;
 }
-blockquote {
-	margin: 0 0 1rem;
-}
-blockquote :is(h1, h2, h3, h4, h5, h6) {
-	margin-bottom: 0;
-}
 b, strong {
 	font-weight: 700;
 }
@@ -266,10 +260,6 @@ mark, .mark {
 .list-inline-item:not(:last-child) {
 	margin-right: 0.5rem;
 }
-.blockquote {
-	margin-bottom: 1rem;
-	font-size: 1.25rem;
-}
 .img-fluid {
 	height: auto;
 	max-width: 100%;
@@ -2580,7 +2570,7 @@ a.text-danger:hover, a.text-danger:focus {
 	pre {
 		white-space: pre-wrap !important;
 }
-	pre, blockquote {
+	pre {
 		border: 1px solid #adb5bd;
 		page-break-inside: avoid;
 }
@@ -4701,29 +4691,6 @@ textarea {
 		padding: 0.5rem 1.5rem 0.5rem 0.5rem;
 }
 }
-blockquote {
-	border-left: 2px solid var(--primary);
-	color: var(--black);
-	font-size: 1rem;
-	font-weight: 400;
-	background-color: #46444a;
-	padding: 0 1rem;
-	margin: 1rem 0 0 0;
-}
-div > blockquote:last-child {
-	margin-bottom: 0.5rem !important;
-}
-blockquote + blockquote, blockquote:last-child {
-	margin-top: 0 !important;
-}
-blockquote + :not(blockquote) {
-	margin-top: 0.5rem;
-}
-blockquote > :not(blockquote) {
-	margin-bottom: 0;
-	padding-bottom: 0.7rem;
-	padding-top: 0.7rem;
-}
 @media (min-width: 576px) {
 	.modal-dialog:not(.expandedimage):not(.awardmodal) {
 		max-width: 50% !important;
@@ -6251,3 +6218,39 @@ div.custom-control:last-of-type {
 	padding: 6px;
 	width: 150px;
 }
+
+blockquote {
+	border-left: 2px solid var(--primary);
+	color: var(--black);
+	font-size: 1rem;
+	font-weight: 400;
+	background-color: #46444a;
+	padding: 0 1rem;
+	margin: 1rem 0 0 0;
+}
+div > blockquote:last-child {
+	margin-bottom: 1rem !important;
+}
+blockquote + blockquote, blockquote:first-child, blockquote:last-child {
+	margin-top: 0 !important;
+}
+blockquote + :not(blockquote) {
+	margin-top: 1rem;
+}
+blockquote > :not(blockquote) {
+	margin-bottom: 0;
+	padding-bottom: 0.7rem;
+	padding-top: 0.7rem;
+}
+
+@media (max-width: 768px) {
+	blockquote {
+		margin: 0.5rem 0 0 0;
+	}
+	div > blockquote:last-child {
+		margin-bottom: 0.5rem !important;
+	}
+	blockquote + :not(blockquote) {
+		margin-top: 0.5rem;
+	}	
+}
\ No newline at end of file
diff --git a/files/templates/util/assetcache.html b/files/templates/util/assetcache.html
index a57b1134a..46df82326 100644
--- a/files/templates/util/assetcache.html
+++ b/files/templates/util/assetcache.html
@@ -1,6 +1,6 @@
 {%-
 set CACHE_VER = {
-	'css/main.css': 481,
+	'css/main.css': 482,
 	'css/catalog.css': 2,
 
 	'css/4chan.css': 61,