diff --git a/res/icon.png b/res/icon.png new file mode 100644 index 000000000..7f40d3a55 Binary files /dev/null and b/res/icon.png differ diff --git a/res/icon.svg b/res/icon.svg new file mode 100644 index 000000000..e51e033d0 --- /dev/null +++ b/res/icon.svg @@ -0,0 +1,66 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/res/logo.png b/res/logo.png new file mode 100644 index 000000000..a1d7a48f4 Binary files /dev/null and b/res/logo.png differ diff --git a/res/logo.svg b/res/logo.svg new file mode 100644 index 000000000..43ae59387 --- /dev/null +++ b/res/logo.svg @@ -0,0 +1,65 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/res/logo_white.svg b/res/logo_white.svg new file mode 100644 index 000000000..099cab294 --- /dev/null +++ b/res/logo_white.svg @@ -0,0 +1,68 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/pretix/base/static/pretixbase/img/pretix-icon.svg b/src/pretix/base/static/pretixbase/img/pretix-icon.svg new file mode 100644 index 000000000..49ae4f38a --- /dev/null +++ b/src/pretix/base/static/pretixbase/img/pretix-icon.svg @@ -0,0 +1,66 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/pretix/control/static/pretixcontrol/less/main.less b/src/pretix/control/static/pretixcontrol/less/main.less index 8a9bde220..edc6d5506 100644 --- a/src/pretix/control/static/pretixcontrol/less/main.less +++ b/src/pretix/control/static/pretixcontrol/less/main.less @@ -17,6 +17,11 @@ footer { nav.navbar { margin: 0; } +.navbar-brand img { + height: 100%; + width: auto; + display: inline; +} .navbar-header .navbar-events { color: white; diff --git a/src/pretix/control/templates/pretixcontrol/base.html b/src/pretix/control/templates/pretixcontrol/base.html index 1ec9ca996..87127b77f 100644 --- a/src/pretix/control/templates/pretixcontrol/base.html +++ b/src/pretix/control/templates/pretixcontrol/base.html @@ -35,7 +35,10 @@ data-toggle="collapse" data-target=".navbar-events-collapse"> - {{ settings.PRETIX_INSTANCE_NAME }} + + + {{ settings.PRETIX_INSTANCE_NAME }} +