diff --git a/files/assets/fistmas/css/banner.css b/files/assets/fistmas/css/banner.css index 3588019bbc..8e85868711 100644 --- a/files/assets/fistmas/css/banner.css +++ b/files/assets/fistmas/css/banner.css @@ -1,7 +1,7 @@ /* text */ @font-face{ font-family: "Plakat-Fraktur"; - src: url("/assets/fistmas/fonts/Plakat-Fraktur-Black.woff") format("woff"); + src: url("/assets/events/fistmas/fonts/Plakat-Fraktur-Black.woff") format("woff"); } @media (max-width: 767.98px) { diff --git a/files/assets/fistmas/css/fistmas.css b/files/assets/fistmas/css/fistmas.css index 6468cff940..b867cd26bf 100644 --- a/files/assets/fistmas/css/fistmas.css +++ b/files/assets/fistmas/css/fistmas.css @@ -3,9 +3,9 @@ /* Fonts */ @font-face { font-family: "Burbank Small Medium"; - src: url("/assets/fistmas/fonts/Burbank-Small-Medium.woff2") format("woff2"), - url("/assets/fistmas/fonts/Burbank-Small-Medium.woff") format("woff"), - url("/assets/fistmas/fonts/Burbank-Small-Medium.ttf") format("truetype"); + src: url("/assets/events/fistmas/fonts/Burbank-Small-Medium.woff2") format("woff2"), + url("/assets/events/fistmas/fonts/Burbank-Small-Medium.woff") format("woff"), + url("/assets/events/fistmas/fonts/Burbank-Small-Medium.ttf") format("truetype"); } :root { @@ -34,7 +34,7 @@ body { font-family: 'Burbank Small Medium', sans-serif; background-color: rgb(var(--background)) !important; - background-image: url('/assets/fistmas/images/pattern.webp') !important; + background-image: url('/assets/events/fistmas/images/pattern.webp') !important; overflow-x: hidden; } @@ -136,15 +136,15 @@ color: #7a7a7a !important; } body { - cursor: url(/assets/fistmas/images/cursor.webp?x=1), auto !important; + cursor: url(/assets/events/fistmas/images/cursor.webp?x=1), auto !important; } textarea, input[type=textbox], input[type=search] { - cursor: url(/assets/fistmas/images/text.webp?x=1) 9 14, auto !important; + cursor: url(/assets/events/fistmas/images/text.webp?x=1) 9 14, auto !important; } .btn, input[type=button], button, a { - cursor: url(/assets/fistmas/images/pointer.webp?x=1), auto !important; + cursor: url(/assets/events/fistmas/images/pointer.webp?x=1), auto !important; } .fa-moon-over-sun:before{content:"\f74a"} @@ -170,7 +170,7 @@ textarea, input[type=textbox], input[type=search] { left: 0; height: 57px; width: 100%; - background: url('/assets/fistmas/images/lights.webp?x=1'); + background: url('/assets/events/fistmas/images/lights.webp?x=1'); animation: lights 1s infinite steps(2); pointer-events: none; } @@ -195,7 +195,7 @@ textarea, input[type=textbox], input[type=search] { .btn::after, .snow-cap::after { content: ''; pointer-events: none; - background: url("/assets/fistmas/images/snowcap.webp?x=1") repeat-x; + background: url("/assets/events/fistmas/images/snowcap.webp?x=1") repeat-x; background-size: contain; position: absolute; bottom: -18px; diff --git a/files/assets/fistmas/css/lights.css b/files/assets/fistmas/css/lights.css index 8f878d0cb9..9e39237062 100644 --- a/files/assets/fistmas/css/lights.css +++ b/files/assets/fistmas/css/lights.css @@ -5,7 +5,7 @@ left: 0; height: 57px; width: 100%; - background: url('/assets/fistmas/images/lights.webp?x=1'); + background: url('/assets/events/fistmas/images/lights.webp?x=1'); animation: lights 1s infinite steps(2); pointer-events: none; z-index: 1; diff --git a/files/templates/DKD/music.html b/files/templates/DKD/music.html index b361c47822..ab4e8e0a43 100644 --- a/files/templates/DKD/music.html +++ b/files/templates/DKD/music.html @@ -1,6 +1,6 @@ {% if not (SITE_NAME == 'WPD' and not v) and not (v and v.poor) and not (sub and sub.name == 'music') %} {% if not song %} - {% set path = "assets/DKD/music" %} + {% set path = "assets/events/DKD/music" %} {% set song = "/" ~ path ~ "/" ~ listdir('files/' ~ path)|random() ~ '?x=1' %} {% endif %} diff --git a/files/templates/default.html b/files/templates/default.html index a07fd22123..889ba58f19 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -8,9 +8,9 @@ {% include 'fistmas/banner.html' %} {% else %} {% if IS_BIRTHGAY() and not sub %} - {% set src = macros.random_image("assets/birthgay/images/banners/" ~ SITE_NAME) %} + {% set src = macros.random_image("assets/events/birthgay/images/banners/" ~ SITE_NAME) %} {% elif IS_DKD() and not sub %} - {% set src = macros.random_image("assets/DKD/images/banners") %} + {% set src = macros.random_image("assets/events/DKD/images/banners") %} {% elif err and SITE_NAME == 'rDrama' %} {% set src = "banner_error.webp" | asset_siteimg %} {% elif sub and sub.has_banners %} diff --git a/files/templates/fistmas/awards.html b/files/templates/fistmas/awards.html index 96c4111ed8..c76bc281ae 100644 --- a/files/templates/fistmas/awards.html +++ b/files/templates/fistmas/awards.html @@ -2,7 +2,7 @@ {% set gingerbread_count = p.award_count("gingerbread", v) * 2 if p.award_count("gingerbread", v) <= 10 else 20 %} {% for i in range(gingerbread_count) %}
- animate marsey gingerbread icon + animate marsey gingerbread icon
{% endfor %} diff --git a/files/templates/fistmas/banner.html b/files/templates/fistmas/banner.html index 90e295cd2f..f6644a2ba4 100644 --- a/files/templates/fistmas/banner.html +++ b/files/templates/fistmas/banner.html @@ -4,7 +4,7 @@ {% if SITE_NAME == 'rDrama' and range(1, 20)|random() == 1 %} - + {% else %} {% if SITE_NAME == 'rDrama' %} diff --git a/files/templates/fistmas/music.html b/files/templates/fistmas/music.html index a0ffe5a5af..c885f6dbdf 100644 --- a/files/templates/fistmas/music.html +++ b/files/templates/fistmas/music.html @@ -1,6 +1,6 @@ {% if not (SITE_NAME == 'WPD' and not v) and not (v and v.poor) and (not v or v.event_music) and not (sub and sub.name == 'music') %} {% if not song %} - {% set path = "assets/fistmas/music" %} + {% set path = "assets/events/fistmas/music" %} {% set song = "/" ~ path ~ "/" ~ listdir('files/' ~ path)|random() ~ '?x=1' %} {% endif %} diff --git a/files/templates/header.html b/files/templates/header.html index dd6a5fe714..46c614a703 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -66,9 +66,9 @@
{% if IS_DKD() %} - {% set logo_url = 'assets/DKD/images/logo.webp' %} + {% set logo_url = 'assets/events/DKD/images/logo.webp' %} {% elif IS_FISTMAS() %} - {% set logo_url = 'assets/fistmas/images/logo/' ~ SITE_NAME %} + {% set logo_url = 'assets/events/fistmas/images/logo/' ~ SITE_NAME %} {% else %} {% set logo_url = 'logo.webp' | asset_siteimg %} {% endif %} diff --git a/files/templates/sidebar_WPD.html b/files/templates/sidebar_WPD.html index 5d6b01c485..e67a32e6d8 100644 --- a/files/templates/sidebar_WPD.html +++ b/files/templates/sidebar_WPD.html @@ -7,7 +7,7 @@ {%- if IS_BIRTHGAY() -%} - {% set image = macros.random_image("assets/birthgay/images/sidebar/" ~ SITE_NAME) %} + {% set image = macros.random_image("assets/events/birthgay/images/sidebar/" ~ SITE_NAME) %} {%- elif v -%} {%- set image = macros.random_image("assets/images/" ~ SITE_NAME ~ "/sidebar") -%} {%- else -%} diff --git a/files/templates/sidebar_rDrama.html b/files/templates/sidebar_rDrama.html index 4f8c9d69f0..321c040edc 100644 --- a/files/templates/sidebar_rDrama.html +++ b/files/templates/sidebar_rDrama.html @@ -9,11 +9,11 @@ {% if sub %} {% set image=sub.sidebar_url %} {% elif IS_BIRTHGAY() %} - {% set image = macros.random_image("assets/birthgay/images/sidebar/" ~ SITE_NAME) %} + {% set image = macros.random_image("assets/events/birthgay/images/sidebar/" ~ SITE_NAME) %} {% elif IS_DKD() %} - {% set image = macros.random_image("assets/DKD/images/sidebar") %} + {% set image = macros.random_image("assets/events/DKD/images/sidebar") %} {% elif IS_FISTMAS() %} - {% set image = macros.random_image("assets/fistmas/images/sidebar") %} + {% set image = macros.random_image("assets/events/fistmas/images/sidebar") %} {% else %} {% set image = macros.random_image("assets/images/" ~ SITE_NAME ~ "/sidebar") %} {% endif %} diff --git a/files/templates/util/html_head.html b/files/templates/util/html_head.html index bf00569b95..f69243c9a1 100644 --- a/files/templates/util/html_head.html +++ b/files/templates/util/html_head.html @@ -63,9 +63,9 @@ {% endif %} {% if IS_DKD() %} - {% set favicon_url = macros.random_image('assets/DKD/images/favicon') %} + {% set favicon_url = macros.random_image('assets/events/DKD/images/favicon') %} {% elif IS_FISTMAS() %} - {% set favicon_url = macros.random_image('assets/fistmas/images/favicon/' ~ SITE_NAME) %} + {% set favicon_url = macros.random_image('assets/events/fistmas/images/favicon/' ~ SITE_NAME) %} {% else %} {% set favicon_url = '/icon.webp?x=1' %} {% endif %}