diff --git a/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.html b/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.html index cfcad8106..a5b5b69d8 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.html +++ b/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.html @@ -23,7 +23,8 @@
@@ -41,7 +42,7 @@
- +
diff --git a/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.scss b/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.scss index be50ce8e5..efe9825bd 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.scss +++ b/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.scss @@ -46,7 +46,7 @@ font-weight: 500; } -.next-btn-disabled { +.next-btn[disabled] { width: 100px; height: 43px; background: #ffffff 0% 0% no-repeat padding-box; @@ -55,11 +55,25 @@ opacity: 1; } -.next-btn:hover { - background: #129d99; +.next-btn:not([disabled]):hover { + background-color: #129d99; color: #ffffff; } +// .next-btn-disabled { +// width: 100px; +// height: 43px; +// background: #ffffff 0% 0% no-repeat padding-box; +// border: 1px solid #b5b5b5; +// border-radius: 30px; +// opacity: 1; +// } + +// .next-btn:hover { +// background: #129d99; +// color: #ffffff; +// } + .attach-btn { top: -20px; } @@ -93,12 +107,26 @@ width: auto !important; max-width: 500px !important; min-height: 1rem !important; + + background-color: #e0e0e0 !important; + background-image: none !important; + color: rgba(0, 0, 0, 0.87) !important; + font-weight: 500 !important; + border-radius: 24px !important; + line-height: 1.25 !important; } .file-label { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + font-size: 14px !important; +} + +::ng-deep ngx-dropzone-remove-badge { + opacity: 1 !important; + margin-left: .5rem !important; + position: initial !important; } ::ng-deep .upload-form .mat-form-field-appearance-outline .mat-form-field-outline { diff --git a/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.ts b/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.ts index 5a147355d..614397aba 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.ts +++ b/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.ts @@ -119,4 +119,8 @@ export class DmpUploadDialogue extends BaseComponent { request.criteria = criteria; return this._service.searchDMPProfiles(request); } + + hasFile(): boolean { + return this.files && this.files.length > 0; + } } 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 00a2b8620..1f78b313e 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 @@ -15,6 +15,7 @@ $mat-card-header-size: 40px !default; font-weight: 300; color: #212121; height: 1.875rem; + line-height: 1.875rem; width: 100%; text-align: left; } 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 75b6c9743..567239f41 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 @@ -199,7 +199,7 @@ 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 3b7c5fbd9..903a18d24 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 @@ -142,6 +142,20 @@ font-weight: 500; } +.accent-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: #129d99; + 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 b33fe606e..8ba654889 100644 --- a/dmp-frontend/src/assets/i18n/de.json +++ b/dmp-frontend/src/assets/i18n/de.json @@ -85,7 +85,8 @@ "PRODUCED": "produced", "RDA-SPECIFICATIONS": "according to RDA specifications", "MACHINE-ACTIONABLE": "for machine-actionable DMPs", - "UPLOAD-FILE": "Upload File" + "UPLOAD-FILE": "Upload File", + "REPLACE-FILE": "Replace File" }, "INVITATION-DIALOG": { "HINT": "Press comma or enter between authors", diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index 22a9fb101..5a5c2fc47 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -85,7 +85,8 @@ "PRODUCED": "produced", "RDA-SPECIFICATIONS": "according to RDA specifications", "MACHINE-ACTIONABLE": "for machine-actionable DMPs", - "UPLOAD-FILE": "Upload File" + "UPLOAD-FILE": "Upload File", + "REPLACE-FILE": "Replace File" }, "INVITATION-DIALOG": { "HINT": "Press comma or enter between authors", diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json index ae69ccc06..61ae7e046 100644 --- a/dmp-frontend/src/assets/i18n/es.json +++ b/dmp-frontend/src/assets/i18n/es.json @@ -85,7 +85,8 @@ "PRODUCED": "produced", "RDA-SPECIFICATIONS": "according to RDA specifications", "MACHINE-ACTIONABLE": "for machine-actionable DMPs", - "UPLOAD-FILE": "Upload File" + "UPLOAD-FILE": "Upload File", + "REPLACE-FILE": "Replace File" }, "INVITATION-DIALOG": { "HINT": "Press comma or enter between authors", diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json index 17ce0b8bc..f95ba004f 100644 --- a/dmp-frontend/src/assets/i18n/gr.json +++ b/dmp-frontend/src/assets/i18n/gr.json @@ -85,7 +85,8 @@ "PRODUCED": "που έχουν παραχθεί", "RDA-SPECIFICATIONS": "σύμφωνα με τις προδιαγραφές του RDA", "MACHINE-ACTIONABLE": "για μηχαναγνώσιμα Σχέδια Διαχείρισης Δεδομένων", - "UPLOAD-FILE": "Μεταφόρτωση Αρχείου" + "UPLOAD-FILE": "Μεταφόρτωση Αρχείου", + "REPLACE-FILE": "Replace File" }, "INVITATION-DIALOG": { "HINT": "Προσθέστε κόμμα ή πατήστε το κουμπί “enter” ανάμεσα στους συγγραφείς", diff --git a/dmp-frontend/src/assets/i18n/sk.json b/dmp-frontend/src/assets/i18n/sk.json index 5c8d10246..29b2a48dc 100644 --- a/dmp-frontend/src/assets/i18n/sk.json +++ b/dmp-frontend/src/assets/i18n/sk.json @@ -85,7 +85,8 @@ "PRODUCED": "vytvorené", "RDA-SPECIFICATIONS": "podľa špecifikácií RDS", "MACHINE-ACTIONABLE": "pre strojovo využiteľné DMP", - "UPLOAD-FILE": "Nahrať súbor" + "UPLOAD-FILE": "Nahrať súbor", + "REPLACE-FILE": "Replace File" }, "INVITATION-DIALOG": { "HINT": "Po každom vložení pozvánky nového užívateľa stlačte čiarku", diff --git a/dmp-frontend/src/assets/i18n/tr.json b/dmp-frontend/src/assets/i18n/tr.json index 46bcbbe1e..bc64b01a3 100644 --- a/dmp-frontend/src/assets/i18n/tr.json +++ b/dmp-frontend/src/assets/i18n/tr.json @@ -85,7 +85,8 @@ "PRODUCED": "produced", "RDA-SPECIFICATIONS": "according to RDA specifications", "MACHINE-ACTIONABLE": "for machine-actionable DMPs", - "UPLOAD-FILE": "Upload File" + "UPLOAD-FILE": "Upload File", + "REPLACE-FILE": "Replace File" }, "INVITATION-DIALOG": { "HINT": "Press comma or enter between authors",