Merge branch 'master' into feature/hostingpackages

* master:
  load Font Mfizz in base template head
  add userdb template tags
  add Font Mfizz from http://mfizz.com/oss/font-mfizz

merged docs/changelog.rst
This commit is contained in:
Jan Dittberner 2015-01-18 16:24:53 +01:00
commit 30aa09c0af
12 changed files with 1736 additions and 6 deletions

View file

@ -11,6 +11,7 @@
<!-- Le styles -->
<link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">
<link href="{% static 'css/font-awesome.min.css' %}" rel="stylesheet">
<link href="{% static 'fonts/font-mfizz.css' %}" rel="stylesheet">
<style>
body {
padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */

View file

@ -0,0 +1,3 @@
{# format database types #}
{% load userdb %}
<i class="{% db_type_icon_class %}" title="{% db_type_name %}"></i><span class="sr-only">{% db_type_name %}</span>