TriHard
/
rDrama
forked from rDrama/rDrama
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'frost' into william

master
kek7198 2021-12-31 10:14:03 -06:00
parent 80baff62a7 e7943edc61
commit 9c91927219
13 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files/templates/authforms.html
View File

@ -15,7 +15,7 @@
{% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=46"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
<link rel="stylesheet" href="/static/assets/css/main.css?a=52"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
{% if v.agendaposter %}
<style>
html {
@ -39,7 +39,7 @@
{% endif %}
{% else %}
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=46"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
<link rel="stylesheet" href="/static/assets/css/main.css?a=52"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
{% endif %}
</head>

2
files/templates/changelog.html
View File

@ -104,6 +104,6 @@
</nav>
{% endif %}
<script src="/static/assets/js/post_toast2.js?a=6"></script>
<script src="/static/assets/js/post_toast2.js?a=7"></script>
{% endblock %}

2
files/templates/comments.html
View File

@ -844,7 +844,7 @@
{% if v %}
<script src="/static/assets/js/marked.js?a=3"></script>
<script src="/static/assets/js/comments_v.js?a=6"></script>
<script src="/static/assets/js/comments_v.js?a=7"></script>
{% endif %}
<script src="/static/assets/js/clipboard.js?a=3"></script>

68
files/templates/default.html
View File

@ -7,7 +7,7 @@
<script src="/static/assets/js/bootstrap.js?a=3"></script>
{% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=46">
<link rel="stylesheet" href="/static/assets/css/main.css?a=52">
<link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
{% if v.agendaposter %}
<style>
@ -32,7 +32,7 @@
{% endif %}
{% else %}
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=46"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
<link rel="stylesheet" href="/static/assets/css/main.css?a=52"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
{% endif %}
<meta charset="utf-8">
@ -40,7 +40,7 @@
<meta name="thumbnail" content="/static/assets/images/{{'SITE_NAME' | app_config}}/preview.webp?a=3">
<link rel="icon" type="image/png" href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6">
<link rel="icon" type="image/png" href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7">
{% block title %}
<title>{{'SITE_NAME' | app_config}}</title>
@ -67,10 +67,10 @@
<meta name="format-detection" content="telephone=no">
<meta name="viewport" content="width=device-width,initial-scale=1">
<link rel="apple-touch-icon" sizes="180x180" href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6">
<link rel="apple-touch-icon" sizes="180x180" href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7">
<link rel="manifest" href="/static/assets/manifest.json?a=1">
<link rel="mask-icon" href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6" color="#{{'DEFAULT_COLOR' | app_config}}">
<link rel="shortcut icon" href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6">
<link rel="mask-icon" href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7" color="#{{'DEFAULT_COLOR' | app_config}}">
<link rel="shortcut icon" href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7">
<meta name="apple-mobile-web-app-title" content="{{'SITE_NAME' | app_config}}">
<meta name="application-name" content="{{'SITE_NAME' | app_config}}">
<meta name="msapplication-TileColor" content="#{{'DEFAULT_COLOR' | app_config}}">
@ -82,127 +82,127 @@
<link
rel="apple-touch-startup-image"
sizes="320x480"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7"
>
<link
rel="apple-touch-startup-image"
sizes="640x960"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7"
>
<link
rel="apple-touch-icon"
sizes="640x1136"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7"
>
<link
rel="apple-touch-icon"
sizes="750x1334"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7"
>
<link
rel="apple-touch-startup-image"
sizes="768x1004"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7"
>
<link
rel="apple-touch-startup-image"
sizes="768x1024"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7"
>
<link
rel="apple-touch-startup-image"
sizes="828x1792"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7"
>
<link
rel="apple-touch-startup-image"
sizes="1024x748"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7"
>
<link
rel="apple-touch-startup-image"
sizes="1024x768"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7"
>
<link
rel="apple-touch-startup-image"
sizes="1125x2436"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7"
>
<link
rel="apple-touch-startup-image"
sizes="1242x2208"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7"
>
<link
rel="apple-touch-startup-image"
sizes="1242x2688"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7"
>
<link
rel="apple-touch-startup-image"
sizes="1334x750"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7"
>
<link
rel="apple-touch-startup-image"
sizes="1536x2008"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7"
>
<link
rel="apple-touch-startup-image"
sizes="1536x2048"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7"
>
<link
rel="apple-touch-startup-image"
sizes="1668x2224"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7"
>
<link
rel="apple-touch-startup-image"
sizes="1792x828"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7"
>
<link
rel="apple-touch-startup-image"
sizes="2048x1496"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7"
>
<link
rel="apple-touch-startup-image"
sizes="2048x1536"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7"
>
<link
rel="apple-touch-startup-image"
sizes="2048x2732"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7"
>
<link
rel="apple-touch-startup-image"
sizes="2208x1242"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7"
>
<link
rel="apple-touch-startup-image"
sizes="2224x1668"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7"
>
<link
rel="apple-touch-startup-image"
sizes="2436x1125"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7"
>
<link
rel="apple-touch-startup-image"
sizes="2668x1242"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7"
>
<link
rel="apple-touch-startup-image"
sizes="2737x2048"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6"
href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7"
>
{% block fixedMobileBarJS %}
@ -227,7 +227,7 @@
{% if v %}
<a href="{% if 'rama' in request.host %}https://secure.transequality.org/site/Donation2?df_id=1480{% else %}/{% endif %}">
<img class="banner" alt="site banner" src="/static/assets/images/{{'SITE_NAME' | app_config}}/banner.webp?a=5" width="100%">
<img class="banner" alt="site banner" src="/static/assets/images/{{'SITE_NAME' | app_config}}/banner.webp?a=7" width="100%">
</a>
{% else %}
<a href="/login">
@ -272,7 +272,7 @@
{% endblock %}
</div>
{% if request.path == '/' %}
{% if request.path in ('/', '/logged_out', '/logged_out/') %}
{% block sidebar %}
{% set template = "sidebar_" + environ.get("SITE_NAME") + ".html" %}
{% include template %}
@ -318,7 +318,7 @@
<script src="/static/assets/js/lozad.js?a=3"></script>
{% if v %}
<script src="/static/assets/js/post_toast2.js?a=6"></script>
<script src="/static/assets/js/post_toast2.js?a=7"></script>
<script src="/static/assets/js/formatting.js?a=3"></script>
<script src="/static/assets/js/default.js?a=3"></script>
{% endif %}

4
files/templates/header.html
View File

@ -8,7 +8,7 @@
<div class="container-fluid" style="padding:0;">
<div class="flex-grow-1">
<a href="/" class="navbar-brand mr-auto">
<img alt="header icon" loading="lazy" height="30" src="/static/assets/images/{{'SITE_NAME' | app_config}}/headericon.webp?a=6">
<img alt="header icon" loading="lazy" height="30" src="/static/assets/images/{{'SITE_NAME' | app_config}}/headericon.webp?a=7">
{% if "gigachadlife" in request.host %}
<span style="font-weight: bold; font-size: 1.2rem;">GigaChadLife</span>
{% elif 'pcm' not in request.host %}
@ -210,7 +210,7 @@
</div>
</nav>
<script src="/static/assets/js/header.js?a=6"></script>
<script src="/static/assets/js/header.js?a=7"></script>
<style>
.notif-count {

4
files/templates/log.html
View File

@ -6,7 +6,7 @@
{% block content %}
{% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=46"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
<link rel="stylesheet" href="/static/assets/css/main.css?a=52"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
{% if v.agendaposter %}
<style>
html {
@ -30,7 +30,7 @@
{% endif %}
{% else %}
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=46"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
<link rel="stylesheet" href="/static/assets/css/main.css?a=52"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
{% endif %}
<div class="row justify-content-around">

2
files/templates/login.html
View File

@ -18,7 +18,7 @@
{% endblock %}
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=46">
<link rel="stylesheet" href="/static/assets/css/main.css?a=52">
<link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
</head>

2
files/templates/login_2fa.html
View File

@ -14,7 +14,7 @@
<title>2-Step Login - {{'SITE_NAME' | app_config}}</title>
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=46"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
<link rel="stylesheet" href="/static/assets/css/main.css?a=52"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
</head>

4
files/templates/settings.html
View File

@ -12,7 +12,7 @@
<meta name="author" content="">
<link rel="icon" type="image/png" href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6">
<link rel="icon" type="image/png" href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7">
<title>{% block pagetitle %}Settings - {{'SITE_NAME' | app_config}}{% endblock %}</title>
<meta property="og:type" content="article" >
@ -34,7 +34,7 @@
<style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=46"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
<link rel="stylesheet" href="/static/assets/css/main.css?a=52"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
{% if v.agendaposter %}
<style>
html {

6
files/templates/settings2.html
View File

@ -13,7 +13,7 @@
<meta name="author" content="">
<meta name="thumbnail" content="/static/assets/images/{{'SITE_NAME' | app_config}}/preview.webp?a=3">
<link rel="icon" type="image/png" href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6">
<link rel="icon" type="image/png" href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7">
<meta property="og:type" content="article" >
<meta property="og:title" content="{{'SITE_NAME' | app_config}}" >
@ -39,10 +39,10 @@
{% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=46"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
<link rel="stylesheet" href="/static/assets/css/main.css?a=52"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
{% else %}
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=46"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
<link rel="stylesheet" href="/static/assets/css/main.css?a=52"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
{% endif %}
</head>

2
files/templates/sign_up.html
View File

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

2
files/templates/sign_up_failed_ref.html
View File

@ -32,7 +32,7 @@
<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>
<link rel="stylesheet" href="/static/assets/css/main.css?a=46"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
<link rel="stylesheet" href="/static/assets/css/main.css?a=52"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
</head>

6
files/templates/submit.html
View File

@ -10,7 +10,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="author" content="">
<link rel="icon" type="image/png" href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=6">
<link rel="icon" type="image/png" href="/static/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?a=7">
{% if request.host == 'pcmemes.net' %}
{% set cc='Splash Mountain' %}
@ -26,7 +26,7 @@
{% block stylesheets %}
{% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=46"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
<link rel="stylesheet" href="/static/assets/css/main.css?a=52"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
{% if v.agendaposter %}
<style>
html {
@ -50,7 +50,7 @@
{% endif %}
{% else %}
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=46">
<link rel="stylesheet" href="/static/assets/css/main.css?a=52">
<link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
{% endif %}
{% endblock %}