CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Add support for image icons in navigation

Browse Source
This commit is contained in:
Raphael Michel
2017-05-23 11:42:42 +02:00
parent 8ff2c42070
commit 006b6fd5e8
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/pretix/control/templates/pretixcontrol/event/base.html
View File

@@ -1,5 +1,6 @@
{% extends "pretixcontrol/base.html" %} {% extends "pretixcontrol/base.html" %}
{% load i18n %} {% load i18n %}
{% load staticfiles %}
{% block title %}{{ request.event.name }}{% endblock %} {% block title %}{{ request.event.name }}{% endblock %}
{% block nav %} {% block nav %}
@@ -112,7 +113,9 @@
<li> <li>
<a href="{{ nav.url }}" {% if nav.active %}class="active"{% endif %} <a href="{{ nav.url }}" {% if nav.active %}class="active"{% endif %}
{% if nav.children %}class="has-children"{% endif %}> {% if nav.children %}class="has-children"{% endif %}>
{% if nav.icon %} {% if nav.icon and "." in nav.icon %}
<img src="{% static nav.icon %}" class="fa-img">
{% elif nav.icon %}
<i class="fa fa-{{ nav.icon }} fa-fw"></i> <i class="fa fa-{{ nav.icon }} fa-fw"></i>
{% endif %} {% endif %}
{{ nav.label }} {{ nav.label }}

5
src/pretix/static/pretixcontrol/scss/main.scss
View File

@@ -29,6 +29,11 @@ nav.navbar {
display: inline; display: inline;
} }
#side-menu img.fa-img {
height: auto;
width: 1.28571em;
}
nav.navbar .danger, nav.navbar .danger:hover, nav.navbar .danger:active { nav.navbar .danger, nav.navbar .danger:hover, nav.navbar .danger:active {
background: $brand-danger !important; background: $brand-danger !important;
} }