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

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

master
Aevann1 2022-01-02 02:15:58 +02:00
parent e57368d141 ae284652d7
commit 0a77a3094e
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files/templates/CHRISTMAS/default.html
View File

@ -215,10 +215,6 @@
<link href="/assets/CHRISTMAS/css/fa.css?a=1" rel="stylesheet">
<style>
@font-face { font-family: 'Delius Swash Caps'; src: url('/assets/CHRISTMAS/fonts/DeliusSwashCaps-Regular.ttf'); }
</style>
</head>
<body id="{% if request.path != '/comments' %}{% block pagetype %}frontpage{% endblock %}{% endif %}" class="overflow-hidden overflow-y-auto antialiased text-black bg-gray-700 dark:text-gray-100">

10
files/templates/CHRISTMAS/settings.html
View File

@ -34,7 +34,7 @@
{% block stylesheets %}
<link rel="stylesheet" href="/assets/CHRISTMAS/css/main.css?a=7">
<link rel="stylesheet" href="/static/assets/CHRISTMAS/css/main.css?a=7">
<link rel="stylesheet" href="/static/dist/main.css?a=7">
@ -42,7 +42,7 @@
<style>:root{--primary:#{{v.themecolor}}}</style>
<!-- <link rel="stylesheet" href="/assets/CHRISTMAS/css/{{v.theme}}.css?a=1"> -->
{% if v.agendaposter %}
<link rel="stylesheet" href="/assets/CHRISTMAS/css/agendaposter.css?a=1">
<link rel="stylesheet" href="/static/assets/CHRISTMAS/css/agendaposter.css?a=1">
{% elif v.css and not request.path.startswith('/settings/css') %}
<link rel="stylesheet" href="/@{{v.username}}/css">
{% endif %}
@ -53,12 +53,8 @@
{% endblock %}
<link rel="preload" href="/assets/CHRISTMAS/css/fa.css?a=1" as="style" onload="this.onload=null;this.rel='stylesheet'">
<link rel="preload" href="/static/assets/CHRISTMAS/css/fa.css?a=1" as="style" onload="this.onload=null;this.rel='stylesheet'">
<noscript><link rel="stylesheet" href="/assets/CHRISTMAS/css/fa.css?a=1"></noscript>
<style>
@font-face { font-family: 'Delius Swash Caps'; src: url('/assets/CHRISTMAS/fonts/DeliusSwashCaps-Regular.ttf'); }
</style>
</head>
<body class="overflow-hidden overflow-y-auto antialiased text-black bg-gray-700 dark:text-gray-100">