starred/WYGIWYH
1
0
Fork 0
mirror of https://github.com/eitchtee/WYGIWYH.git synced 2026-04-25 10:08:36 +02:00
Code Issues 14 Packages Projects Releases 10 Wiki Activity

Merge remote-tracking branch 'origin/main' into 41-import-export-function

Browse Source 
# Conflicts:
#	app/WYGIWYH/settings.py
This commit is contained in:
Herculino Trotta
2025-01-23 14:32:16 -03:00
parent e3d3a7cf91 7635b66638
commit a85221468a
9 changed files with 49 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/templates/includes/head/favicons.html
View File

@@ -12,7 +12,6 @@
<link rel="icon" type="image/png" sizes="32x32" href="{% static 'img/favicon/favicon-32x32.png' %}">
<link rel="icon" type="image/png" sizes="96x96" href="{% static 'img/favicon/favicon-96x96.png' %}">
<link rel="icon" type="image/png" sizes="16x16" href="{% static 'img/favicon/favicon-16x16.png' %}">
<link rel="manifest" href="{% static 'img/favicon/manifest.json' %}">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="msapplication-TileImage" content="{% static 'img/favicon/ms-icon-144x144.png' %}">
<meta name="theme-color" content="#ffffff">
<meta name="theme-color" content="#ffffff">

2
app/templates/layouts/base.html
View File

@@ -1,3 +1,4 @@
{% load pwa %}
{% load formats %}
{% load i18n %}
{% load title %}
@@ -15,6 +16,7 @@
</title>
{% include 'includes/head/favicons.html' %}
{% progressive_web_app_meta %}
{% include 'includes/styles.html' %}
{% block extra_styles %}{% endblock %}

4
app/templates/layouts/base_auth.html
View File

@@ -1,3 +1,4 @@
{% load pwa %}
{% load title %}
{% load webpack_loader %}
<!doctype html>
@@ -11,8 +12,9 @@
{% endblock title %}
{% endfilter %}
</title>
{% include 'includes/head/favicons.html' %}
{% progressive_web_app_meta %}
{% include 'includes/styles.html' %}
{% block extra_styles %}{% endblock %}