skorotkiewicz/rDrama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Aevann1 2021-12-12 19:30:12 +02:00
commit 5845ca2c7e
12 changed files with 32 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -3,8 +3,8 @@ chart.png
video.mp4 video.mp4
video.webm video.webm
cache/ cache/
images/ /images/
songs/ /songs/
__pycache__/ __pycache__/
disablesignups disablesignups
*rules.html *rules.html

9
files/assets/css/lite-youtube.css
View file

@ -38,10 +38,9 @@ lite-youtube > iframe {
border: 0; border: 0;
} }
/* play button */
lite-youtube > .lty-playbtn { lite-youtube > .lty-playbtn {
width: 68px; width: 100px;
height: 48px; height: 100px;
position: absolute; position: absolute;
cursor: pointer; cursor: pointer;
transform: translate3d(-50%, -50%, 0); transform: translate3d(-50%, -50%, 0);
@ -49,9 +48,7 @@ lite-youtube > .lty-playbtn {
left: 50%; left: 50%;
z-index: 1; z-index: 1;
background-color: transparent; background-color: transparent;
/* YT's actual play button svg */ background-image: url('/assets/images/youtube.webp?v=1');
background-image: url('data:image/svg+xml;utf8,<svg xmlns="https://www.w3.org/2000/svg" viewBox="0 0 68 48"><path d="M66.52 7.74c-.78-2.93-2.49-5.41-5.42-6.19C55.79.13 34 0 34 0S12.21.13 6.9 1.55c-2.93.78-4.63 3.26-5.42 6.19C.06 13.05 0 24 0 24s.06 10.95 1.48 16.26c.78 2.93 2.49 5.41 5.42 6.19C12.21 47.87 34 48 34 48s21.79-.13 27.1-1.55c2.93-.78 4.64-3.26 5.42-6.19C67.94 34.95 68 24 68 24s-.06-10.95-1.48-16.26z" fill="red"/><path d="M45 24 27 14v20" fill="white"/></svg>');
filter: grayscale(100%);
transition: filter .1s cubic-bezier(0, 0, 0.2, 1); transition: filter .1s cubic-bezier(0, 0, 0.2, 1);
border: none; border: none;
} }

BIN
files/assets/images/youtube.webp Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

2
files/routes/posts.py
View file

@ -187,7 +187,7 @@ def post_id(pid, anything=None, v=None):
offset = 0 offset = 0
if post.comment_count > 60: if not request.headers.get("Authorization") and post.comment_count > 60:
comments2 = [] comments2 = []
count = 0 count = 0
if post.created_utc > 1638672040: if post.created_utc > 1638672040:

4
files/templates/authforms.html
View file

@ -14,11 +14,11 @@
{% if v %} {% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style> <style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=151"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125"> <link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=125">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %} {% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=125">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
{% else %} {% else %}
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style> <style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=151"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125"> <link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
{% endif %} {% endif %}
</head> </head>

4
files/templates/log.html
View file

@ -6,11 +6,11 @@
{% block content %} {% block content %}
{% if v %} {% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style> <style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=151"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125"> <link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=125">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %} {% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=125">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
{% else %} {% else %}
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style> <style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=151"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125"> <link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
{% endif %} {% endif %}
<div class="row justify-content-around"> <div class="row justify-content-around">

2
files/templates/login_2fa.html
View file

@ -13,7 +13,7 @@
<title>2-Step Login - {{'SITE_NAME' | app_config}}</title> <title>2-Step Login - {{'SITE_NAME' | app_config}}</title>
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style> <style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=151"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125"> <link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
</head> </head>

2
files/templates/settings.html
View file

@ -174,6 +174,8 @@
</div> </div>
</div> </div>
<div id="formkey" class="hidden">{{ v.formkey }}</div>
{% if v %} {% if v %}
{% include "/modals/Modal2FA.html" %} {% include "/modals/Modal2FA.html" %}
{% endif %} {% endif %}

6
files/templates/settings2.html
View file

@ -38,10 +38,10 @@
{% if v %} {% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style> <style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=151"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125"> <link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
{% else %} {% else %}
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style> <style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=151"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125"> <link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
{% endif %} {% endif %}
<link href="/assets/css/fa.css?v=55" rel="stylesheet"> <link href="/assets/css/fa.css?v=55" rel="stylesheet">
@ -149,6 +149,8 @@
</div> </div>
</div> </div>
<div id="formkey" class="hidden">{{ v.formkey }}</div>
{% block mobilenavbar %} {% block mobilenavbar %}
{% include "mobile_navigation_bar.html" %} {% include "mobile_navigation_bar.html" %}
{% endblock %} {% endblock %}

13
files/templates/settings_filters.html
View file

@ -10,6 +10,19 @@
<div class="settings"> <div class="settings">
<h2 class="label text-black">Grinch Mode</h2>
<div class="body w-lg-100">
<div>
<input type="checkbox" id="grincheffect" name="grincheffect"{% if v.grincheffect %} checked{% endif %} onchange="post_toast('/settings/profile?grincheffect='+document.getElementById('grincheffect').checked);">
<label class="inline-block pl-2 text-gray-400" for="grincheffect">
Disable holigay music.
</label>
</div>
</div>
<h2 class="label text-black">Highlight New Comments</h2> <h2 class="label text-black">Highlight New Comments</h2>
<div class="body w-lg-100"> <div class="body w-lg-100">

2
files/templates/sign_up_failed_ref.html
View file

@ -31,7 +31,7 @@
<title>{% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}{{'SITE_NAME' | app_config}}{% endif %}</title> <title>{% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}{{'SITE_NAME' | app_config}}{% endif %}</title>
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style> <style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=151"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125"> <link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
</head> </head>

2
files/templates/submission/SubmissionAwards.html
View file

@ -120,7 +120,7 @@
{% endif %} {% endif %}
<!-- Songs & Fireplace awards (logged in) --> <!-- Songs & Fireplace awards (logged in) -->
{% if v and not v.grinch %} {% if v and not v.grincheffect %}
{% if p.award_count("snow") and p.award_count("fireplace") %} {% if p.award_count("snow") and p.award_count("fireplace") %}
<script defer src="/assets/js/christmas/deanmartin.js?v=1"></script> <script defer src="/assets/js/christmas/deanmartin.js?v=1"></script>
{% elif p.award_count("fireplace")%} {% elif p.award_count("fireplace")%}