diff --git a/dmp-frontend/src/app/app.component.ts b/dmp-frontend/src/app/app.component.ts index 7fd33fb2d..cde53ffed 100644 --- a/dmp-frontend/src/app/app.component.ts +++ b/dmp-frontend/src/app/app.component.ts @@ -91,11 +91,13 @@ export class AppComponent implements OnInit { filter(event => event instanceof NavigationEnd), map(() => { let child = this.route.firstChild; - while (child.firstChild) { - child = child.firstChild; - } - if (child.snapshot.data['title']) { - return child.snapshot.data['title']; + if (child != null) { + while (child.firstChild) { + child = child.firstChild; + } + if (child.snapshot.data['title']) { + return child.snapshot.data['title']; + } } return appTitle; }) diff --git a/dmp-frontend/src/app/ui/about/about.component.scss b/dmp-frontend/src/app/ui/about/about.component.scss index bffb488a2..0e23f5206 100644 --- a/dmp-frontend/src/app/ui/about/about.component.scss +++ b/dmp-frontend/src/app/ui/about/about.component.scss @@ -1,5 +1,6 @@ h1 { text-align: center; + margin: 2rem 0 1rem 0; } img { diff --git a/dmp-frontend/src/app/ui/contact/contact-content/contact-content.component.html b/dmp-frontend/src/app/ui/contact/contact-content/contact-content.component.html index a052f8455..63589d227 100644 --- a/dmp-frontend/src/app/ui/contact/contact-content/contact-content.component.html +++ b/dmp-frontend/src/app/ui/contact/contact-content/contact-content.component.html @@ -2,7 +2,7 @@
-

{{ 'CONTACT.TITLE-DASHED' | translate}}

+

{{ 'CONTACT.SUPPORT.TITLE' | translate}}

diff --git a/dmp-frontend/src/app/ui/contact/contact-content/contact-content.component.scss b/dmp-frontend/src/app/ui/contact/contact-content/contact-content.component.scss index cdbae5052..3b3dd0bb7 100644 --- a/dmp-frontend/src/app/ui/contact/contact-content/contact-content.component.scss +++ b/dmp-frontend/src/app/ui/contact/contact-content/contact-content.component.scss @@ -1,5 +1,6 @@ h1 { text-align: center; + margin: 2rem 0 1rem 0; } img { diff --git a/dmp-frontend/src/app/ui/dmp/dmp.routing.ts b/dmp-frontend/src/app/ui/dmp/dmp.routing.ts index d949b28d5..05e858695 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp.routing.ts +++ b/dmp-frontend/src/app/ui/dmp/dmp.routing.ts @@ -77,7 +77,7 @@ const routes: Routes = [ canActivate: [AuthGuard], data: { breadcrumbs: 'new', - title: 'GENERAL.TITLES.PLANS-NEW' + title: 'GENERAL.TITLES.DMP-NEW' } }, { diff --git a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html index 75da135aa..aebae5535 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html @@ -32,9 +32,8 @@ {{formGroup.get('profile').getError('backendError').message}}
-
- {{'DMP-EDITOR.DATASET-INFO.FIND' | translate}} - {{'DMP-EDITOR.ACTIONS.CREATE-DATASET' | translate}} +
+ {{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.SECOND-STEP.FIELDS.HELP' | translate}}
diff --git a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.scss b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.scss index 62e8d088c..4dc2ab551 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.scss +++ b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.scss @@ -59,19 +59,10 @@ color: #00b29f !important; } - .insert { - text-decoration: underline; - color: #00b29f; - cursor: pointer; - font-size: 1rem; - font-weight: 400; - } - .not-found { - cursor: pointer; - font-size: 1rem; - font-weight: 400; - padding: 0rem 0.5rem 0rem 0rem; + font-size: 0.875rem; + font-weight: 400; + padding: 0rem 0.5rem 0rem 0rem; } } @@ -83,3 +74,11 @@ font-size: 1rem; padding: 0.6em 0 1em 0 !important; } + +::ng-deep .profile-form .mat-form-field-wrapper { + padding-bottom: 0rem; +} + +:host ::ng-deep .multiple-auto-complete .align-arrow-right { + bottom: 1rem !important; +} \ No newline at end of file diff --git a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.ts index 460ea8c83..1fa7b59d2 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.ts @@ -200,7 +200,4 @@ export class DatasetInfoComponent extends BaseComponent implements OnInit { }); } - addDataset(id: String) { - this.router.navigate(['/datasets/new/' + id]); - } } diff --git a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.scss b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.scss index e82edc6cf..77144b1ed 100644 --- a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.scss +++ b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.scss @@ -28,37 +28,48 @@ border-radius: 4px; } +::ng-deep .mat-dialog-container { + border-radius: 8px; +} .search { - ::ng-deep { - .mat-dialog-container { - border-radius: 8px; - } - .mat-form-field-underline { - display: none; - } - .mat-form-field-wrapper { - padding: 0em !important; - } - .mat-form-field-infix { - border: none; - } - .align-arrow-right { - display: none; - } + padding: 2px !important; +} + +::ng-deep .search { + .mat-form-field-infix { + border: none; + padding: 14px; + } + .mat-form-field-underline { + display: none; + } + .mat-form-field-flex { + padding: 0em; + } + .align-arrow-right { + display: none; } } .select-role { - ::ng-deep { - .mat-form-field-outline-start, - .mat-form-field-outline-gap, - .mat-form-field-outline-end { - border: none !important; - } - .mat-form-field-wrapper { - padding: 0em !important; - } + width: 20% !important; + font-size: 14px; + color: #848484; + height: min-content; + margin-right: 2.5rem; + border: none; + background-color: transparent; +} + +::ng-deep .select-role { + .mat-form-field-outline-start, + .mat-form-field-outline-gap, + .mat-form-field-outline-end { + border: none !important; + } + .mat-select-arrow-wrapper { + transform: none; } } @@ -73,13 +84,3 @@ color: #B5B5B5; margin-bottom: 0.25em; } - -.select-role { - width: 20% !important; - font-size: 14px; - color: #848484; - height: min-content; - margin-right: 2.5rem; - border: none; - background-color: transparent; -} diff --git a/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.html b/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.html index cb6e81d5b..953bb8298 100644 --- a/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.html +++ b/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.html @@ -1,7 +1,7 @@
-

{{ 'GLOSSARY.TITLE-DASHED' | translate}}

+

{{ 'GLOSSARY.TITLE' | translate}}

diff --git a/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.scss b/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.scss index 035ab5f7a..74c44a92e 100644 --- a/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.scss +++ b/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.scss @@ -1,5 +1,6 @@ h1 { text-align: center; + margin: 2rem 0 1rem 0; } img { diff --git a/dmp-frontend/src/app/ui/misc/navigation/navigation.component.ts b/dmp-frontend/src/app/ui/misc/navigation/navigation.component.ts index 60daecb04..5ef95ef24 100644 --- a/dmp-frontend/src/app/ui/misc/navigation/navigation.component.ts +++ b/dmp-frontend/src/app/ui/misc/navigation/navigation.component.ts @@ -109,7 +109,8 @@ export class NavigationComponent extends BaseComponent implements OnInit { autoFocus: false, closeOnNavigation: true, disableClose: false, - position: { top: '64px', right: '1em' } + position: { top: '64px', right: '1em' }, + panelClass: 'custom-userbox' }); } diff --git a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.scss b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.scss index 0dc3837d6..b91d2e12f 100644 --- a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.scss +++ b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.scss @@ -48,13 +48,6 @@ $mat-card-header-size: 40px !default; background-color: #ddd; } -::ng-deep .mat-dialog-container { - background-color: transparent; - padding: 0rem; - overflow: initial; - box-shadow: none; -} - .check-icon { color: #129D99; transform: scale(0.7); diff --git a/dmp-frontend/src/app/ui/navbar/navbar.component.ts b/dmp-frontend/src/app/ui/navbar/navbar.component.ts index 6199a6a1a..3462306ce 100644 --- a/dmp-frontend/src/app/ui/navbar/navbar.component.ts +++ b/dmp-frontend/src/app/ui/navbar/navbar.component.ts @@ -224,7 +224,8 @@ export class NavbarComponent extends BaseComponent implements OnInit { autoFocus: false, closeOnNavigation: true, disableClose: false, - position: { top: '64px', right: '1em' } + position: { top: '64px', right: '1em' }, + panelClass: 'custom-userbox' }); } diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.component.scss b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.component.scss index c2738b53a..18ca2c5f3 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.component.scss +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.component.scss @@ -1,5 +1,6 @@ h1 { text-align: center; + margin: 2rem 0 1rem 0; } img { diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.css b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.css index 776e1cf71..8f4715484 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.css +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.css @@ -13,6 +13,7 @@ cursor: pointer; display: inline-flex; font-size: small; + font-family: 'Roboto'; } .sidebar-footer .option:hover { diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.html b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.html index b6a3793fb..aa3f2830f 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.html +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.html @@ -5,18 +5,22 @@ {{'FOOTER.ABOUT' | translate}}

-

+

{{'FOOTER.CONTACT-SUPPORT' | translate}}

+
-

+

{{'FOOTER.GLOSSARY' | translate}}

+
-

+

{{'FOOTER.TERMS-OF-SERVICE' | translate}}