master
Aevann1 2021-12-18 03:11:15 +02:00
parent c3eda1746f
commit 88f3e2f948
24 changed files with 34 additions and 34 deletions

View File

@ -2,18 +2,18 @@
<!-- Include in /templates/submission/submission.html -->
<!-- Requires `p` object -->
<img class="train1" src="/assets/CHRISTMAS/images/emojis/marseytrain.webp">
<img class="train1" src="/assets/images/emojis/marseytrain.webp">
{% if p.award_count("train") > 1 %}
<img class="train2" src="/assets/CHRISTMAS/images/emojis/marseytrain.webp">
<img class="train2" src="/assets/images/emojis/marseytrain.webp">
{% endif %}
{% if p.award_count("train") > 2 %}
<img class="train3" src="/assets/CHRISTMAS/images/emojis/marseytrain.webp">
<img class="train3" src="/assets/images/emojis/marseytrain.webp">
{% endif %}
{% if p.award_count("train") > 3 %}
<img class="train4" src="/assets/CHRISTMAS/images/emojis/marseytrain.webp">
<img class="train4" src="/assets/images/emojis/marseytrain.webp">
{% endif %}
<style>

View File

@ -1,6 +1,6 @@
{% if v %}
{% include "award_modal.html" %}
<script defer src="/assets/CHRISTMAS/js/marked.js?v=200"></script>
<script defer src="/assets/CHRISTMAS/js/marked.js?v=201"></script>
<script defer src="/assets/CHRISTMAS/js/comments_v.js?v=200"></script>
{% endif %}

View File

@ -338,7 +338,7 @@
<script src="/assets/CHRISTMAS/js/lite-youtube.js?v=200"></script>
<script src="/assets/CHRISTMAS/js/gif_modal.js?v=200"></script>
<script src="/assets/CHRISTMAS/js/emoji_modal.js?v=202"></script>
<script src="/assets/CHRISTMAS/js/emoji_modal.js?v=203"></script>
<script defer src="/assets/CHRISTMAS/js/popover.js?v=200"></script>

View File

@ -17,12 +17,12 @@
</div>
<div class="flex space-x-4 mt-1">
<small class="flex items-center block mt-1 text-gray-300">
<img data-bs-toggle="tooltip" data-bs-placement="bottom" src="/assets/CHRISTMAS/images/emojis/marseycoin.webp" data-bs-original-title="{{'COINS_NAME' | app_config}}" aria-label="{{'COINS_NAME' | app_config}}" class="w-6 h-6 object-contain" alt="coin icon"/>
<img data-bs-toggle="tooltip" data-bs-placement="bottom" src="/assets/images/emojis/marseycoin.webp" data-bs-original-title="{{'COINS_NAME' | app_config}}" aria-label="{{'COINS_NAME' | app_config}}" class="w-6 h-6 object-contain" alt="coin icon"/>
<span class="pl-2">{{v.coins}}</span>
</small>
{% if v.procoins %}
<small class="flex items-center block mt-1 text-gray-300">
<img data-bs-toggle="tooltip" data-bs-placement="bottom" src="/assets/CHRISTMAS/images/emojis/marseybux.webp" data-bs-original-title="MarseyBux" aria-label="MarseyBux" class="w-6 h-6 object-contain" alt="coin icon"/>
<img data-bs-toggle="tooltip" data-bs-placement="bottom" src="/assets/images/emojis/marseybux.webp" data-bs-original-title="MarseyBux" aria-label="MarseyBux" class="w-6 h-6 object-contain" alt="coin icon"/>
<span class="pl-2">{{v.procoins}}</span>
</small>
{% endif %}

View File

@ -17,7 +17,7 @@
<tr>
<td style="font-weight: bold">{{loop.index}}</td>
<td style="font-weight: bold">{{emoji}}</td>
<td><img loading="lazy" data-bs-toggle="tooltip" alt=":{{emoji}}:" title=":{{emoji}}:" delay="0" src="/assets/CHRISTMAS/images/emojis/{{emoji}}.webp" ></td>
<td><img loading="lazy" data-bs-toggle="tooltip" alt=":{{emoji}}:" title=":{{emoji}}:" delay="0" src="/assets/images/emojis/{{emoji}}.webp" ></td>
</tr>
{% endfor %}
</tbody>

View File

@ -9,7 +9,7 @@
{% block content %}
<div class="col-span-full h-screen flex items-center justify-center">
<div class="md:max-w-xl text-center">
<img loading="lazy" src="/assets/CHRISTMAS/images/emojis/marseybrainlet.webp?v=200" class="w-14 h-14 object-contain mb-4">
<img loading="lazy" src="/assets/images/emojis/marseybrainlet.webp?v=200" class="w-14 h-14 object-contain mb-4">
<h1 class="h5">400 Bad Request</h1>
<p class="text-gray-500">
That request was bad and you should feel bad.

View File

@ -9,7 +9,7 @@
{% block content %}
<div class="col-span-full h-screen flex items-center justify-center">
<div class="md:max-w-xl text-center">
<img loading="lazy" src="/assets/CHRISTMAS/images/emojis/marseydead.webp?v=200" class="w-14 h-14 object-contain mb-4">
<img loading="lazy" src="/assets/images/emojis/marseydead.webp?v=200" class="w-14 h-14 object-contain mb-4">
<h1 class="h5">401 Not Authorized</h1>
<p class="text-gray-500 mb-3">
What you're trying to do requires an account. I think. The original error message said something about a castle and I hated that.

View File

@ -9,7 +9,7 @@
{% block content %}
<div class="col-span-full h-screen flex items-center justify-center">
<div class="md:max-w-xl text-center">
<img loading="lazy" src="/assets/CHRISTMAS/images/emojis/marseytroll.webp?v=200" class="w-14 h-14 object-contain mb-4">
<img loading="lazy" src="/assets/images/emojis/marseytroll.webp?v=200" class="w-14 h-14 object-contain mb-4">
<h1 class="h5">403 Forbidden</h1>
<p class="text-gray-500 mb-3">
YOU AREN'T WELCOME HERE GO AWAY

View File

@ -9,7 +9,7 @@
{% block content %}
<div class="col-span-full h-screen flex items-center justify-center">
<div class="md:max-w-xl text-center">
<img loading="lazy" src="/assets/CHRISTMAS/images/emojis/marseyconfused.webp?v=200" class="w-14 h-14 object-contain mb-4">
<img loading="lazy" src="/assets/images/emojis/marseyconfused.webp?v=200" class="w-14 h-14 object-contain mb-4">
<h1 class="h5">404 Page Not Found</h1>
<p class="text-gray-500">
Someone typed something wrong and it was probably you, please do better.

View File

@ -9,7 +9,7 @@
{% block content %}
<div class="col-span-full h-screen flex items-center justify-center">
<div class="md:max-w-xl text-center">
<img loading="lazy" src="/assets/CHRISTMAS/images/emojis/marseyretard.webp?v=200" class="w-14 h-14 object-contain mb-4">
<img loading="lazy" src="/assets/images/emojis/marseyretard.webp?v=200" class="w-14 h-14 object-contain mb-4">
<h1 class="h5">405 Method Not Allowed</h1>
<p class="text-gray-500">
idk how anyone gets this error but if you see this, remember to follow @carpathianflorist

View File

@ -9,7 +9,7 @@
{% block content %}
<div class="col-span-full h-screen flex items-center justify-center">
<div class="md:max-w-xl text-center">
<img loading="lazy" src="/assets/CHRISTMAS/images/emojis/marseyrentfree.webp?v=200" class="w-14 h-14 object-contain mb-4">
<img loading="lazy" src="/assets/images/emojis/marseyrentfree.webp?v=200" class="w-14 h-14 object-contain mb-4">
<h1 class="h5">429 Too Many Requests</h1>
<p class="text-gray-500 mb-3">
go spam somewhere else nerd

View File

@ -9,7 +9,7 @@
{% block content %}
<div class="col-span-full h-screen flex items-center justify-center">
<div class="md:max-w-xl text-center">
<img loading="lazy" src="/assets/CHRISTMAS/images/emojis/marseydead.webp?v=200" class="w-14 h-14 object-contain mb-4">
<img loading="lazy" src="/assets/images/emojis/marseydead.webp?v=200" class="w-14 h-14 object-contain mb-4">
<h1 class="h5">500 Interal Server Error</h1>
<p class="text-gray-500 mb-3">
Hiiiii it's carp! I think this error means that there's a timeout error. And I think that means something took too long to load so it decided not to work at all. If you keep seeing this on the same page <em>but not other pages</em>, then something is probably wrong with that specific function. It may not be called a function, but that sounds right to me. Anyway, ping me and I'll whine to someone smarter to fix it. Don't bother them. Thanks ily <3

View File

@ -9,7 +9,7 @@
{% block content %}
<div class="col-span-full h-screen flex items-center justify-center">
<div class="md:max-w-xl text-center">
<img loading="lazy" src="/assets/CHRISTMAS/images/emojis/marseytwerking.webp?v=200" class="w-14 h-14 object-contain mb-4">
<img loading="lazy" src="/assets/images/emojis/marseytwerking.webp?v=200" class="w-14 h-14 object-contain mb-4">
<h1 class="h5">Are you over 18?</h1>
<p class="text-gray-500 mb-3">
This post is rated +18 (Adult-Only). You must be 18 or older to continue. Are you sure you want to proceed?

View File

@ -9,7 +9,7 @@
{% block content %}
<div class="col-span-full h-screen flex items-center justify-center">
<div class="md:max-w-xl text-center">
<img loading="lazy" src="/assets/CHRISTMAS/images/emojis/marseymerchant.webp?v=200" class="w-14 h-14 object-contain mb-4">
<img loading="lazy" src="/assets/images/emojis/marseymerchant.webp?v=200" class="w-14 h-14 object-contain mb-4">
<h1 class="h5">401 Not Authorized</h1>
<p class="text-gray-500 mb-3">
This page is only available to {% if "rama" in request.host %}paypigs{% else %}patrons{% endif %}:

View File

@ -74,22 +74,22 @@ You can use Markdown formatting:
<tr>
<td>Emojis</td>
<td>:marseylove:</td>
<td><img loading="lazy" data-bs-toggle="tooltip" class="emj" alt=":marseylove:" data-bs-original-title=":marseylove:" delay="0" height="30" src="/assets/CHRISTMAS/images/emojis/marseylove.webp?v=200"></td>
<td><img loading="lazy" data-bs-toggle="tooltip" class="emj" alt=":marseylove:" data-bs-original-title=":marseylove:" delay="0" height="30" src="/assets/images/emojis/marseylove.webp?v=200"></td>
</tr>
<tr>
<td>Mirrored Emojis</td>
<td>:!marseylove:</td>
<td><img loading="lazy" data-bs-toggle="tooltip" class="emj mirrored" alt=":!marseylove:" data-bs-original-title=":!marseylove:" delay="0" height="30" src="/assets/CHRISTMAS/images/emojis/marseylove.webp?v=200"></td>
<td><img loading="lazy" data-bs-toggle="tooltip" class="emj mirrored" alt=":!marseylove:" data-bs-original-title=":!marseylove:" delay="0" height="30" src="/assets/images/emojis/marseylove.webp?v=200"></td>
</tr>
<tr>
<td>Large Emojis</td>
<td>:#marseylove:</td>
<td><img loading="lazy" data-bs-toggle="tooltip" class="emj" alt=":!marseylove:" data-bs-original-title=":!marseylove:" delay="0" src="/assets/CHRISTMAS/images/emojis/marseylove.webp?v=200"></td>
<td><img loading="lazy" data-bs-toggle="tooltip" class="emj" alt=":!marseylove:" data-bs-original-title=":!marseylove:" delay="0" src="/assets/images/emojis/marseylove.webp?v=200"></td>
</tr>
<tr>
<td>Large Mirroed Emojis</td>
<td>:#!marseylove:</td>
<td><img loading="lazy" data-bs-toggle="tooltip" class="emj mirrored" alt=":!marseylove:" data-bs-original-title=":!marseylove:" delay="0" src="/assets/CHRISTMAS/images/emojis/marseylove.webp?v=200"></td>
<td><img loading="lazy" data-bs-toggle="tooltip" class="emj mirrored" alt=":!marseylove:" data-bs-original-title=":!marseylove:" delay="0" src="/assets/images/emojis/marseylove.webp?v=200"></td>
</tr>
<tr>
<td>Poll Options</td>

View File

@ -159,12 +159,12 @@
</div>
<div class="flex space-x-3 mt-1">
<small class="flex items-center block mt-1 text-gray-500">
<img data-bs-toggle="tooltip" data-bs-placement="bottom" src="/assets/CHRISTMAS/images/emojis/marseycoin.webp" data-bs-original-title="{{'COINS_NAME' | app_config}}" aria-label="{{'COINS_NAME' | app_config}}" class="w-6 h-6 object-contain" alt="coin icon"/>
<img data-bs-toggle="tooltip" data-bs-placement="bottom" src="/assets/images/emojis/marseycoin.webp" data-bs-original-title="{{'COINS_NAME' | app_config}}" aria-label="{{'COINS_NAME' | app_config}}" class="w-6 h-6 object-contain" alt="coin icon"/>
<span class="pl-1">{{v.coins}} {{'COINS_NAME' | app_config}}</span>
</small>
{% if v.procoins %}
<small class="flex items-center block mt-1 text-gray-500">
<img data-bs-toggle="tooltip" data-bs-placement="bottom" src="/assets/CHRISTMAS/images/emojis/marseybux.webp" data-bs-original-title="{{'COINS_NAME' | app_config}}" aria-label="{{'COINS_NAME' | app_config}}" class="w-6 h-6 object-contain" alt="coin icon"/>
<img data-bs-toggle="tooltip" data-bs-placement="bottom" src="/assets/images/emojis/marseybux.webp" data-bs-original-title="{{'COINS_NAME' | app_config}}" aria-label="{{'COINS_NAME' | app_config}}" class="w-6 h-6 object-contain" alt="coin icon"/>
<span class="pl-1">{{v.procoins}} MarseyBux</span>
</small>
{% endif %}

View File

@ -96,8 +96,8 @@
<div><img loading="lazy" src="{{v.profile_url}}" class="profile-pic-35"></div>
<div class="text-left pl-2">
<div style="color: #{{v.namecolor}}" class="text-small font-weight-bold {% if v.patron %}patron{% endif %}"><span {% if v.patron %}class="patron" style="background-color:#{{v.namecolor}};"{% endif %}>{{v.username}}</span></div>
<div class="text-small-extra text-primary"><img class="mr-1 ml-1" data-bs-toggle="tooltip" data-bs-placement="bottom" height="13" src="/assets/CHRISTMAS/images/emojis/marseycoin.webp" data-bs-original-title="{{'COINS_NAME' | app_config}}" aria-label="{{'COINS_NAME' | app_config}}"><span id="user-coins-amount">{{v.coins}}</span> {{'COINS_NAME' | app_config}}</div>
{% if v.procoins %}<div class="text-small-extra text-primary"><img class="mr-1 ml-1" data-bs-toggle="tooltip" data-bs-placement="bottom" height="13" src="/assets/CHRISTMAS/images/emojis/marseybux.webp" data-bs-original-title="Marseybux" aria-label="Marseybux"><span>{{v.procoins}}</span> Marseybux</div>{% endif %}
<div class="text-small-extra text-primary"><img class="mr-1 ml-1" data-bs-toggle="tooltip" data-bs-placement="bottom" height="13" src="/assets/images/emojis/marseycoin.webp" data-bs-original-title="{{'COINS_NAME' | app_config}}" aria-label="{{'COINS_NAME' | app_config}}"><span id="user-coins-amount">{{v.coins}}</span> {{'COINS_NAME' | app_config}}</div>
{% if v.procoins %}<div class="text-small-extra text-primary"><img class="mr-1 ml-1" data-bs-toggle="tooltip" data-bs-placement="bottom" height="13" src="/assets/images/emojis/marseybux.webp" data-bs-original-title="Marseybux" aria-label="Marseybux"><span>{{v.procoins}}</span> Marseybux</div>{% endif %}
</div>
</div>
</a>

View File

@ -36,10 +36,10 @@
<div class="dropdown dropdown-actions">
<button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{% if admin %}<img src="/@{{admin}}/pic" alt="avatar" width=20 height=20 class="rounded-circle mr-2">{{admin}}{% else %}<img src="/assets/CHRISTMAS/images/emojis/marseyjanny.webp" alt="avatar" width=20 height=20 class="rounded-circle mr-2">All{% endif %}
{% if admin %}<img src="/@{{admin}}/pic" alt="avatar" width=20 height=20 class="rounded-circle mr-2">{{admin}}{% else %}<img src="/assets/images/emojis/marseyjanny.webp" alt="avatar" width=20 height=20 class="rounded-circle mr-2">All{% endif %}
</button>
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton" x-placement="bottom-start" style="position: absolute; will-change: transform; top: 0px; left: 0px; transform: translate3d(0px, 31px, 0px);">
<a class="dropdown-item" href="/log{% if type %}?kind={{type}}{% endif %}"><img src="/assets/CHRISTMAS/images/emojis/marseyjanny.webp" alt="avatar" width=20 height=20 class="rounded-circle mr-2">All</a>
<a class="dropdown-item" href="/log{% if type %}?kind={{type}}{% endif %}"><img src="/assets/images/emojis/marseyjanny.webp" alt="avatar" width=20 height=20 class="rounded-circle mr-2">All</a>
{% for a in admins %}
<a class="dropdown-item" href="?admin={{a}}{% if type %}&kind={{type}}{% endif %}"><img src="/@{{a}}/pic" alt="avatar" width=20 height=20 class="rounded-circle mr-2">{{a}}</a>
{% endfor %}

View File

@ -409,7 +409,7 @@
<script src="/assets/CHRISTMAS/js/settings_profile.js?v=200"></script>
<script src="/assets/CHRISTMAS/js/gif_modal.js?v=200"></script>
<script src="/assets/CHRISTMAS/js/emoji_modal.js?v=200"></script>
<script src="/assets/CHRISTMAS/js/emoji_modal.js?v=203"></script>
<script>
document.onpaste = function(event) {

View File

@ -247,7 +247,7 @@
<div class="relative z-10 flex flex-row flex-nowrap pl-3 md:pl-5 flex-shrink-0">
<div style="z-index: 3;">
{% if p.club and not (v and v.paid_dues) %}
<img loading="lazy" src="/assets/CHRISTMAS/images/emojis/marseyglow.webp" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover object-cover bg-white border border-gray-300 flex-shrink-0">
<img loading="lazy" src="/assets/images/emojis/marseyglow.webp" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover object-cover bg-white border border-gray-300 flex-shrink-0">
{% elif not p.url %}
<a {% if v and v.newtab %}target="_blank"{% endif %} {% if v %}href="{{p.permalink}}"{% else %}href="/logged_out{{p.permalink}}"{% endif %}>
<img loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover object-cover bg-white border border-gray-300 flex-shrink-0">

View File

@ -166,7 +166,7 @@
{% endblock %}
{% block scripts %}
<script defer src="/assets/CHRISTMAS/js/marked.js?v=200"></script>
<script defer src="/assets/CHRISTMAS/js/marked.js?v=201"></script>
<script defer src="/assets/CHRISTMAS/js/submit.js?v=200"></script>
<script defer src="/assets/CHRISTMAS/js/christmas/snow.js?v=200"></script>
{% endblock %}

View File

@ -42,7 +42,7 @@
</div>
{% else %}
<div class="md:max-w-xl text-center">
<img loading="lazy" src="/assets/CHRISTMAS/images/emojis/marseydead.webp?v=200" class="w-14 h-14 object-contain mb-4">
<img loading="lazy" src="/assets/images/emojis/marseydead.webp?v=200" class="w-14 h-14 object-contain mb-4">
{% if '/saved/' in request.path %}
<h3 class="h5">You have no saved comments</h3>
<p class="text-gray-500 mb-3">

View File

@ -3,7 +3,7 @@
{% block content %}
<div class="col-span-full xl:col-span-9 py-36 flex items-center justify-center">
<div class="md:max-w-xl text-center">
<img loading="lazy" src="/assets/CHRISTMAS/images/emojis/marseytroll.webp?v=200" class="w-14 h-14 object-contain mb-4">
<img loading="lazy" src="/assets/images/emojis/marseytroll.webp?v=200" class="w-14 h-14 object-contain mb-4">
<h1 class="h5">This account is private</h1>
<p class="text-gray-500 mb-3">
YOU AREN'T WELCOME HERE GO AWAY

View File

@ -81,7 +81,7 @@
</div>
</div>
<script src="/assets/js/emoji_modal.js?v=192"></script>
<script src="/assets/js/emoji_modal.js?v=193"></script>
<style>
a.emojitab {