Merge remote-tracking branch 'rico/new-design' into new-design

diff --cc src/templates/base.html
Simple merge

diff --cc src/templates/donate/donate.html
index ab2d610f7aea7c2303eb4e7b923c1e512e5f0b76,2297d77ca62f51e02581d31f9052473f878c865d..86bb9f9beb2accf3d1fee95af82fcdc6442d5e16
--- 1/src/templates/donate/donate.html
--- 2/src/templates/donate/donate.html
+++ b/src/templates/donate/donate.html
@@@ -166,48 -170,55 +170,62 @@@
  
                                                <div class="columns">
                                                        <div class="column">
-                                                               <input type="text" class="input" name="first_name"
-                                                                       placeholder="{{ _("First Name" )}}" required
-                                                                       {% if current_user %}value="{{ current_user.first_name }}"{% end %}>
+                                                               <div class="control">
+                                                                       <input type="text" class="input" name="first_name"
+                                                                               placeholder="{{ _("First Name" )}}" required
 -                                                                              {% if first_name %}value="{{ first_name }}"{% end %}>
++                                                                              {% if current_user %}value="{{ current_user.first_name }}"{% end %}>
+                                                               </div>
                                                        </div>
  
                                                        <div class="column">
-                                                               <input type="text" class="input" name="last_name"
-                                                                       placeholder="{{ _("Last Name" )}}" required
-                                                                       {% if current_user %}value="{{ current_user.last_name }}"{% end %}>
+                                                               <div class="control">
+                                                                       <input type="text" class="input" name="last_name"
+                                                                               placeholder="{{ _("Last Name" )}}" required
 -                                                                              {% if last_name %}value="{{ last_name }}"{% end %}>
++                                                                              {% if current_user %}value="{{ current_user.last_name }}"{% end %}>
+                                                               </div>
                                                        </div>
                                                </div>
  
                                                <div class="block">
+                                                       <div class="control">
                                                                <input type="email" class="input" name="email"
 -                                                                      placeholder="{{ _("Email Address") }}" required>
 +                                                                      placeholder="{{ _("Email Address") }}" required
 +                                                                      {% if current_user %}value="{{ current_user.email }}"{% end %}>
+                                                       </div>
                                                </div>
  
 +                                              {% set lines = current_user.street.splitlines() if current_user else [] %}
 +
                                                <div class="block">
-                                                       <input type="text" class="input" name="street1"
-                                                               placeholder="{{ _("Address Line 1") }}" required
-                                                               {% if lines %}value="{{ lines[0] }}"{% end %}>
+                                                       <div class="control">
+                                                               <input type="text" class="input" name="street1"
 -                                                                      placeholder="{{ _("Address Line 1") }}" required>
++                                                                      placeholder="{{ _("Address Line 1") }}" required
++                                                                      {% if lines %}value="{{ lines[0] }}"{% end %}>
+                                                       </div>
                                                </div>
  
                                                <div class="block">
-                                                       <input type="text" class="input" name="street2"
-                                                               placeholder="{{ _("Address Line 2") }}"
-                                                               {% if lines and len(lines) > 1 %}value="{{ lines[1] }}"{% end %}>
+                                                       <div class="control">
+                                                               <input type="text" class="input" name="street2"
 -                                                                      placeholder="{{ _("Address Line 2") }}">
++                                                                      placeholder="{{ _("Address Line 2") }}"
++                                                                      {% if lines and len(lines) > 1 %}value="{{ lines[1] }}"{% end %}>
+                                                       </div>
                                                </div>
  
                                                <div class="columns">
                                                        <div class="column">
-                                                               <input type="text" class="input" name="city"
-                                                                       placeholder="{{ _("City") }}" required
-                                                                       {% if current_user %}value="{{ current_user.city }}"{% end %}>
+                                                               <div class="control">
+                                                                       <input type="text" class="input" name="city"
 -                                                                              placeholder="{{ _("City") }}" required>
++                                                                              placeholder="{{ _("City") }}" required
++                                                                              {% if current_user %}value="{{ current_user.city }}"{% end %}>
+                                                               </div>
                                                        </div>
                                                        <div class="column">
-                                                               <input type="text" class="input" name="post_code"
-                                                                       placeholder="{{ _("Post Code") }}" required
-                                                                       {% if current_user %}value="{{ current_user.postal_code }}"{% end %}>
+                                                               <div class="control">
+                                                                       <input type="text" class="input" name="post_code"
 -                                                                              placeholder="{{ _("Post Code") }}" required>
++                                                                              placeholder="{{ _("Post Code") }}" required
++                                                                              {% if current_user %}value="{{ current_user.postal_code }}"{% end %}>
+                                                               </div>
                                                        </div>
                                                </div>