Merge branch 'Development' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
This commit is contained in:
commit
7fc7da55e2
|
@ -20,7 +20,6 @@
|
||||||
"@angular/forms": "^6.1.7",
|
"@angular/forms": "^6.1.7",
|
||||||
"@angular/material-moment-adapter": "^6.4.7",
|
"@angular/material-moment-adapter": "^6.4.7",
|
||||||
"@angular/platform-browser": "^6.1.7",
|
"@angular/platform-browser": "^6.1.7",
|
||||||
"@covalent/core": "^2.0.0-beta.5",
|
|
||||||
"@ngx-translate/core": "^10.0.2",
|
"@ngx-translate/core": "^10.0.2",
|
||||||
"@ngx-translate/http-loader": "^3.0.1",
|
"@ngx-translate/http-loader": "^3.0.1",
|
||||||
"@swimlane/ngx-datatable": "^13.1.0",
|
"@swimlane/ngx-datatable": "^13.1.0",
|
||||||
|
|
|
@ -154,14 +154,10 @@ export class GeneralTabComponent extends BaseComponent implements OnInit {
|
||||||
return this._service.searchDMPProfiles(request);
|
return this._service.searchDMPProfiles(request);
|
||||||
}
|
}
|
||||||
|
|
||||||
addResearcher(rowId: any, rowName: any) {
|
addResearcher() {
|
||||||
const dialogRef = this.dialog.open(AddResearcherComponent, {
|
const dialogRef = this.dialog.open(AddResearcherComponent, {
|
||||||
data: {
|
data: {}
|
||||||
dmpId: rowId,
|
|
||||||
dmpName: rowName
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
availableProfiles() {
|
availableProfiles() {
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
@import "assets/scss/bootstrap-material";
|
@import "assets/scss/bootstrap-material";
|
||||||
|
|
||||||
@import "~@angular/material/theming";
|
@import "~@angular/material/theming";
|
||||||
@import "~@covalent/core/theming/all-theme";
|
// @import "~@covalent/core/theming/all-theme";
|
||||||
@include mat-core();
|
@include mat-core();
|
||||||
// Define a theme.
|
// Define a theme.
|
||||||
$primary: mat-palette($mat-indigo);
|
$primary: mat-palette($mat-indigo);
|
||||||
|
|
Loading…
Reference in New Issue