MarseyWorld
/
MarseyWorld
10
10
Fork 0
Code Issues 2 Pull Requests Packages Releases Wiki Activity

fdMerge branch 'frost' of https://github.com/Aevann1/Drama into frost

remotes/1693045480750635534/spooky-22
Aevann1 2022-04-09 16:43:16 +00:00
parent 6319ee8ce8 6db737ba03
commit 346ad15501
10 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/templates/chat.html
View File

@ -14,7 +14,7 @@
<title>Chat</title> <title>Chat</title>
<style>:root{--primary:#{{v.themecolor}}}</style> <style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=219"> <link rel="stylesheet" href="/assets/css/main.css?v=220">
<link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=41"> <link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=41">
{% if v.css %} {% if v.css %}
<link rel="stylesheet" href="/@{{v.username}}/css"> <link rel="stylesheet" href="/@{{v.username}}/css">

2
files/templates/comments.html
View File

@ -594,7 +594,7 @@
{% endif %} {% endif %}
{% if request.path == '/notifications' and c.level == 1 and c.sentto and not c.parent_submission and c.author_id not in (NOTIFICATIONS_ID, AUTOJANNY_ID) %} {% if request.path == '/notifications' and c.level == 1 and c.sentto and not c.parent_submission and c.author_id not in (NOTIFICATIONS_ID, AUTOJANNY_ID) %}
<a class="btn btn-primary" role="button" onclick="openReplyBox('reply-message-{{c.id}}')">Reply</a> <a class="btn btn-primary mt-3" role="button" onclick="openReplyBox('reply-message-{{c.id}}')">Reply</a>
<pre></pre> <pre></pre>
<div id="reply-message-{{c.id}}" class="d-none"> <div id="reply-message-{{c.id}}" class="d-none">
<div id="comment-form-space-{{c.id}}" class="comment-write collapsed child"> <div id="comment-form-space-{{c.id}}" class="comment-write collapsed child">

4
files/templates/default.html
View File

@ -7,7 +7,7 @@
<script src="/assets/js/bootstrap.js?v=245"></script> <script src="/assets/js/bootstrap.js?v=245"></script>
{% 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=219"> <link rel="stylesheet" href="/assets/css/main.css?v=220">
<link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=41"> <link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=41">
{% if v.agendaposter %} {% if v.agendaposter %}
<style> <style>
@ -32,7 +32,7 @@
{% endif %} {% endif %}
{% else %} {% else %}
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style> <style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=219"> <link rel="stylesheet" href="/assets/css/main.css?v=220">
<link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41"> <link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41">
{% endif %} {% endif %}

4
files/templates/log.html
View File

@ -6,7 +6,7 @@
{% 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=219"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=41"> <link rel="stylesheet" href="/assets/css/main.css?v=220"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=41">
{% if v.agendaposter %} {% if v.agendaposter %}
<style> <style>
html { html {
@ -30,7 +30,7 @@
{% endif %} {% endif %}
{% else %} {% else %}
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style> <style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=219"><link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41"> <link rel="stylesheet" href="/assets/css/main.css?v=220"><link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41">
{% endif %} {% endif %}
<div class="row justify-content-around"> <div class="row justify-content-around">

2
files/templates/login.html
View File

@ -18,7 +18,7 @@
{% endblock %} {% endblock %}
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style> <style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=219"> <link rel="stylesheet" href="/assets/css/main.css?v=220">
<link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41"> <link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41">
</head> </head>

2
files/templates/login_2fa.html
View File

@ -14,7 +14,7 @@
<title>2-Step Login - {{SITE_NAME}}</title> <title>2-Step Login - {{SITE_NAME}}</title>
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style> <style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=219"><link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41"> <link rel="stylesheet" href="/assets/css/main.css?v=220"><link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41">
</head> </head>

4
files/templates/settings2.html
View File

@ -39,10 +39,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=219"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=41"> <link rel="stylesheet" href="/assets/css/main.css?v=220"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=41">
{% else %} {% else %}
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style> <style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=219"><link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41"> <link rel="stylesheet" href="/assets/css/main.css?v=220"><link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41">
{% endif %} {% endif %}
</head> </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}}{% else %}Sign up - {{SITE_NAME}}{% endif %}</title> <title>{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %}</title>
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style> <style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=219"><link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41"> <link rel="stylesheet" href="/assets/css/main.css?v=220"><link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41">
</head> </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}}{% else %}{{SITE_NAME}}{% endif %}</title> <title>{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %}</title>
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style> <style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=219"><link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41"> <link rel="stylesheet" href="/assets/css/main.css?v=220"><link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41">
</head> </head>

4
files/templates/submit.html
View File

@ -26,7 +26,7 @@
{% block stylesheets %} {% block stylesheets %}
{% 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=219"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=41"> <link rel="stylesheet" href="/assets/css/main.css?v=220"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=41">
{% if v.agendaposter %} {% if v.agendaposter %}
<style> <style>
html { html {
@ -50,7 +50,7 @@
{% endif %} {% endif %}
{% else %} {% else %}
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style> <style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=219"> <link rel="stylesheet" href="/assets/css/main.css?v=220">
<link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41"> <link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41">
{% endif %} {% endif %}
{% endblock %} {% endblock %}