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')}), )