diff --git a/dmp-frontend/src/app/ui/description/overview/description-overview.component.html b/dmp-frontend/src/app/ui/description/overview/description-overview.component.html index 4cdac134a..ccffd6d76 100644 --- a/dmp-frontend/src/app/ui/description/overview/description-overview.component.html +++ b/dmp-frontend/src/app/ui/description/overview/description-overview.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/dmp-frontend/src/app/ui/description/overview/description-overview.component.scss b/dmp-frontend/src/app/ui/description/overview/description-overview.component.scss index 044796c0b..570988e99 100644 --- a/dmp-frontend/src/app/ui/description/overview/description-overview.component.scss +++ b/dmp-frontend/src/app/ui/description/overview/description-overview.component.scss @@ -3,10 +3,6 @@ padding: 2em; } -.description-overview { - // margin-top: 5rem; -} - // ********ICONS******** .back-icon { 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 e61144992..2181194dc 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 @@ -6,36 +6,37 @@

{{'DMP-OVERVIEW.ACTIONS.BACK' | translate}}

-
+
- -

{{ dmp.label }}

+
+
{{ dmp.label }}
-
-
-

- {{ enumUtils.toDmpUserRolesString(dmpService.getCurrentUserRolesInDmp(dmp?.dmpUsers)) }} +

+
+

{{ enumUtils.toDmpUserRolesString(dmpService.getCurrentUserRolesInDmp(dmp?.dmpUsers)) }}

- . -
+
.
+
public {{'DMP-OVERVIEW.PUBLIC' | translate}}
- . -
+
.
+
lock_outline {{'DMP-OVERVIEW.LOCKED' | translate}}
- - - - {{'DMP-OVERVIEW.VERSION' | translate}} {{version.version}} - - -
{{'DMP-OVERVIEW.EDITED' | translate}} : +
+ + + + {{'DMP-OVERVIEW.VERSION' | translate}} {{version.version}} + + +
+
{{'DMP-OVERVIEW.EDITED' | translate}} : {{dmp.updatedAt | dateTimeCultureFormatter: "d MMMM y"}}
-
+
check {{'DMP-OVERVIEW.FINALISED' | translate}} @@ -44,68 +45,86 @@
- - - -
-
-
{{'DMP-OVERVIEW.GRANT' | translate}}
-
{{referenceService.getReferencesForTypesFirstSafe(dmp?.dmpReferences, [this.referenceTypeService.getGrantReferenceType()])?.reference?.label}}
-
-
{{'DESCRIPTION-OVERVIEW.RESEARCHERS' | translate}}
-
-
- - -
 
-
{{ dmpReference.reference?.label }},
-
{{ dmpReference.reference?.label }}
-
-
- -
{{ dmpReference.reference?.label }},
-
{{ dmpReference.reference?.label }}
-
+
+ +
+
+ +
+
+
- horizontal_rule
-
{{'DMP-OVERVIEW.DESCRIPTION' | translate}}
+ +
{{'DMP-OVERVIEW.GRANT' | translate}}
+
{{referenceService.getReferencesForTypesFirstSafe(dmp?.dmpReferences, [this.referenceTypeService.getGrantReferenceType()])?.reference?.label}}
+
+
{{'DESCRIPTION-OVERVIEW.RESEARCHERS' | translate}}
+
+
+ + + + + +
+ {{ dmpReference.reference?.label }},  + {{ dmpReference.reference?.label }} +
+
+
+
+
horizontal_rule
+
+
{{'DMP-OVERVIEW.DESCRIPTION' | translate}}
-

+
+

+
- horizontal_rule -
-
{{'DMP-OVERVIEW.DESCRIPTIONS' | translate}}
-
- -
+
horizontal_rule
-
+
{{'DMP-OVERVIEW.DESCRIPTIONS' | translate}}
+
+ + + +
+ horizontal_rule +
+
+
-
+
{{'DMP-OVERVIEW.DOI-PROVIDED' | translate}}: 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 42b921790..06a8a13f3 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 @@ -5,10 +5,6 @@ padding: 2em; } -.dmp-overview { - //margin-top: 5rem; -} - // ********ICONS******** .back-icon { @@ -47,7 +43,7 @@ } .description-btn { - width: 36.1em; + // width: 36.1em; padding: 0 1.1em; background-color: var(--secondary-color); border-radius: 4px; @@ -57,7 +53,7 @@ } .description-finalized-btn { - width: 36.1em; + // width: 36.1em; padding: 0 1.1em; background-color: #b2f772; border-radius: 4px; @@ -178,19 +174,20 @@ } .desc-txt { - width: 48.25em; + // width: 48.25em; font-size: 1em; color: #212121; margin-bottom: 1.875em; } -.description { - width: fit-content; -} +// .description { +// width: fit-content; +// } .description-btn-label { margin-right: 1em; overflow: hidden; + white-space: nowrap; text-overflow: ellipsis; letter-spacing: 0px; color: #212121; @@ -331,3 +328,21 @@ .select-repo { border-bottom: 1px solid #212121; } + +.dmp-btn { + min-height: 2.3em; + background-color: var(--secondary-color); + border-radius: 4px; + flex-direction: row; + justify-content: space-between; + border: none; +} + +.dmp-finalized-btn { + min-height: 2.3em; + background-color: #b2f772; + border-radius: 4px; + flex-direction: row; + justify-content: space-between; + border: none; +}