From 02f9828009cb719c824982f945463da8a49066c2 Mon Sep 17 00:00:00 2001
From: Simon Caminada <simon@baker-street.ch>
Date: Tue, 27 Mar 2018 12:59:19 +0200
Subject: [PATCH] bug fix

---
 private/scss/modules/_control-panel.scss | 12 ++++++++++++
 src/portal/admin.py                      |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/private/scss/modules/_control-panel.scss b/private/scss/modules/_control-panel.scss
index 7505091..609d5df 100644
--- a/private/scss/modules/_control-panel.scss
+++ b/private/scss/modules/_control-panel.scss
@@ -1,3 +1,15 @@
+.load__frame {
+  transition: height 0.5s $easeOutQuad !important;
+  &.loading {
+    overflow: hidden;
+  }
+  &.loaded {
+    .button--load {
+      opacity: 0;
+    }
+  }
+}
+
 .control_panel {
   width: 100%;
   padding: em(100px) 0 0;
diff --git a/src/portal/admin.py b/src/portal/admin.py
index aa5b728..cacaa80 100644
--- a/src/portal/admin.py
+++ b/src/portal/admin.py
@@ -16,7 +16,7 @@ class ProfileInline(admin.StackedInline):
 class UserAdmin(BaseUserAdmin):
     inlines = [ProfileInline]
     fieldsets = (
-        (None, {'fields': ('username', 'password')}),
+        (None, {'fields': ('username', 'email', 'password')}),
         (_('Permissions'), {'fields': ('is_active', 'is_staff', 'is_superuser', 'groups')}),
     )