[reclaim-ui] 107/459: Merge branch 'master' of https://gitlab.com/reclaimid/ui

[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 a1d775a600de03fa18847a908a6a634025387264
Merge: 6531757 1777ea5
Author: Alexia Pagkopoulou <a.pagkopoulou@tum.de>
AuthorDate: Mon Jul 8 15:05:00 2019 +0200

    Merge branch 'master' of https://gitlab.com/reclaimid/ui

 src/app/identity-list/identity-list.component.html | 10 +++++-----
 src/app/identity-list/identity-list.component.ts   |  8 ++++++--
 src/styles.scss                                    |  5 ++++-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --cc src/app/identity-list/identity-list.component.html
index d550836,b9b5e1d..4798830
--- a/src/app/identity-list/identity-list.component.html
+++ b/src/app/identity-list/identity-list.component.html
@@@ -251,11 -231,13 +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.