[reclaim-ui] 108/459: Merge branch 'master' into 'master'

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository reclaim-ui.

commit 87ee616f6257520d2b69bc6b2a07223006db079d
Merge: 1777ea5 6531757
Author: Martin <mschanzenbach@posteo.de>
AuthorDate: Mon Jul 8 15:40:44 2019 +0000

    Merge branch 'master' into 'master'
    
    changed authentication ui and gnunet offline information, added modals
    
    See merge request reclaimid/ui!6

 src/app/app.module.ts                              |  4 ++
 src/app/identity-list/identity-list.component.html | 72 +++++++++++++++-------
 src/app/identity-list/identity-list.component.ts   | 62 ++++++++++++++-----
 src/app/modal.component.ts                         | 60 ++++++++++++++++++
 src/app/modal.scss                                 | 49 +++++++++++++++
 src/app/modal.service.ts                           | 36 +++++++++++
 src/styles.scss                                    |  1 +
 7 files changed, 247 insertions(+), 37 deletions(-)

diff --cc src/app/identity-list/identity-list.component.html
index b9b5e1d,d550836..4798830
--- a/src/app/identity-list/identity-list.component.html
+++ b/src/app/identity-list/identity-list.component.html
@@@ -231,13 -251,11 +251,11 @@@
  <div *ngIf="isAddIdentity()" class="m-2 card" style="text-align:center;">
    <div class="card-avatar card-img-top">
      <div class="card-avatar-character text-dark">
-       Add Identity        </div>
+       Add Identity        
+     </div>
    </div>
-   
-   <!-- Identity creation -->
-   
    <!-- Invalid input -->
 -  <div *ngIf="'' !== newIdentity.name && !canSave()" class="alert 
alert-danger alert-dismissible fade show" role="alert">
 +  <div *ngIf="'' !== newIdentity.name && !canSave() && !isDuplicate()" 
class="alert alert-danger alert-dismissible fade show" role="alert">
      Only Alphanumeric input. No spaces or special characters allowed.
    </div>
    <!--Identity already exists -->  

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.