Skip to content

Commit 40ed228

Browse files
Chore: all components now use the same favicon with different ones only for debug mode (#1120)
* all components now use the same favicon with different for debug mode * Update app/eventyay/webapp/src/preloader.js --------- Co-authored-by: Mario Behling <[email protected]>
1 parent 735a319 commit 40ed228

File tree

12 files changed

+28
-15
lines changed

12 files changed

+28
-15
lines changed

app/eventyay/base/templates/error.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
{% endcompress %}
1111
<meta name="viewport" content="width=device-width, initial-scale=1">
1212
<meta charset="utf-8">
13-
<link rel="icon" href="{% static "pretixbase/img/favicon.ico" %}">
13+
<link rel="icon" href="{% static "common/img/icons/favicon.ico" %}">
1414
</head>
1515
<body>
1616
<div class="container">

app/eventyay/control/templates/pretixcontrol/admin/pages/base.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<link type="text/css" rel="stylesheet" href="{% static "pages/css/quill-edit.css" %}">
1414
{% endcompress %}
1515
{% if development_warning or debug_warning %}
16-
<link rel="shortcut icon" href="{% static "pretixbase/img/favicon-debug.ico" %}">
16+
<link rel="shortcut icon" href="{% static "common/img/icons/favicon_debug.ico" %}">
1717
{% else %}
18-
<link rel="shortcut icon" href="{% static "pretixbase/img/favicon.ico" %}">
18+
<link rel="shortcut icon" href="{% static "common/img/icons/favicon.ico" %}">
1919
<link rel="icon" type="image/png" sizes="32x32" href="{% static "pretixbase/img/icons/favicon-32x32.png" %}">
2020
<link rel="icon" type="image/png" sizes="194x194" href="{% static "pretixbase/img/icons/favicon-194x194.png" %}">
2121
<link rel="icon" type="image/png" sizes="16x16" href="{% static "pretixbase/img/icons/favicon-16x16.png" %}">

app/eventyay/control/templates/pretixcontrol/base.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@
6767

6868
<meta name="viewport" content="width=device-width, initial-scale=1">
6969
{% if development_warning or debug_warning %}
70-
<link rel="shortcut icon" href="{% static "pretixbase/img/favicon-debug.ico" %}">
70+
<link rel="shortcut icon" href="{% static "common/img/icons/favicon_debug.ico" %}">
7171
{% else %}
72-
<link rel="shortcut icon" href="{% static "pretixbase/img/favicon.ico" %}">
72+
<link rel="shortcut icon" href="{% static "common/img/icons/favicon.ico" %}">
7373
<link rel="icon" type="image/png" sizes="32x32" href="{% static "pretixbase/img/icons/favicon-32x32.png" %}">
7474
<link rel="icon" type="image/png" sizes="194x194" href="{% static "pretixbase/img/icons/favicon-194x194.png" %}">
7575
<link rel="icon" type="image/png" sizes="16x16" href="{% static "pretixbase/img/icons/favicon-16x16.png" %}">

app/eventyay/eventyay_common/templates/eventyay_common/auth/base.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<meta name="viewport" content="width=device-width, initial-scale=1">
1818

1919
{% if development_warning or debug_warning %}
20-
<link rel="shortcut icon" href="{% static "pretixbase/img/favicon-debug.ico" %}">
20+
<link rel="shortcut icon" href="{% static "common/img/icons/favicon_debug.ico" %}">
2121
{% else %}
22-
<link rel="shortcut icon" href="{% static "pretixbase/img/favicon.ico" %}">
22+
<link rel="shortcut icon" href="{% static "common/img/icons/favicon.ico" %}">
2323
<link rel="icon" type="image/png" sizes="32x32" href="{% static "pretixbase/img/icons/favicon-32x32.png" %}">
2424
<link rel="icon" type="image/png" sizes="194x194" href="{% static "pretixbase/img/icons/favicon-194x194.png" %}">
2525
<link rel="icon" type="image/png" sizes="16x16" href="{% static "pretixbase/img/icons/favicon-16x16.png" %}">

app/eventyay/eventyay_common/templates/eventyay_common/base.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@
6868

6969
<meta name="viewport" content="width=device-width, initial-scale=1">
7070
{% if development_warning or debug_warning %}
71-
<link rel="shortcut icon" href="{% static "pretixbase/img/favicon-debug.ico" %}">
71+
<link rel="shortcut icon" href="{% static "common/img/icons/favicon_debug.ico" %}">
7272
{% else %}
73-
<link rel="shortcut icon" href="{% static "pretixbase/img/favicon.ico" %}">
73+
<link rel="shortcut icon" href="{% static "common/img/icons/favicon.ico" %}">
7474
<link rel="icon" type="image/png" sizes="32x32" href="{% static "pretixbase/img/icons/favicon-32x32.png" %}">
7575
<link rel="icon" type="image/png" sizes="194x194" href="{% static "pretixbase/img/icons/favicon-194x194.png" %}">
7676
<link rel="icon" type="image/png" sizes="16x16" href="{% static "pretixbase/img/icons/favicon-16x16.png" %}">

app/eventyay/plugins/webcheckin/templates/pretixplugins/webcheckin/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
{% endif %}
1919
{{ html_head|safe }}
2020
<meta name="viewport" content="width=device-width, initial-scale=1">
21-
<link rel="icon" href="{% static "pretixbase/img/favicon.ico" %}">
21+
<link rel="icon" href="{% static "common/img/icons/favicon.ico" %}">
2222
</head>
2323
<body data-datetimeformat="{{ js_datetime_format }}" data-timeformat="{{ js_time_format }}"
2424
data-dateformat="{{ js_date_format }}" data-datetimelocale="{{ js_locale }}"

app/eventyay/presale/templates/pretixpresale/base.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
<link rel="icon" type="image/png" sizes="194x194" href="{{ settings.favicon|thumb:'194x194^' }}">
3232
<link rel="icon" type="image/png" sizes="16x16" href="{{ settings.favicon|thumb:'16x16^' }}">
3333
{% elif development_warning or debug_warning %}
34-
<link rel="shortcut icon" href="{% static "pretixbase/img/favicon-debug.ico" %}">
34+
<link rel="shortcut icon" href="{% static "common/img/icons/favicon_debug.ico" %}">
3535
{% else %}
36-
<link rel="icon" href="{% static "pretixbase/img/favicon.ico" %}">
37-
<link rel="shortcut icon" href="{% static "pretixbase/img/favicon.ico" %}">
36+
<link rel="icon" href="{% static "common/img/icons/favicon.ico" %}">
37+
<link rel="shortcut icon" href="{% static "common/img/icons/favicon.ico" %}">
3838
<link rel="icon" type="image/png" sizes="32x32" href="{% static "pretixbase/img/icons/favicon-32x32.png" %}">
3939
<link rel="icon" type="image/png" sizes="194x194" href="{% static "pretixbase/img/icons/favicon-194x194.png" %}">
4040
<link rel="icon" type="image/png" sizes="16x16" href="{% static "pretixbase/img/icons/favicon-16x16.png" %}">
-13.3 KB
Binary file not shown.

app/eventyay/webapp/index.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
77
<meta name="mobile-web-app-capable" content="yes" />
8-
<link rel="icon" href="/favicon.ico" />
8+
<link rel="icon" id="favicon" href="/static/common/img/icons/favicon.ico" />
9+
<link rel="shortcut icon" id="favicon-shortcut" href="/static/common/img/icons/favicon.ico" />
910
<title>eventyay</title>
1011
</head>
1112
<body>
-13.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)