carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

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

master
Aevann1 2022-10-06 01:24:57 +02:00
parent 2f979b859b 3f338fc3f2
commit 25707af72a
4 changed files with 113 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
files/assets/css/main.css
View File

@ -2480,6 +2480,9 @@ a.bg-light:hover, a.bg-light:focus, button.bg-light:hover, button.bg-light:focus
.text-center { .text-center {
text-align: center !important; text-align: center !important;
} }
.text-justify {
text-align: justify !important;
}
@media (min-width: 768px) { @media (min-width: 768px) {
.text-md-left { .text-md-left {
text-align: left !important; text-align: left !important;
@ -2509,6 +2512,9 @@ a.bg-light:hover, a.bg-light:focus, button.bg-light:hover, button.bg-light:focus
.font-italic { .font-italic {
font-style: italic !important; font-style: italic !important;
} }
.font-underline {
text-decoration: underline !important;
}
.text-primary { .text-primary {
color: var(--primary) !important; color: var(--primary) !important;
} }

10
files/helpers/jinja2.py
View File

@ -68,4 +68,12 @@ def inject_constants():
"CASINO_ENABLED":CASINO_ENABLED, "GUMROAD_LINK":GUMROAD_LINK, "CASINO_ENABLED":CASINO_ENABLED, "GUMROAD_LINK":GUMROAD_LINK,
"DEFAULT_THEME":DEFAULT_THEME, "DESCRIPTION":DESCRIPTION, "DEFAULT_THEME":DEFAULT_THEME, "DESCRIPTION":DESCRIPTION,
"has_sidebar":has_sidebar, "has_logo":has_logo, "has_app":has_app, "has_sidebar":has_sidebar, "has_logo":has_logo, "has_app":has_app,
"FP":FP, "NOTIF_MODACTION_JL_MIN":NOTIF_MODACTION_JL_MIN, "cache":cache, "ONLINE_STR":ONLINE_STR, "patron":patron, "approved_embed_hosts":approved_embed_hosts, "dues":dues, "SIDEBAR_THREAD":SIDEBAR_THREAD, "BANNER_THREAD":BANNER_THREAD, "BADGE_THREAD":BADGE_THREAD, "SNAPPY_THREAD":SNAPPY_THREAD, "KOFI_TOKEN":KOFI_TOKEN, "KOFI_LINK":KOFI_LINK, "MAIL_USERNAME":app.config['MAIL_USERNAME']} "FP":FP, "NOTIF_MODACTION_JL_MIN":NOTIF_MODACTION_JL_MIN, "cache":cache,
"ONLINE_STR":ONLINE_STR, "patron":patron, "dues":dues,
"SIDEBAR_THREAD":SIDEBAR_THREAD, "BANNER_THREAD":BANNER_THREAD,
"BADGE_THREAD":BADGE_THREAD, "SNAPPY_THREAD":SNAPPY_THREAD,
"KOFI_TOKEN":KOFI_TOKEN, "KOFI_LINK":KOFI_LINK,
"approved_embed_hosts":approved_embed_hosts,
"site_settings":app.config['SETTINGS'],
"MAIL_USERNAME":app.config['MAIL_USERNAME'],
}

1
files/routes/admin.py
View File

@ -430,7 +430,6 @@ def admin_home(v):
return render_template("admin/admin_home.html", v=v, return render_template("admin/admin_home.html", v=v,
under_attack=under_attack, under_attack=under_attack,
site_settings=app.config['SETTINGS'],
gitref=gitref) gitref=gitref)
def admin_git_head(): def admin_git_head():

14
files/templates/sign_up.html
View File

@ -57,6 +57,15 @@
{% if ref_user %} {% if ref_user %}
<h1 class="h2">@{{ref_user.username}} has invited you!</h1> <h1 class="h2">@{{ref_user.username}} has invited you!</h1>
<p class="text-muted mb-md-2">Looks like someone wants you to join {{SITE_NAME}}.</p> <p class="text-muted mb-md-2">Looks like someone wants you to join {{SITE_NAME}}.</p>
{% elif SITE_NAME == 'WPD' and site_settings['login_required'] %}
<p class="text-muted text-justify mb-1" style="line-height: 1.2em">
<strong>Hi you!</strong> &mdash; <span style="font-variant-caps: small-caps;">WatchPeopleDie.co</span> is currently doing our monthly 24(ish) hours of "everyone needs to have an account"&mdash;sorry about that! But making an account is actually super easy. <strong>You don't even need an email address!</strong> Literally just pick a username, set a password, and that's that. Bam, done, like 8 seconds, tops.<br>
</p>
<p class="text-muted mb-md-2">
We WANT you with us &#128150;<br>
Please join!
</p>
<hr>
{% else %} {% else %}
<h1 class="h2">Create your account.</h1> <h1 class="h2">Create your account.</h1>
<p class="text-muted mb-md-2">No email address required.</p> <p class="text-muted mb-md-2">No email address required.</p>
@ -126,16 +135,11 @@
</div> </div>
<div class="col-12 col-md-6 d-none d-md-block"> <div class="col-12 col-md-6 d-none d-md-block">
<div class="splash-wrapper"> <div class="splash-wrapper">
<div class="splash-overlay"></div> <div class="splash-overlay"></div>
<img alt="cover" loading="lazy" class="splash-img" src="{{'cover.webp' | asset_siteimg}}"></img> <img alt="cover" loading="lazy" class="splash-img" src="{{'cover.webp' | asset_siteimg}}"></img>
</div> </div>
</div> </div>
</div> </div>
</div> </div>