3 files changed, 40 insertions, 38 deletions
diff --git a/accounts/templates/_macros.html b/accounts/templates/_macros.html
index efb4b2d..f92a623 100644
--- a/accounts/templates/_macros.html
+++ b/accounts/templates/_macros.html
@@ -1,7 +1,7 @@
 {% macro render_submit() %}
 <div class="control-group">
   <div class="controls">
-    <input type="submit"
+    <input class="btn btn-secondary mb-4" type="submit"
     {%- for key, value in kwargs.items() %}
       {{key}}="{{value}}"
     {% endfor %}
@@ -15,9 +15,9 @@
     {{ field()|safe }}
   {% else %}
 <div class="control-group">
-  {{ field.label }}
+  <label class="form-label">{{ field.label }}</label>
   <div class="controls">
-    {{ field(**kwargs)|safe }}
+    {{ field(class_="form-control mb-4", **kwargs)|safe }}
     {{ render_errors(field.errors) }}
   </div>
 </div>
diff --git a/accounts/templates/base.html b/accounts/templates/base.html
index db6f741..10c146e 100644
--- a/accounts/templates/base.html
+++ b/accounts/templates/base.html
@@ -1,8 +1,9 @@
-{%- set styles = ['layout.css', 'bootstrap-form.css'] + styles|default([]) %}
+{%- set styles = ['layout.css', 'bootstrap.min.css'] + styles|default([]) %}
 {%- set scripts = ['script.js', 'jquery-1.8.2.min.js'] + scripts|default([]) %}
 <!doctype html> <html>
   <head>
     <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width">
     <title>{% if title %}{{ title }} – {% endif %}spline accounts</title>
     {%- for script in scripts %}
       <script type="text/javascript" src="{{ url_for('static', filename=script) }}"></script>
@@ -13,40 +14,41 @@
   </head>
   <body>
 
-    <div id="header-background">&nbsp;</div>
-    <header>
-      <h1>
-        <a href="{{ url_for('default.index') }}">
-          <img src="{{ url_for('static', filename='logo.png') }}" alt="spline accounts" />
-        </a>
-      </h1>
-      <span id="roundcornerb">&nbsp;</span>
-      <span id="roundcornerw">&nbsp;</span>
+    <div id="header-background">
+      <header>
+        <h1>
+          <a href="{{ url_for('default.index') }}">
+            <img src="{{ url_for('static', filename='spline.svg') }}" alt="spline accounts" />
+          </a>
+        </h1>
+        <span id="roundcornerb">&nbsp;</span>
+        <span id="roundcornerw">&nbsp;</span>
 
-      <nav id="mainnav">
-        <ul>
-          <li><a href="http://spline.de">spline.de</a></li>
-          <li><a href="{{ url_for('default.about') }}">FAQ</a></li>
-        </ul>
-      </nav>
+        <nav id="mainnav">
+          <ul>
+            <li><a href="http://spline.de">spline.de</a></li>
+            <li><a href="{{ url_for('default.about') }}">FAQ</a></li>
+          </ul>
+        </nav>
 
-      {%- if not no_login_message %}
-      <nav id="usermenu">
-        <ul>
-          {%- if current_user.is_authenticated() %}
-          <li>Angemeldet als <strong>{{ current_user.uid }}</strong></li>
-            {%- if current_user.uid in config.get('ADMIN_USERS', []) %}
-          <li><a href="{{ url_for('admin.index') }}">Admin</a></li>
+        {%- if not no_login_message %}
+        <nav id="usermenu">
+          <ul>
+            {%- if current_user.is_authenticated %}
+            <li>Angemeldet als <strong>{{ current_user.uid }}</strong></li>
+              {%- if current_user.uid in config.get('ADMIN_USERS', []) %}
+            <li><a href="{{ url_for('admin.index') }}">Admin</a></li>
+              {%- endif %}
+            <li><a href="{{ url_for('login.logout') }}">Abmelden</a></li>
+            {%- else %}
+            <li>Nicht angemeldet</li>
+            <li><a href="{{ url_for('login.login') }}">Login</a></li>
             {%- endif %}
-          <li><a href="{{ url_for('login.logout') }}">Abmelden</a></li>
-          {%- else %}
-          <li>Nicht angemeldet</li>
-          <li><a href="{{ url_for('login.login') }}">Login</a></li>
-          {%- endif %}
-        </ul>
-      </nav>
-      {%- endif %}
-    </header>
+          </ul>
+        </nav>
+        {%- endif %}
+      </header>
+    </div>
 
     <section id="content">
       {% with messages = get_flashed_messages(with_categories=true) %}
diff --git a/accounts/templates/index.html b/accounts/templates/index.html
index d10adf7..f394ebf 100644
--- a/accounts/templates/index.html
+++ b/accounts/templates/index.html
@@ -27,9 +27,9 @@
   <div class="service">
     <h3>
       {% if service.changed %}
-        {{ form.get_servicedelete(service.id) }}
+        {{ form.get_servicedelete(service.id)(class_="form-check") }}
       {% else %}
-        {{ form.get_servicedelete(service.id)(disabled=True) }}
+        {{ form.get_servicedelete(service.id)(disabled=True, class_="form-check-input") }}
       {% endif %}
       {{ service.name }}
     </h3>
@@ -52,7 +52,7 @@
   </div>
   {%- endfor %}
   <div class="form-submit-services">
-    <input type="submit" value="selektierte Passwörter zurücksetzen" name="submit_services" />
+    <input class="btn btn-outline-secondary mt-4" type="submit" value="selektierte Passwörter zurücksetzen" name="submit_services" />
   </div>
 </form>
 {%- endblock %}