From 006b6fd5e817f83fdea58b608d73f4aff8a2cca5 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Tue, 23 May 2017 11:42:42 +0200 Subject: [PATCH] Add support for image icons in navigation --- src/pretix/control/templates/pretixcontrol/event/base.html | 5 ++++- src/pretix/static/pretixcontrol/scss/main.scss | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/pretix/control/templates/pretixcontrol/event/base.html b/src/pretix/control/templates/pretixcontrol/event/base.html index 5c0081b8f9..57cf61f762 100644 --- a/src/pretix/control/templates/pretixcontrol/event/base.html +++ b/src/pretix/control/templates/pretixcontrol/event/base.html @@ -1,5 +1,6 @@ {% extends "pretixcontrol/base.html" %} {% load i18n %} +{% load staticfiles %} {% block title %}{{ request.event.name }}{% endblock %} {% block nav %} @@ -112,7 +113,9 @@
  • - {% if nav.icon %} + {% if nav.icon and "." in nav.icon %} + + {% elif nav.icon %} {% endif %} {{ nav.label }} diff --git a/src/pretix/static/pretixcontrol/scss/main.scss b/src/pretix/static/pretixcontrol/scss/main.scss index 8f7a85c7df..e5ea147171 100644 --- a/src/pretix/static/pretixcontrol/scss/main.scss +++ b/src/pretix/static/pretixcontrol/scss/main.scss @@ -29,6 +29,11 @@ nav.navbar { display: inline; } +#side-menu img.fa-img { + height: auto; + width: 1.28571em; +} + nav.navbar .danger, nav.navbar .danger:hover, nav.navbar .danger:active { background: $brand-danger !important; }