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-08-06 21:15:18 +02:00
parent 928351fec3 997cb2df89
commit f1232b9d04
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
files/templates/default.html
View File

@ -286,7 +286,6 @@
{% else %} {% else %}
{% set path = "assets/images/" + SITE_NAME + "/banners" %} {% set path = "assets/images/" + SITE_NAME + "/banners" %}
{% set image = "/" + path + "/" + listdir('files/' + path)|random() + '?v=25' %} {% set image = "/" + path + "/" + listdir('files/' + path)|random() + '?v=25' %}
{%- set image = asset_siteimg('banners-event/2022-ICP.webp') -%}
<img alt="site banner" src="{% if v %}{{image}}{% else %}{{asset_siteimg('cached.webp')}}{% endif %}" width="100%"> <img alt="site banner" src="{% if v %}{{image}}{% else %}{{asset_siteimg('cached.webp')}}{% endif %}" width="100%">
{% endif %} {% endif %}
</a> </a>

3
files/templates/header.html
View File

@ -68,8 +68,7 @@
<div class="navbar navbar-expand-md navbar-light" id="navbar"> <div class="navbar navbar-expand-md navbar-light" id="navbar">
<div class="container-fluid" style="padding:0;"> <div class="container-fluid" style="padding:0;">
<a href="/" class="navbar-brand mr-auto {% if not has_logo and not sub %}flex-grow-1{% endif %}"> <a href="/" class="navbar-brand mr-auto {% if not has_logo and not sub %}flex-grow-1{% endif %}">
{% set headericon_path = 'headericon.webp' if not SITE_NAME == 'rDrama' else 'icons-event/juggalo-2022.webp' -%} <img id="header--icon" alt="header icon" src="{{asset_siteimg('headericon.webp')}}">
<img id="header--icon" alt="header icon" src="{{asset_siteimg(headericon_path)}}">
</a> </a>
{% if sub %} {% if sub %}