From af849b6c367722951e01294885f67efec26e45cc Mon Sep 17 00:00:00 2001 From: apapachristou Date: Tue, 17 Nov 2020 15:46:17 +0200 Subject: [PATCH] Style fixes on user profile --- .../user-dialog/user-dialog.component.html | 16 +++++++-------- .../user-dialog/user-dialog.component.scss | 2 +- .../user-profile/user-profile.component.html | 8 ++++---- .../user-profile/user-profile.component.scss | 20 +++++++++++++++++++ dmp-frontend/src/assets/i18n/de.json | 1 + dmp-frontend/src/assets/i18n/en.json | 1 + dmp-frontend/src/assets/i18n/es.json | 1 + dmp-frontend/src/assets/i18n/gr.json | 1 + dmp-frontend/src/assets/i18n/sk.json | 1 + dmp-frontend/src/assets/i18n/tr.json | 1 + 10 files changed, 38 insertions(+), 14 deletions(-) diff --git a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.html b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.html index f9aa116ea..492232686 100644 --- a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.html +++ b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.html @@ -2,21 +2,19 @@
-
+ +
+ {{'USER-DIALOG.USER-PROFILE-SETTINGS' | translate}} + {{'USER-PROFILE.ASSOCIATED-DMPS' | translate}}
- + {{ 'USER-DIALOG.LOG-OUT' | translate }}
@@ -47,4 +45,4 @@ exit_to_app{{ 'USER-DIALOG.LOG-OUT' | translate }}
- --> \ No newline at end of file + --> 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 b91d2e12f..00a2b8620 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 @@ -41,7 +41,7 @@ $mat-card-header-size: 40px !default; } .dropdown-options a:hover { - background-color: rgba(255, 255, 255, 0.609) !important; + background-color: #ececec8c !important; } .dropdown-options a:hover { diff --git a/dmp-frontend/src/app/ui/user-profile/user-profile.component.html b/dmp-frontend/src/app/ui/user-profile/user-profile.component.html index ee0cdaf64..1ad39ba46 100644 --- a/dmp-frontend/src/app/ui/user-profile/user-profile.component.html +++ b/dmp-frontend/src/app/ui/user-profile/user-profile.component.html @@ -7,9 +7,9 @@
-
+
{{formGroup.get('name').value}}
@@ -195,8 +195,8 @@
-
- +
+
diff --git a/dmp-frontend/src/app/ui/user-profile/user-profile.component.scss b/dmp-frontend/src/app/ui/user-profile/user-profile.component.scss index 56842b157..3b7c5fbd9 100644 --- a/dmp-frontend/src/app/ui/user-profile/user-profile.component.scss +++ b/dmp-frontend/src/app/ui/user-profile/user-profile.component.scss @@ -102,9 +102,15 @@ // padding-bottom: 1.34375em; } +.link-zenodo-btn { + display: flex; + align-items: center; +} + .unlinkBtn { background-color: FireBrick; color: white; + border-radius: 30px; } .save-btn { @@ -122,6 +128,20 @@ cursor: pointer; } +.default-btn { + background: #ffffff 0% 0% no-repeat padding-box; + box-shadow: 0px 3px 6px #1e202029; + border: 1px solid #b5b5b5; + border-radius: 30px; + opacity: 1; + min-width: 162px; + max-width: 256px; + height: 40px; + color: #212121; + font-size: 0.87rem; + font-weight: 500; +} + .vertical-line { border-left: 2px solid #129d99; } diff --git a/dmp-frontend/src/assets/i18n/de.json b/dmp-frontend/src/assets/i18n/de.json index 9d3f5cf62..b33fe606e 100644 --- a/dmp-frontend/src/assets/i18n/de.json +++ b/dmp-frontend/src/assets/i18n/de.json @@ -1386,6 +1386,7 @@ "ZENODO": { "LOGIN": "Login to Zenodo", "LOGOUT": "Remove Zenodo", + "AUTHORIZE": "Authorize Zenodo", "TITLE": "Zenodo Account", "DESCRIPTION": "Linked Zenodo Account" }, diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index cee54cbce..22a9fb101 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -1390,6 +1390,7 @@ "ZENODO": { "LOGIN": "Login to Zenodo", "LOGOUT": "Remove Zenodo", + "AUTHORIZE": "Authorize Zenodo", "TITLE": "Zenodo Account", "DESCRIPTION": "Linked Zenodo Account" }, diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json index 5cde47db8..ae69ccc06 100644 --- a/dmp-frontend/src/assets/i18n/es.json +++ b/dmp-frontend/src/assets/i18n/es.json @@ -1386,6 +1386,7 @@ "ZENODO": { "LOGIN": "Identificarse en Zenodo", "LOGOUT": "Eliminar Zenodo", + "AUTHORIZE": "Authorize Zenodo", "TITLE": "Cuenta en Zenodo", "DESCRIPTION": "Enlazar una cuenta en Zenodo" }, diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json index 1de593b4f..17ce0b8bc 100644 --- a/dmp-frontend/src/assets/i18n/gr.json +++ b/dmp-frontend/src/assets/i18n/gr.json @@ -1386,6 +1386,7 @@ "ZENODO": { "LOGIN": "Συνδέση με Zenodo", "LOGOUT": "Αφαίρεση Zenodo", + "AUTHORIZE": "Authorize Zenodo", "TITLE": "Λογαριασμός Zenodo", "DESCRIPTION": "Συνδεδεμένος Λογαριασμός Zenodo" }, diff --git a/dmp-frontend/src/assets/i18n/sk.json b/dmp-frontend/src/assets/i18n/sk.json index 2b563ad6a..5c8d10246 100644 --- a/dmp-frontend/src/assets/i18n/sk.json +++ b/dmp-frontend/src/assets/i18n/sk.json @@ -1386,6 +1386,7 @@ "ZENODO": { "LOGIN": "Prihlásiť sa do Zenodo", "LOGOUT": "odstrániť Zenodo", + "AUTHORIZE": "Authorize Zenodo", "TITLE": "Zenodo účet", "DESCRIPTION": "Prepojený Zenodo účet" }, diff --git a/dmp-frontend/src/assets/i18n/tr.json b/dmp-frontend/src/assets/i18n/tr.json index 359d3ac48..46bcbbe1e 100644 --- a/dmp-frontend/src/assets/i18n/tr.json +++ b/dmp-frontend/src/assets/i18n/tr.json @@ -1386,6 +1386,7 @@ "ZENODO": { "LOGIN": "Zenodo ile oturum aç", "LOGOUT": "Zenodo'yu Kaldır", + "AUTHORIZE": "Authorize Zenodo", "TITLE": "Zenodo Hesabı", "DESCRIPTION": "Bağlantılı Zenodo Hesabı" },