From b34b65417595eda40c9b8d99258171a7abe27930 Mon Sep 17 00:00:00 2001
From: Aevann <randomname42029@gmail.com>
Date: Sun, 1 Jan 2023 10:38:09 +0200
Subject: [PATCH] restore all bootstrap margin and padding selectors

---
 files/assets/css/main.css                    | 115 +++++++++++++++++--
 files/templates/admin/removed_comments.html  |   2 +-
 files/templates/admin/reported_comments.html |   2 +-
 files/templates/errors/WPD/502.html          |   2 +-
 files/templates/errors/error.html            |   2 +-
 files/templates/errors/rDrama/502.html       |   2 +-
 files/templates/message.html                 |   2 +-
 files/templates/message_success.html         |   2 +-
 files/templates/notifications.html           |   2 +-
 files/templates/sub/create_hole.html         |   2 +-
 files/templates/userpage/blocking.html       |   2 +-
 files/templates/userpage/voted_comments.html |   2 +-
 files/templates/util/macros.html             |   4 +-
 13 files changed, 116 insertions(+), 25 deletions(-)

diff --git a/files/assets/css/main.css b/files/assets/css/main.css
index 938c3e66a..030f8d8af 100644
--- a/files/assets/css/main.css
+++ b/files/assets/css/main.css
@@ -2409,6 +2409,7 @@ a.bg-light:hover, a.bg-light:focus, button.bg-light:hover, button.bg-light:focus
 	content: "";
 	background-color: rgba(0, 0, 0, 0);
 }
+
 .m-0 {
 	margin: 0 !important;
 }
@@ -2424,6 +2425,7 @@ a.bg-light:hover, a.bg-light:focus, button.bg-light:hover, button.bg-light:focus
 .ml-0, .mx-0 {
 	margin-left: 0 !important;
 }
+
 .m-1 {
 	margin: 0.25rem !important;
 }
@@ -2439,6 +2441,10 @@ a.bg-light:hover, a.bg-light:focus, button.bg-light:hover, button.bg-light:focus
 .ml-1, .mx-1 {
 	margin-left: 0.25rem !important;
 }
+
+.m-2 {
+	margin: 0.5rem !important;
+}
 .mt-2, .my-2 {
 	margin-top: 0.5rem !important;
 }
@@ -2451,6 +2457,10 @@ a.bg-light:hover, a.bg-light:focus, button.bg-light:hover, button.bg-light:focus
 .ml-2, .mx-2 {
 	margin-left: 0.5rem !important;
 }
+
+.m-3 {
+	margin: 1rem !important;
+}
 .mt-3, .my-3 {
 	margin-top: 1rem !important;
 }
@@ -2463,6 +2473,7 @@ a.bg-light:hover, a.bg-light:focus, button.bg-light:hover, button.bg-light:focus
 .ml-3, .mx-3 {
 	margin-left: 1rem !important;
 }
+
 .m-4 {
 	margin: 1.5rem !important;
 }
@@ -2478,27 +2489,55 @@ a.bg-light:hover, a.bg-light:focus, button.bg-light:hover, button.bg-light:focus
 .ml-4, .mx-4 {
 	margin-left: 1.5rem !important;
 }
-.mr-5, .mx-5 {
-	margin-right: 3rem !important;
-}
-.ml-5, .mx-5 {
-	margin-left: 3rem !important;
+
+.m-5 {
+	margin: 3rem !important;
 }
 .mt-5, .my-5 {
 	margin-top: 3rem !important;
 }
+.mr-5, .mx-5 {
+	margin-right: 3rem !important;
+}
 .mb-5, .my-5 {
 	margin-bottom: 3rem !important;
 }
-.mb-6, .my-6 {
-	margin-bottom: 3.5rem !important;
+.ml-5, .mx-5 {
+	margin-left: 3rem !important;
 }
-.mt-8, .my-8 {
+
+.m-6 {
+	margin: 5rem !important;
+}
+.mt-6, .my-6 {
+	margin-top: 5rem !important;
+}
+.mr-6, .mx-6 {
+	margin-right: 5rem !important;
+}
+.mb-6, .my-6 {
+	margin-bottom: 5rem !important;
+}
+.ml-6, .mx-6 {
+	margin-left: 5rem !important;
+}
+
+.m-7 {
+	margin: 10rem !important;
+}
+.mt-7, .my-7 {
 	margin-top: 10rem !important;
 }
-.mb-8, .my-8 {
+.mr-7, .mx-7 {
+	margin-right: 10rem !important;
+}
+.mb-7, .my-7 {
 	margin-bottom: 10rem !important;
 }
+.ml-7, .mx-7 {
+	margin-left: 10rem !important;
+}
+
 .p-0 {
 	padding: 0 !important;
 }
@@ -2514,15 +2553,23 @@ a.bg-light:hover, a.bg-light:focus, button.bg-light:hover, button.bg-light:focus
 .pl-0, .px-0 {
 	padding-left: 0 !important;
 }
+
+.p-1 {
+	padding: 0.25rem !important;
+}
+.pt-1, .py-1 {
+	padding-top: 0.25rem !important;
+}
 .pr-1, .px-1 {
 	padding-right: 0.25rem !important;
 }
-.py-1, .pb-1 {
+.pb-1, .py-1 {
 	padding-bottom: 0.25rem !important;
 }
 .pl-1, .px-1 {
 	padding-left: 0.25rem !important;
 }
+
 .p-2 {
 	padding: 0.5rem !important;
 }
@@ -2538,6 +2585,7 @@ a.bg-light:hover, a.bg-light:focus, button.bg-light:hover, button.bg-light:focus
 .pl-2, .px-2 {
 	padding-left: 0.5rem !important;
 }
+
 .p-3 {
 	padding: 1rem !important;
 }
@@ -2553,30 +2601,72 @@ a.bg-light:hover, a.bg-light:focus, button.bg-light:hover, button.bg-light:focus
 .pl-3, .px-3 {
 	padding-left: 1rem !important;
 }
+
 .p-4 {
 	padding: 1.5rem !important;
 }
 .pt-4, .py-4 {
 	padding-top: 1.5rem !important;
 }
+.pr-4, .px-4 {
+	padding-right: 1.5rem !important;
+}
 .pb-4, .py-4 {
 	padding-bottom: 1.5rem !important;
 }
+.pl-4, .px-4 {
+	padding-left: 1.5rem !important;
+}
+
 .p-5 {
 	padding: 3rem !important;
 }
 .pt-5, .py-5 {
 	padding-top: 3rem !important;
 }
+.pr-5, .px-5 {
+	padding-right: 3rem !important;
+}
 .pb-5, .py-5 {
 	padding-bottom: 3rem !important;
 }
-.pt-7, .py-7 {
+.pl-5, .px-5 {
+	padding-left: 3rem !important;
+}
+
+.p-6 {
+	padding: 5rem !important;
+}
+.pt-6, .py-6 {
 	padding-top: 5rem !important;
 }
-.pb-7, .py-7 {
+.pr-6, .px-6 {
+	padding-right: 5rem !important;
+}
+.pb-6, .py-6 {
 	padding-bottom: 5rem !important;
 }
+.pl-6, .px-6 {
+	padding-left: 5rem !important;
+}
+
+.p-7 {
+	padding: 10rem !important;
+}
+.pt-7, .py-7 {
+	padding-top: 10rem !important;
+}
+.pr-7, .px-7 {
+	padding-right: 10rem !important;
+}
+.pb-7, .py-7 {
+	padding-bottom: 10rem !important;
+}
+.pl-7, .px-7 {
+	padding-left: 10rem !important;
+}
+
+
 .mt-n3 {
 	margin-top: -1rem !important;
 }
@@ -2598,6 +2688,7 @@ a.bg-light:hover, a.bg-light:focus, button.bg-light:hover, button.bg-light:focus
 .ml-auto, .mx-auto {
 	margin-left: auto !important;
 }
+
 @media (min-width: 576px) {
 	.mb-sm-5 {
 		margin-bottom: 3rem !important;
diff --git a/files/templates/admin/removed_comments.html b/files/templates/admin/removed_comments.html
index c0b72427a..1890dd275 100644
--- a/files/templates/admin/removed_comments.html
+++ b/files/templates/admin/removed_comments.html
@@ -8,7 +8,7 @@
 			{% if not listing %}
 			<div class="row no-gutters">	
 				<div class="col">			
-					<div class="text-center py-7">
+					<div class="text-center py-6">
 						<h4 class="p-2">There are no comments here (yet).</h4>
 					</div>			
 				</div>	
diff --git a/files/templates/admin/reported_comments.html b/files/templates/admin/reported_comments.html
index 496999687..f8ed80ebe 100644
--- a/files/templates/admin/reported_comments.html
+++ b/files/templates/admin/reported_comments.html
@@ -8,7 +8,7 @@
 			{% if not listing %}
 			<div class="row no-gutters">	
 				<div class="col">			
-					<div class="text-center py-7">
+					<div class="text-center py-6">
 						<h4 class="p-2">There are no comments here (yet).</h4>
 					</div>			
 				</div>	
diff --git a/files/templates/errors/WPD/502.html b/files/templates/errors/WPD/502.html
index a033a3b9f..e7f0ff15c 100644
--- a/files/templates/errors/WPD/502.html
+++ b/files/templates/errors/WPD/502.html
@@ -93,7 +93,7 @@
 				<div class="col h-100 custom-gutters" id="main-content-col">
 					<div class="row justify-content-center">
 						<div class="col-10 col-md-5">
-							<div class="text-center px-3 my-8">
+							<div class="text-center px-3 my-7">
 								<img alt=":#marseycapysorenjump2:" loading="lazy" src="/e/marseycapysorenjump2.webp">
 								<h5 class=" mt-1">502 Bad Gateway</h5>
 								<p class="text-muted mb-3">
diff --git a/files/templates/errors/error.html b/files/templates/errors/error.html
index 1e665add1..5135cd137 100644
--- a/files/templates/errors/error.html
+++ b/files/templates/errors/error.html
@@ -4,7 +4,7 @@
 {% block content %}
 <div class="row justify-content-center">
 	<div class="col-10 col-md-5">
-	<div class="text-center px-3 my-8">
+	<div class="text-center px-3 my-7">
 			{% if img -%}
 				<img alt=":#{{img}}:" loading="lazy" src="/e/{{img}}.webp">
 			{%- endif %}
diff --git a/files/templates/errors/rDrama/502.html b/files/templates/errors/rDrama/502.html
index d0e6c1d35..7b6d9e2f2 100644
--- a/files/templates/errors/rDrama/502.html
+++ b/files/templates/errors/rDrama/502.html
@@ -93,7 +93,7 @@
 				<div class="col h-100 custom-gutters" id="main-content-col">
 					<div class="row justify-content-center">
 						<div class="col-10 col-md-5">
-							<div class="text-center px-3 my-8">
+							<div class="text-center px-3 my-7">
 								<img alt=":#marseycapysorenjump2:" loading="lazy" src="/e/marseycapysorenjump2.webp">
 								<h5 class=" mt-1">502 Bad Gateway</h5>
 								<p class="text-muted mb-3">
diff --git a/files/templates/message.html b/files/templates/message.html
index b05d2b39d..e9bafe527 100644
--- a/files/templates/message.html
+++ b/files/templates/message.html
@@ -5,7 +5,7 @@
 {% block content %}
 <div class="row justify-content-center">
 	<div class="col-10 col-md-5">
-		<div class="text-center py-7 py-md-8">
+		<div class="text-center py-6 py-md-8">
 
 			<span class="fa-stack fa-2x text-muted mb-4">
 				<i class="fas fa-square text-gray-400 fa-stack-2x"></i>
diff --git a/files/templates/message_success.html b/files/templates/message_success.html
index 3a8508276..04b36aee9 100644
--- a/files/templates/message_success.html
+++ b/files/templates/message_success.html
@@ -2,7 +2,7 @@
 {% block pagetitle %}{{title}}{% endblock %}
 {% block pagetype %}message-success{% endblock %}
 {% block content %}
-<div class="text-center py-7 py-md-8">
+<div class="text-center py-6 py-md-8">
 	<img class="mb-3" alt=":#marseyparty:" loading="lazy" src="/e/marseyparty.webp">
 	<div class="font-weight-bold text-muted mb-4">{{title}}</div>
 	<p class="text-muted">{{message}}</p>
diff --git a/files/templates/notifications.html b/files/templates/notifications.html
index 447ab0c0d..0d19d0e08 100644
--- a/files/templates/notifications.html
+++ b/files/templates/notifications.html
@@ -115,7 +115,7 @@
 	{% endif %}
 
 	{% if not notifications %}
-		<div class="text-center py-7 py-md-8">
+		<div class="text-center py-6 py-md-8">
 			<span class="fa-stack fa-2x text-muted mb-4">
 				<i class="fas fa-square text-gray-400 fa-stack-2x"></i>
 				<i class="fas text-gray-600 fa-envelope fa-stack-1x text-lg"></i>
diff --git a/files/templates/sub/create_hole.html b/files/templates/sub/create_hole.html
index c6f15b420..a9b915bbb 100644
--- a/files/templates/sub/create_hole.html
+++ b/files/templates/sub/create_hole.html
@@ -3,7 +3,7 @@
 {% block content %}
 <form class="mt-3" id="submitform" action="/create_hole" method="post">
 	<div class="container">
-		<div class="row justify-content-center mb-4 pb-7">
+		<div class="row justify-content-center mb-4 pb-6">
 			<div class="col col-md-6 p-3 py-md-0">
 				<h1 class="d-mob-none">Create a {{HOLE_NAME}}</h1>
 				<h3 class=" d-md-none">Create a {{HOLE_NAME}}</h3>
diff --git a/files/templates/userpage/blocking.html b/files/templates/userpage/blocking.html
index ba3a02eff..b1fa55c19 100644
--- a/files/templates/userpage/blocking.html
+++ b/files/templates/userpage/blocking.html
@@ -5,7 +5,7 @@
 {% block content %}
 <div class="row no-gutters">
 	<div class="col-12">
-		<div class="text-center py-7 py-md-8">
+		<div class="text-center py-6 py-md-8">
 			<span class="fa-stack fa-2x text-muted mb-2">
 				<i class="fas fa-square text-danger opacity-25 fa-stack-2x"></i>
 				<i class="fas text-danger fa-user-cog fa-stack-1x text-lg"></i>
diff --git a/files/templates/userpage/voted_comments.html b/files/templates/userpage/voted_comments.html
index c36a162d9..b3bfd04d7 100644
--- a/files/templates/userpage/voted_comments.html
+++ b/files/templates/userpage/voted_comments.html
@@ -8,7 +8,7 @@
 			{% if not listing %}
 			<div class="row no-gutters">	
 				<div class="col">			
-					<div class="text-center py-7">
+					<div class="text-center py-6">
 						<h4 class="p-2">There are no comments here (yet).</h4>
 					</div>			
 				</div>	
diff --git a/files/templates/util/macros.html b/files/templates/util/macros.html
index b8689d872..8c32f32df 100644
--- a/files/templates/util/macros.html
+++ b/files/templates/util/macros.html
@@ -162,7 +162,7 @@
 {% macro ghost_box(text1, text2, mode, extra_css) %}
 {# TODO: use in saved (search for "fa-ghost" in source) #}
 {% if mode == 1 %}
-<div class="text-center py-7 ghost-town-box ghost-town-box-1"{% if extra_css %} style="{{extra_css}}"{% endif %}>
+<div class="text-center py-6 ghost-town-box ghost-town-box-1"{% if extra_css %} style="{{extra_css}}"{% endif %}>
 	<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>
@@ -176,7 +176,7 @@
 	{% endif %}
 </div>
 {% elif mode == 2 %}
-<div class="text-center border-md rounded py-7 ghost-town-box ghost-town-box-2"{% if extra_css %} style="{{extra_css}}"{% endif %}>
+<div class="text-center border-md rounded py-6 ghost-town-box ghost-town-box-2"{% if extra_css %} style="{{extra_css}}"{% endif %}>
 	<i class="fas fa-ghost text-gray-500 mb-3" style="font-size: 3.5rem;"></i>
 	<p class="font-weight-bold text-gray-500 mb-0">{{text1|safe}}</p>
 </div>