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

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

This commit is contained in:
George Kalampokis 2020-11-12 15:50:44 +02:00
parent ffc140f84b 188fcd539f
commit d20b8b459a
5 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.html
View File

@ -1,7 +1,7 @@
<div class="dataset-copy-dialog">
<div mat-dialog-title class="row d-flex flex-row">
<div mat-dialog-title class="col-auto">{{'DATASET-WIZARD.DIALOGUE.TITLE' | translate}}</div>
<div class="col-auto ml-auto close-btn" (click)="close()"><mat-icon>close</mat-icon></div>
<div class="col-auto ml-auto close-btn" (click)="close()"><mat-icon class="close-icon">close</mat-icon></div>
</div>
<div mat-dialog-content class="confirmation-message">
<mat-form-field class="col-12">

13
dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.scss
View File

@ -35,3 +35,16 @@
background-color: #129d99;
color: #ffffff;
}
.close-icon {
cursor: pointer;
// margin-right: 20px;
padding: .4rem;
width: auto !important;
height: auto !important;
}
.close-icon:hover {
background-color: #ECECED !important;
border-radius: 50%;
}

4
dmp-frontend/src/app/ui/dmp/start-new-dmp-dialogue/start-new-dmp-dialog.component.html
View File

@ -1,7 +1,9 @@
<div class="form-container">
<div class="row d-flex justify-content-between m-0">
<a class="logo"><img src="../../../assets/splash/assets/img/argos-logo.svg"></a>
<mat-icon class="close-icon" (click)="close()">close</mat-icon>
<div class="col-auto ml-auto close-btn" (click)="close()">
<mat-icon class="close-icon">close</mat-icon>
</div>
</div>
<div class="row content">
<h1 mat-dialog-title class="title">{{'NAV-BAR.START-NEW-DMP' | translate}}</h1>

2
dmp-frontend/src/app/ui/faq/dialog/faq-dialog.component.html
View File

@ -4,7 +4,7 @@
{{'FAQ.TITLE' | translate}}
</div>
<div class="col-auto ml-auto close-btn" (click)="close()">
<mat-icon>close</mat-icon>
<mat-icon class="clear-icon">close</mat-icon>
</div>
</div>
<div mat-dialog-content class="row">

14
dmp-frontend/src/app/ui/faq/dialog/faq-dialog.component.scss
View File

@ -12,6 +12,20 @@
cursor: pointer;
}
.clear-icon {
cursor: pointer;
color: #212121;
padding: 0.4rem;
width: auto !important;
height: auto !important;
}
.clear-icon:hover {
background-color: #ececec !important;
border-radius: 50%;
padding: 0.4rem;
}
.faq {
margin-bottom: 1.125rem;
}