MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Merge branch 'Development' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development

This commit is contained in:
gkolokythas 2019-09-13 18:01:03 +03:00
parent 2c4070135e a45c208f38
commit 7647b4c290
2 changed files with 131 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dmp-frontend/src/app/ui/auth/login/login.component.html
View File

@ -1,9 +1,9 @@
<div class="login-screen login-bg d-flex flex-column align-items-center justify-content-center">
<div class="login-logo"></div>
<div class="card login-card">
<div class="card-header">
<div class="social-btns d-flex flex-column">
<div class="row">
<div class="container card-header">
<div class="row social-btns">
<div class="col">
<button *ngIf="hasGoogleOauth()" mat-icon-button id="googleSignInButton" class="login-social-button">
<i class="fa fa-google"></i>
</button>
@ -17,17 +17,18 @@
<i class="fa fa-twitter"></i>
</button>
</div>
<div class="row justify-content-center">
</div>
<div class="row mt-2 accesss-methods">
<div class="col justify-content-center">
<button *ngIf="hasB2AccessOauth()" class="b2access-button" mat-icon-button (click)="b2AccessLogin()" class="login-social-button">
<span class="iconmedium"></span>
<span></span>
<!-- <span></span> -->
</button>
<button *ngIf="hasOrcidOauth()" class="orcid-button" mat-icon-button (click)="orcidLogin()" class="login-social-button">
<span class="orcidIconMedium"></span>
<span></span>
<!-- <span></span> -->
</button>
</div>
</div>
</div>
<div class="card-footer">

15
dmp-frontend/src/app/ui/auth/login/login.component.scss
View File

@ -20,7 +20,8 @@
}
.card-raised {
box-shadow: 0 10px 30px -12px rgba(0, 0, 0, 0.42), 0 4px 25px 0px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2);
box-shadow: 0 10px 30px -12px rgba(0, 0, 0, 0.42), 0 4px 25px 0px rgba(0, 0, 0, 0.12),
0 8px 10px -5px rgba(0, 0, 0, 0.2);
}
.page-title {
@ -96,9 +97,9 @@
.card-header {
position: relative;
overflow: hidden;
top: -40px;
top: -50px;
width: 100%;
min-height: 134px;
min-height: 200px;
padding: 25px;
border-radius: 3px;
background: rgb(0, 112, 192);
@ -114,6 +115,10 @@
margin-top: 5px;
}
.social-btns {
height: 6em;
}
.social-btns i {
font-size: 2.5em;
padding: 1em;
@ -212,3 +217,7 @@ span.orcidIconMedium {
width: auto;
height: auto;
}
.accesss-methods {
height: 5em;
}