From 74b5922a3039b767f2b1c83ad0a845d0ef66f4c2 Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Sun, 26 Dec 2021 10:24:11 -0600
Subject: [PATCH] pack up christmas decorations

---
 files/templates/CHRISTMAS/header-tw.html      |   4 +-
 files/templates/CHRISTMAS/leaderboard.html    |   9 --
 files/templates/CHRISTMAS/shop.html           |   6 -
 .../CHRISTMAS/sidebars/HomeSidebar.html       |   2 +-
 files/templates/CHRISTMAS/submission.html     |   4 +-
 .../submission/SubmissionAwards.html          | 111 ------------------
 .../CHRISTMAS/submission_listing.html         |   6 +-
 files/templates/CHRISTMAS/submit.html         |   2 -
 tailwind.config.js                            |   2 +-
 9 files changed, 9 insertions(+), 137 deletions(-)

diff --git a/files/templates/CHRISTMAS/header-tw.html b/files/templates/CHRISTMAS/header-tw.html
index 22774c02c..8d2fdc89f 100644
--- a/files/templates/CHRISTMAS/header-tw.html
+++ b/files/templates/CHRISTMAS/header-tw.html
@@ -3,7 +3,7 @@
 <!-- This example requires Tailwind CSS v2.0+ -->
 <nav class="fixed top-0 w-full bg-gray-700" style="z-index: 1030;">
   <div class="w-full max-w-screen-2xl mx-auto grid grid-cols-12 px-4">
-    <div class="relative col-span-full flex items-center justify-between h-16 px-4 snowcaps">
+    <div class="relative col-span-full flex items-center justify-between h-16 px-4">
       {% if not error %}
       <div class="absolute inset-y-0 left-0 flex items-center sm:hidden">
         <!-- Mobile menu button-->
@@ -127,7 +127,7 @@
 
   <!-- Mobile menu, show/hide based on menu state. -->
   <div class="offcanvas offcanvas-start bg-gray-200" tabindex="-1" id="offcanvasNavbar" aria-labelledby="offcanvasNavbarLabel">
-    <div class="relative flex w-full bg-gray-700 h-16 px-4 items-center snowcaps">
+    <div class="relative flex w-full bg-gray-700 h-16 px-4 items-center">
       <a class="block" href="{{ '/' if v else '/logged_out'}}">
           <img class="block lg:hidden w-32 object-contain" src="/assets/CHRISTMAS/images/logos/winter/logo-{{ random }}.png" alt="logo">
           <img class="hidden lg:block w-32 object-contain" src="/assets/CHRISTMAS/images/logos/winter/logo-{{ random }}.png" alt="logo">
diff --git a/files/templates/CHRISTMAS/leaderboard.html b/files/templates/CHRISTMAS/leaderboard.html
index a31bdb6d5..c5fb0ea72 100644
--- a/files/templates/CHRISTMAS/leaderboard.html
+++ b/files/templates/CHRISTMAS/leaderboard.html
@@ -324,13 +324,4 @@
 		{% endfor %}
 	</div>
 </div>
-{% endblock %}
-
-{% block modals %}
-<div class="frost"></div>
-{% include 'CHRISTMAS//awards/Christmas/Snow.html' %}
-{% endblock %}
-
-{% block scripts %}
-<script defer src="/assets/CHRISTMAS/js/christmas/snow.js?a=1"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/files/templates/CHRISTMAS/shop.html b/files/templates/CHRISTMAS/shop.html
index 54d7f2c38..078245c34 100644
--- a/files/templates/CHRISTMAS/shop.html
+++ b/files/templates/CHRISTMAS/shop.html
@@ -143,13 +143,7 @@
 </div>
 {% endblock %}
 
-{% block modals %}
-<div class="frost"></div>
-{% include 'CHRISTMAS//awards/Christmas/Snow.html' %}
-{% endblock %}
-
 {% block scripts %}
-<script defer src="/assets/CHRISTMAS/js/christmas/snow.js?a=1"></script>
 <style>
 	@media (max-width: 768px) {
 		.table th {
diff --git a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
index fe85072aa..fd115b00f 100644
--- a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
+++ b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html
@@ -3,7 +3,7 @@
 <div class="hidden xl:block xl:col-start-10 xl:col-end-13 flex-shrink-0 py-4">
 	<div>
 		<h2 class="ml-2 font-bold text-xl text-gray-900 dark:text-gray-300 font-heading leading-normal mb-2">
-			Fistmas Stickies
+			Stickies
 		</h2>
 		<ul class="flex flex-col space-y-2 mb-0">
 			<li class="flex">
diff --git a/files/templates/CHRISTMAS/submission.html b/files/templates/CHRISTMAS/submission.html
index 596bc7f0f..51ca310ac 100644
--- a/files/templates/CHRISTMAS/submission.html
+++ b/files/templates/CHRISTMAS/submission.html
@@ -295,7 +295,7 @@
 					<!-- Meta information -->
 					<div class="no-scrollbar overflow-y-hidden overflow-x-auto flex items-center space-x-2 md:-ml-2 mb-1 text-sm text-gray-500 leading-normal">
 
-						<div class="relative md:hidden flex-shrink-0 {{ 'santa' if p.author.patron else 'cap' }}">
+						<div class="relative md:hidden flex-shrink-0">
 							<img loading="lazy" src="{{ p.author.profile_url }}" class="w-9 h-9 p-[3px] bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 object-cover" alt="{{ p.author.username }} avatar"/>
 						</div>
 
@@ -581,7 +581,7 @@
 
 			{% if v %}
 			<div id="comment-form-space-{{p.fullname}}" class="comment-write flex px-2.5 md:px-0">
-				<div class="hidden md:block relative flex-shrink-0 mr-4 {{ 'santa' if p.author.patron else 'cap' }}">
+				<div class="hidden md:block relative flex-shrink-0 mr-4">
 					<img loading="lazy" src="{{v.profile_url}}" class="w-14 h-14 p-[3px] bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 object-cover" alt="my avatar"/>
 				</div>
 				{% include "CHRISTMAS/comments/CommentForm.html" %}
diff --git a/files/templates/CHRISTMAS/submission/SubmissionAwards.html b/files/templates/CHRISTMAS/submission/SubmissionAwards.html
index 230f9686b..9293969e3 100644
--- a/files/templates/CHRISTMAS/submission/SubmissionAwards.html
+++ b/files/templates/CHRISTMAS/submission/SubmissionAwards.html
@@ -35,114 +35,3 @@
 </script>
 {% endif %}
 
-<!-- Christmas Awards -->
-
-<!-- Ginger Marsey award -->
-{% if p.award_count("gingerbread") %}
-	{% include "CHRISTMAS/awards/Christmas/Gingerbread.html" %}
-{% endif %}
-
-<!-- Snow award -->
-{% if p.award_count("snow") %}
-
-{% include "CHRISTMAS/awards/Christmas/Snow.html" %}
-{% if p.award_count("snow") > 5 %}
-	<div class="frost"></div>
-{% endif %}
-
-{% set snowCount = p.award_count("snow") if p.award_count("snow") < 5 else 5 %}
-<script defer>
-	document.addEventListener('DOMContentLoaded', function(){
-		var script = document.createElement('script');
-		script.src = 'https://cdn.jsdelivr.net/particles.js/2.0.0/particles.min.js';
-		script.onload = function(){
-			particlesJS("snow", {
-				"particles": {
-					"number": {
-						"value": 60 * {{ snowCount }},
-						"density": {
-							"enable": true,
-							"value_area": 800
-						}
-					},
-					"color": {
-						"value": "#ffffff"
-					},
-					"opacity": {
-						"value": 0.7,
-						"random": false,
-						"anim": {
-							"enable": false
-						}
-					},
-					"size": {
-						"value": 5,
-						"random": true,
-						"anim": {
-							"enable": false
-						}
-					},
-					"line_linked": {
-						"enable": false
-					},
-					"move": {
-						"enable": true,
-						"speed": 4,
-						"direction": "bottom",
-						"random": true,
-						"straight": false,
-						"out_mode": "out",
-						"bounce": false,
-						"attract": {
-							"enable": true,
-							"rotateX": 300,
-							"rotateY": 1200
-						}
-					}
-				},
-				"interactivity": {
-					"events": {
-						"onhover": {
-							"enable": false
-						},
-						"onclick": {
-							"enable": false
-						},
-						"resize": false
-					}
-				},
-				"retina_detect": true
-			});
-		}
-		document.head.append(script);
-	});
-</script>
-{% endif %}
-
-<!-- Songs & Fireplace awards (logged in) -->
-{% if v and not v.grincheffect %}
-	{% if p.award_count("snow") and p.award_count("fireplace") %}
-		<script defer src="/assets/CHRISTMAS/js/christmas/deanmartin.js?a=1"></script>
-	{% elif p.award_count("fireplace")%}
-		<script defer src="/assets/CHRISTMAS/js/christmas/fireplace.js?a=1"></script>
-	{% else %}
-		<script defer src="/assets/CHRISTMAS/js/christmas/playlist.js?a=1"></script>
-	{% endif %}
-{% endif %}
-
-<!-- Songs & Fireplace awards (logged out) -->
-{% if not v %}
-	{% if p.award_count("snow") and p.award_count("fireplace") %}
-		<script defer src="/assets/CHRISTMAS/js/christmas/deanmartin.js?a=1"></script>
-	{% elif p.award_count("fireplace")%}
-		<script defer src="/assets/CHRISTMAS/js/christmas/fireplace.js?a=1"></script>
-	{% else %}
-		<script defer src="/assets/CHRISTMAS/js/christmas/playlist.js?a=1"></script>
-	{% endif %}
-{% endif %}
-
-<!-- Fireplace award -->
-{% if p.award_count("fireplace")%}
-	{% include "CHRISTMAS/awards/Christmas/Fireplace.html" %}
-{% endif %}
-
diff --git a/files/templates/CHRISTMAS/submission_listing.html b/files/templates/CHRISTMAS/submission_listing.html
index 8341d6177..c23cad110 100644
--- a/files/templates/CHRISTMAS/submission_listing.html
+++ b/files/templates/CHRISTMAS/submission_listing.html
@@ -45,12 +45,12 @@
 	</div>
 {% endif %}
 
-<li id="post-{{p.id}}" class="relative p-2.5 mb-2 md:mb-4 md:pb-4 md:pt-0 md:px-0 border-b border-gray-300 dark:border-gray-700 {% if p.is_banned %}bg-red-200{% elif p.deleted_utc %}bg-yellow-200{% else %} md:bg-transparent bg-gray-200 dark:bg-gray-800 dark:md:bg-transparent{% endif %} {% if p.stickied %} stickied{% endif %}{% if voted==1 %} upvoted{% elif voted==-1 %} downvoted{% endif %}{% if p.over_18 %} nsfw{% endif %} list-none {% if p.award_count("snow") %}snowcaps{% endif %} {% if p.award_count("lights") %}lights{% endif %}">
+<li id="post-{{p.id}}" class="relative p-2.5 mb-2 md:mb-4 md:pb-4 md:pt-0 md:px-0 border-b border-gray-300 dark:border-gray-700 {% if p.is_banned %}bg-red-200{% elif p.deleted_utc %}bg-yellow-200{% else %} md:bg-transparent bg-gray-200 dark:bg-gray-800 dark:md:bg-transparent{% endif %} {% if p.stickied %} stickied{% endif %}{% if voted==1 %} upvoted{% elif voted==-1 %} downvoted{% endif %}{% if p.over_18 %} nsfw{% endif %} list-none">
 
 	<div class="flex flex-nowrap">
 
 		<div class="relative z-10 hidden md:flex flex-col flex-shrink-0 items-center mr-4">
-			<div class="relative {{ 'santa' if p.author.patron else 'cap' }}">
+			<div class="relative">
 				<img loading="lazy" src="{{ p.author.profile_url }}" class="hidden md:block flex-shrink-0 w-14 h-14 p-[3px] bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 object-cover" alt="{{ p.author.username }} avatar"/>
 			</div>
 
@@ -93,7 +93,7 @@
 
 			<div class="relative z-10 no-scrollbar overflow-y-hidden overflow-x-auto flex items-center space-x-2 md:-ml-2 mb-1 text-sm text-gray-500 leading-normal {% if p.award_count('ghosts') %}ghosts{% endif %}">
 
-				<div class="relative md:hidden flex-shrink-0 {{ 'santa' if p.author.patron else 'cap' }}">
+				<div class="relative md:hidden flex-shrink-0">
 					<img loading="lazy" src="{{ p.author.profile_url }}" class="flex-shrink-0 w-9 h-9 p-[3px] bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 object-cover" alt="{{ p.author.username }} avatar"/>
 				</div>
 
diff --git a/files/templates/CHRISTMAS/submit.html b/files/templates/CHRISTMAS/submit.html
index 7fbe293de..b161b6836 100644
--- a/files/templates/CHRISTMAS/submit.html
+++ b/files/templates/CHRISTMAS/submit.html
@@ -174,11 +174,9 @@
 {% block modals %}
 {% include "CHRISTMAS/emoji_modal.html" %}
 {% include "CHRISTMAS/gif_modal.html" %}
-{% include 'CHRISTMAS//awards/Christmas/Snow.html' %}
 {% endblock %}
 
 {% block scripts %}
 <script defer src="/assets/CHRISTMAS/js/marked.js?a=1"></script>
 <script defer src="/assets/CHRISTMAS/js/submit.js?a=1"></script>
-<script defer src="/assets/CHRISTMAS/js/christmas/snow.js?a=1"></script>
 {% endblock %}
diff --git a/tailwind.config.js b/tailwind.config.js
index dd7e82d89..fd1c00b79 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -31,7 +31,7 @@ module.exports = {
     },
     fontFamily: {
       'sans-serif': ['Helvetica Neue', '-apple-system', 'BlinkMacSystemFont', 'Tahoma', 'Segoe UI', 'Helvetica', 'sans-serif', 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'],
-      'heading': ['Delius Swash Caps'],
+      'heading': ['Helvetica Neue', '-apple-system', 'BlinkMacSystemFont', 'Tahoma', 'Segoe UI', 'Helvetica', 'sans-serif', 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'],
       'serif': ['Georgia'],
       'mono': 'SFMono-Regular,Consolas,Liberation Mono,Menlo,Courier,monospace'
     },