Merge branch 'frost' of https://github.com/Aevann1/Drama into frost

files/templates/CHRISTMAS/comments/CommentActions.html

@@ -58,12 +58,12 @@
 	{% endif %}
 
 	<li class="hidden md:block">
-		<button class="copy-link hover:text-gray-400" data-clipboard-text="{% if 'rama' in request.host %}https://dogpill.life{{c.permalink}}{% else %}{{c.permalink | full_link}}{% endif %}?context=10#context">
+		<button class="copy-link hover:text-gray-400" data-clipboard-text="{% if 'rama' in request.host %}https://dogpill.life{{c.permalink}}{% else %}{{c.permalink | full_link}}{% endif %}">
 			<i class="fas fa-link fa-fw mr-2"></i>Copy link
 		</button>
 	</li>
 	<li class="hidden md:block">
-		<a href="{{c.permalink}}?context=10#context" class="text-gray-500 hover:text-gray-400">
+		<a href="{{c.permalink}}" class="text-gray-500 hover:text-gray-400">
 			<i class="fas fa-book-open fa-fw mr-2"></i>Context
 		</a>
 	</li>
@@ -85,7 +85,7 @@
 					</a>
 				</li>
 				<li class="hidden">
-					<a class="dropdown-item block w-full text-left px-4 py-2 text-sm text-gray-200 bg-gradient-to-t hover:from-red-800 hover:to-red-700 hover:shadow-inner focus:shadow-inner focus:bg-gradient-to-t focus:from-red-800 focus:to-red-700" {% if v %}href="{{c.permalink}}?context=10#context"{% else %}href="/logged_out{{c.permalink}}?context=10#context"{% endif %}>
+					<a class="dropdown-item block w-full text-left px-4 py-2 text-sm text-gray-200 bg-gradient-to-t hover:from-red-800 hover:to-red-700 hover:shadow-inner focus:shadow-inner focus:bg-gradient-to-t focus:from-red-800 focus:to-red-700" href="{{c.permalink}}">
 						<i class="fas fa-book-open fa-sm fa-fw mr-4"></i>Context
 					</a>
 				</li>
@@ -109,12 +109,9 @@
 					</button>
 				</li>
 				{% endif %}
-
 				{% endif %}
+
 				{% if v and v.admin_level==6 and v.id==c.author_id %}
-				<li>
-					<hr class="mt-2 mb-1.5 border-t border-black h-1 shadow-inset-t-white-05"/>
-				</li>
 				<li id="undistinguish-{{c.id}}" class="hidden {% if c.distinguish_level %}md:block{% endif %}">
 					<button class="dropdown-item block w-full text-left px-4 py-2 text-sm text-gray-200 bg-gradient-to-t hover:from-red-800 hover:to-red-700 hover:shadow-inner focus:shadow-inner focus:bg-gradient-to-t focus:from-red-800 focus:to-red-700" onclick="post_toast3('/distinguish_comment/{{c.id}}','distinguish-{{c.id}}','undistinguish-{{c.id}}','no')">
 						<i class="fas fa-id-badge text-info fa-sm fa-fw mr-4"></i>Undistinguish
@@ -128,9 +125,6 @@
 				{% endif %}
 
 				{% if v and not v.id==c.author_id and not (c.post and c.post.award_count("ghosts")) %}
-				<li>
-					<hr class="mt-2 mb-1.5 border-t border-black h-1 shadow-inset-t-white-05"/>
-				</li>
 				<li class="hidden {% if c.is_blocking %}md:block{% endif %} text-green-600">
 					<button id="unblock-{{c.id}}" class="dropdown-item block w-full text-left px-4 py-2 text-sm text-gray-200 bg-gradient-to-t hover:from-red-800 hover:to-red-700 hover:shadow-inner focus:shadow-inner focus:bg-gradient-to-t focus:from-red-800 focus:to-red-700" onclick="post_toast3('/settings/unblock?username={{c.author.username}}','block-{{c.id}}','unblock-{{c.id}}')">
 						<i class="fas fa-eye-slash fa-sm fa-fw mr-4"></i>Unblock user

files/templates/CHRISTMAS/default.html

@@ -186,7 +186,7 @@
 
 		{% block stylesheets %}
 
-		<link rel="stylesheet" href="/assets/CHRISTMAS/css/main.css?v=420">
+		<link rel="stylesheet" href="/assets/CHRISTMAS/css/main.css?v=421">
 
       	<link rel="stylesheet" href="/static/dist/main.css?v=420">
 

files/templates/CHRISTMAS/expanded_image_modal.html

@@ -1,14 +1,13 @@
 <div class="modal desktop-expanded-image-modal" id="expandImageModal" tabindex="-1" role="dialog" aria-labelledby="expandImageModalTitle" aria-hidden="true">
 	<div class="modal-dialog modal-xl modal-dialog-centered mx-auto expandedimage" role="document">
-		<div class="modal-content bg-transparent shadow-none m-5 m-md-0">
+		<div class="modal-content bg-transparent shadow-none m-5 md:m-0">
-
 			<div class="modal-body text-center p-0">
-				<div class="d-inline-block position-relative">
+				<div class="inline-block relative">
 					<a href="" rel="nofollow noopener noreferrer" target="_blank" id="desktop-expanded-image-wrap-link">
 						<img loading="lazy" src="" class="img-fluid rounded" id="desktop-expanded-image" style="min-width: 250px;">
 					</a>
-					<div class="position-absolute d-flex justify-content-between align-items-center w-100 mt-1">
+					<div class="absolute flex justify-between items-center w-full mt-1">
-						<a href="" rel="nofollow noopener noreferrer" target="_blank" class="text-gray-500 font-weight-bold text-left" id="desktop-expanded-image-link">View original</a>
+						<a href="" rel="nofollow noopener noreferrer" target="_blank" class="text-gray-500 font-bold text-left" id="desktop-expanded-image-link">View original</a>
 					</div>
 				</div>
 			</div>
@@ -21,8 +20,4 @@
 		width: fit-content;
 		width: -moz-fit-content;
 	}
-
-	.m-5 {
-		margin: 2.5rem !important;
-	}
 </style>

files/templates/CHRISTMAS/footer.html

@@ -41,13 +41,13 @@
 				<div class="flex flex-col gap-2">
 					<div class="bg-gray-700 shadow-inner border border-gray-900 rounded-md overflow-hidden">
 						<p class="p-2 text-sm font-serif italic text-gray-300">
-							"Not like anything that happens on this niche website will ever matter so it's not worth caring about but is it just me or has the 1984 shit really stepped up in the past few weeks?"
+							"Oh God the site is so fucking ugly"
 						</p>
 						<div class="p-2 bg-gray-700 border-t border-gray-800 shadow-inset-t-white-05">
-							<img loading="lazy" src="https://i.imgur.com/47oAlsK.jpg" class="inline-block flex-shrink-0 object-cover h-9 w-9 p-[3px] bg-white border border-gray-800" alt="avatar"/>
+							<img loading="lazy" src="https://rdrama.net/images/16393473254r.webp" class="inline-block flex-shrink-0 object-cover h-9 w-9 p-[3px] bg-white border border-gray-800" alt="avatar"/>
 							<strong class="pl-1 text-sm font-bold">
-								<a href="/post/24615/not-like-anything-that-happens-on" class="text-gray-300 hover:text-gray-200">
+								<a href="/post/29747/rdrama-presents-fistmas-2021-santa-claus/956448?context=9#context" class="text-gray-300 hover:text-gray-200">
-									@turkey_privilege
+									@Gigavaccinator
 								</a>
 							</strong>
 						</div>

files/templates/CHRISTMAS/submission_listing.html

@@ -148,7 +148,7 @@
 				{% endif %}
 				
 				{% if p.is_image %}
-					(image post)
+					<span>(image post)</span>
 				{% elif p.realurl(v) %}
 					<a class="flex-shrink-0" class="text-gray-500 hover:underline" href="/search/posts/?q=domain%3A{{p.domain}}&sort=new&t=all" {% if not v or v.newtabexternal %}target="_blank"{% endif %}>
 						({{p.domain}})

files/templates/CHRISTMAS/toasts/toasts.html

@@ -1,5 +1,5 @@
 <div class="toast clipboard" id="toast-success" role="alert" aria-live="assertive" aria-atomic="true" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
-	<div class="toast-body text-center">
+	<div class="toast-body bg-green-500 border border-green-900 text-center text-white">
 		<i class="fas fa-check-circle text-success mr-2"></i>Link copied to clipboard
 	</div>
 </div>