From ce6c0f3b20579d083905977cf88f057db8d0e97e Mon Sep 17 00:00:00 2001 From: apapachristou Date: Thu, 29 Oct 2020 12:10:39 +0200 Subject: [PATCH 1/3] Fixes position of arrow on auto complete --- .../multiple/multiple-auto-complete.component.scss | 2 +- .../recent-edited-activity/recent-edited-activity.component.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.scss b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.scss index 6be1e76f5..8b0858e0d 100644 --- a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.scss +++ b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.scss @@ -10,7 +10,7 @@ .align-arrow-right { position: absolute; right: 0; - bottom: 0; + // bottom: 0; vertical-align: middle; cursor: pointer; align-self: center; diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css index 718856adb..0dfd290a9 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css @@ -109,7 +109,7 @@ input[type="text"] { .icon-align { display: inline-flex; vertical-align: middle; - padding-bottom: 0.4rem; + /* padding-bottom: 0.4rem; */ } .dataset-card-actions, From e661eb3d0b7578db17dfa9792939600ba1d92a2e Mon Sep 17 00:00:00 2001 From: apapachristou Date: Thu, 29 Oct 2020 13:46:10 +0200 Subject: [PATCH 2/3] Removes unnecessary scrollbar from editors --- .../editor/dataset-profile-editor.component.scss | 2 ++ .../listing/dataset-profile-listing.component.html | 2 +- .../listing/dataset-profile-listing.component.scss | 4 ++++ .../editor/dmp-profile-editor.component.scss | 2 ++ .../listing/dmp-profile-listing.component.scss | 2 ++ .../admin/user/listing/user-listing.component.html | 13 ++++++++----- .../admin/user/listing/user-listing.component.scss | 4 +++- .../dataset-wizard/dataset-wizard.component.scss | 4 +++- .../overview/dataset-overview.component.html | 2 +- .../overview/dataset-overview.component.scss | 4 ++++ .../src/app/ui/dmp/editor/dmp-editor.component.scss | 1 + .../app/ui/dmp/overview/dmp-overview.component.html | 2 +- .../app/ui/dmp/overview/dmp-overview.component.scss | 4 ++++ .../user-guide-editor.component.html | 6 +++--- .../user-guide-editor.component.scss | 3 ++- dmp-frontend/src/assets/i18n/de.json | 7 ++++--- dmp-frontend/src/assets/i18n/en.json | 3 ++- dmp-frontend/src/assets/i18n/es.json | 3 ++- dmp-frontend/src/assets/i18n/gr.json | 3 ++- dmp-frontend/src/assets/i18n/sk.json | 3 ++- dmp-frontend/src/assets/i18n/tr.json | 3 ++- 21 files changed, 55 insertions(+), 22 deletions(-) diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss index cdba2f1cc..bc01a5020 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss @@ -1,4 +1,6 @@ .dataset-profile-editor { + margin-top: 6.3rem; + .full-width { width: 100%; } diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.html index b0e01d2c1..bd754914e 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.html @@ -1,4 +1,4 @@ -
+

{{titlePrefix}} {{'DATASET-PROFILE-LISTING.TITLE' | translate}}

diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.scss b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.scss index 2eb955561..2308f6c79 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.scss +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.scss @@ -1,3 +1,7 @@ +.dataset-profile-listing { + margin-top: 6rem; +} + .mat-table { margin: 24px; } diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.scss b/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.scss index b0459dd25..58b3b99c6 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.scss +++ b/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.scss @@ -1,4 +1,6 @@ .dmp-profile-editor { + margin-top: 6.3rem; + .centered-row-item { align-items: center; display: flex; diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.scss b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.scss index fe822c9c8..c89bf8721 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.scss +++ b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.scss @@ -3,6 +3,8 @@ } .dmp-profile-listing { + margin-top: 6.3rem; + .mat-row { cursor: pointer; } diff --git a/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.html b/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.html index f0cf640ed..b7a00fe7b 100644 --- a/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.html +++ b/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.html @@ -1,10 +1,13 @@ 
-

{{'USERS.LISTING.TITLE' | translate}}

- -
+
+

{{'USERS.LISTING.TITLE' | translate}}

+
+ +
+
diff --git a/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.scss b/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.scss index e7a607be4..eacec96b8 100644 --- a/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.scss +++ b/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.scss @@ -3,12 +3,14 @@ } .user-listing { + margin-top: 6rem; + .mat-card { margin: 1em 0; } mat-row:hover { - background-color: lightgray; + // background-color: lightgray; } mat-row:nth-child(odd) { diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss index ab8703182..5b6e350d1 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss @@ -387,8 +387,10 @@ height: calc(100vh - 218px); } } + form { - height: calc(100vh - 124px); + height: calc(100vh - 124px); + margin-top: 6rem; } .stepper-actions { diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html index 152a6347b..01fccc688 100644 --- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html +++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss index e6dedf2da..cfbe6ccb6 100644 --- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss +++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss @@ -3,6 +3,10 @@ padding: 2em; } +.dataset-overview { + margin-top: 5rem; +} + // ********ICONS******** .back-icon { diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss index a833c7e0a..99891458e 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss @@ -10,6 +10,7 @@ form { height: calc(100vh - 124px); + margin-top: 6rem; } a { diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html index cd089a02f..9b405d02f 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss index 812b2daae..825c73c00 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss @@ -3,6 +3,10 @@ padding: 2em; } +.dmp-overview { + margin-top: 5rem; +} + // ********ICONS******** .back-icon { diff --git a/dmp-frontend/src/app/ui/user-guide-editor/user-guide-editor.component.html b/dmp-frontend/src/app/ui/user-guide-editor/user-guide-editor.component.html index dfee70317..10e98c8db 100644 --- a/dmp-frontend/src/app/ui/user-guide-editor/user-guide-editor.component.html +++ b/dmp-frontend/src/app/ui/user-guide-editor/user-guide-editor.component.html @@ -1,6 +1,6 @@
-
+
{{'GUIDE.TITLE' | translate}}
 @@ -21,8 +21,8 @@ }" formControlName="html"> -
diff --git a/dmp-frontend/src/app/ui/user-guide-editor/user-guide-editor.component.scss b/dmp-frontend/src/app/ui/user-guide-editor/user-guide-editor.component.scss index 341b95343..b1a0769e8 100644 --- a/dmp-frontend/src/app/ui/user-guide-editor/user-guide-editor.component.scss +++ b/dmp-frontend/src/app/ui/user-guide-editor/user-guide-editor.component.scss @@ -1,6 +1,7 @@ .user-guide-editor { padding-top: 5em; padding-bottom: 2em; + margin-top: 1em; .save-btn { padding-top: inherit !important; @@ -8,6 +9,6 @@ width: 56px !important; bottom: 10px; position: fixed; - right: 10px; + right: 40px; } } diff --git a/dmp-frontend/src/assets/i18n/de.json b/dmp-frontend/src/assets/i18n/de.json index 0e44528f0..ce0e61148 100644 --- a/dmp-frontend/src/assets/i18n/de.json +++ b/dmp-frontend/src/assets/i18n/de.json @@ -611,7 +611,7 @@ "ERROR": { "DELETED-DMP": "Der angeforderte DMP ist gelöscht", "FORBIDEN-DMP": "Sie sind nicht berechtigt auf diesen DMP zuzugreifen" - }, + }, "MULTIPLE-DIALOG": { "ZENODO-LOGIN": "Login with Zenodo", "USE-DEFAULT": "Use Default Token" @@ -1108,7 +1108,7 @@ "SOURCES": "Quellen", "SOURCE:": "Quelle: ", "NO-SOURCE": "Nicht mit Quelle verknüpfen", - "OUTPUT": "Output" , + "OUTPUT": "Output", "SELECT": "Select" }, "DMP": { @@ -1280,7 +1280,8 @@ "GUIDE": { "TITLE": "Benutzerhandbuch", "TITLE-DASHED": "-Benutzerhandbuch-", - "CLOSE": "Schließen" + "CLOSE": "Schließen", + "SAVE": "Speichern" }, "PRIVACY-POLICY": { "TITLE": "-Datenschutzrichtlinie-", diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index 31386cabf..f0b8b490b 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -1280,7 +1280,8 @@ "GUIDE": { "TITLE": "User Guide", "TITLE-DASHED": "-User Guide-", - "CLOSE": "Close" + "CLOSE": "Close", + "SAVE": "Save" }, "PRIVACY-POLICY": { "TITLE": "-Privacy Policy-", diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json index 90b87f04e..067313e83 100644 --- a/dmp-frontend/src/assets/i18n/es.json +++ b/dmp-frontend/src/assets/i18n/es.json @@ -1280,7 +1280,8 @@ "GUIDE": { "TITLE": "Guía de usuario", "TITLE-DASHED": "-Guía de usuario-", - "CLOSE": "Cerrar" + "CLOSE": "Cerrar", + "SAVE": "Save" }, "PRIVACY-POLICY": { "TITLE": "-Política de privacidad-", diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json index 1311e377d..9c5f00256 100644 --- a/dmp-frontend/src/assets/i18n/gr.json +++ b/dmp-frontend/src/assets/i18n/gr.json @@ -1280,7 +1280,8 @@ "GUIDE": { "TITLE": "Οδηγός Χρήστη", "TITLE-DASHED": "-Οδηγός Χρήστη-", - "CLOSE": "Κλείσιμο" + "CLOSE": "Κλείσιμο", + "SAVE": "Αποθήκευση" }, "PRIVACY-POLICY": { "TITLE": "-Πολιτική Απορρήτου-", diff --git a/dmp-frontend/src/assets/i18n/sk.json b/dmp-frontend/src/assets/i18n/sk.json index dac877f2f..5b4305a9f 100644 --- a/dmp-frontend/src/assets/i18n/sk.json +++ b/dmp-frontend/src/assets/i18n/sk.json @@ -1280,7 +1280,8 @@ "GUIDE": { "TITLE": "Používateľská príručka", "TITLE-DASHED": "-Používateľská príručka-", - "CLOSE": "Zavrieť" + "CLOSE": "Zavrieť", + "SAVE": "Uložiť" }, "PRIVACY-POLICY": { "TITLE": "-Zásady ochrany súkromných údajov-", diff --git a/dmp-frontend/src/assets/i18n/tr.json b/dmp-frontend/src/assets/i18n/tr.json index de239b6f0..a252b163c 100644 --- a/dmp-frontend/src/assets/i18n/tr.json +++ b/dmp-frontend/src/assets/i18n/tr.json @@ -1280,7 +1280,8 @@ "GUIDE": { "TITLE": "Kullanıcı Rehberi", "TITLE-DASHED": "-Kullanıcı Rehberi-", - "CLOSE": "Kapat" + "CLOSE": "Kapat", + "SAVE": "Kaydet" }, "PRIVACY-POLICY": { "TITLE": "-Gizlilik Politikası-", From 992999a596451ccf2d2d52e6c71da417eb5fc8d9 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Thu, 29 Oct 2020 16:54:50 +0200 Subject: [PATCH 3/3] Fixes zenodo icon align on user profile --- .../ui/user-profile/user-profile.component.scss | 8 ++++---- .../images/argos-login/zenodo-gradient-sm.png | Bin 0 -> 5847 bytes 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 dmp-frontend/src/assets/images/argos-login/zenodo-gradient-sm.png 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 8a247941f..5f8c2e9f8 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 @@ -240,13 +240,13 @@ } span.zenodoIcon { - background: url("../../../assets/images/argos-login/zenodo-gradient-200.png") no-repeat; + background: url("../../../assets/images/argos-login/zenodo-gradient-sm.png") no-repeat; background-position: center; float: right; - transform: scale(0.35); + transform: scale(0.58); width: 200px; - height: 80px; - margin-left: -57px; + height: 45px; + margin-left: -58px; } } diff --git a/dmp-frontend/src/assets/images/argos-login/zenodo-gradient-sm.png b/dmp-frontend/src/assets/images/argos-login/zenodo-gradient-sm.png new file mode 100644 index 0000000000000000000000000000000000000000..7cc92141e602eddddfa32fa0b2cfb0bc638b502f GIT binary patch literal 5847 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 literal 0 HcmV?d00001