diff --git a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.html b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.html index 0a912d97a..56742ff79 100644 --- a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.html +++ b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.html @@ -1,5 +1,7 @@
+ + @@ -9,8 +11,19 @@ + + + + + + + + + + + arrow_drop_down @@ -24,9 +37,11 @@ }">
- {{_titleFn(item)}} -
- {{_subtitleFn(item)}} + + {{_titleFn(item)}} +
+ {{_subtitleFn(item)}} +
{{popupItemActionIcon}}
@@ -43,9 +58,11 @@ }">
- {{_titleFn(item)}} -
- +
+ {{_titleFn(item)}} +
+ +
{{popupItemActionIcon}}
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 76cfcb18e..49f0a9cd6 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 @@ -19,12 +19,27 @@ } +.title-fn-inner { + width: inherit; + height: inherit; + overflow: hidden; + text-overflow: ellipsis; +} + .title-fn { - flex-grow: 1; - white-space: nowrap; - width: calc(100% - 16px); - overflow: hidden; - text-overflow: ellipsis; + height: inherit; + width: calc(100% - 16px); + overflow: hidden; + white-space: nowrap; + display: -webkit-box; + -webkit-box-orient: vertical; + -moz-box-orient: vertical; + -ms-box-orient: vertical; + box-orient: vertical; + -webkit-line-clamp: 2; + -moz-line-clamp: 2; + -ms-line-clamp: 2; + line-clamp: 2; } .option-icon { @@ -64,4 +79,4 @@ &::placeholder { color: transparent; } - } \ No newline at end of file + } diff --git a/dmp-frontend/src/app/ui/dmp/dataset-preview/dataset-preview-dialog.component.html b/dmp-frontend/src/app/ui/dmp/dataset-preview/dataset-preview-dialog.component.html index 4408ca279..3d1182cde 100644 --- a/dmp-frontend/src/app/ui/dmp/dataset-preview/dataset-preview-dialog.component.html +++ b/dmp-frontend/src/app/ui/dmp/dataset-preview/dataset-preview-dialog.component.html @@ -7,7 +7,8 @@
- +
diff --git a/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.html b/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.html index 81bd11179..5949af616 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.html @@ -3,9 +3,11 @@
- {{profile.label}} -
- +
+ {{profile.label}} +
+ +
diff --git a/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.scss b/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.scss index 34a1934de..caf264353 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.scss +++ b/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.scss @@ -1,7 +1,25 @@ -.list-option { +.list-option-inner { flex-grow: 1; white-space: nowrap; - width: calc(100% - 16px); + width: 100%; overflow: hidden; text-overflow: ellipsis; } + +.list-option { + width: calc(100% - 16px); + flex-grow: 1; + display: -webkit-box; + -webkit-box-orient: vertical; + -moz-box-orient: vertical; + -ms-box-orient: vertical; + box-orient: vertical; + -webkit-line-clamp: 2; + -moz-line-clamp: 2; + -ms-line-clamp: 2; + line-clamp: 2; +} + +::ng-deep .mat-list-text { + max-height: 100%; +} diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description.component.html b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description.component.html index 20bf08d41..94aea2f5e 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description.component.html +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description.component.html @@ -1,6 +1,7 @@ -
- {{'DMP-EDITOR.DATASET-DESCRIPTION.INTRO' | translate}} -
+ + + +
diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description.component.ts b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description.component.ts index c19c98165..b3937f33a 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description.component.ts +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description.component.ts @@ -23,6 +23,7 @@ export class DatasetDescriptionComponent extends BaseComponent implements OnInit @Input() path: string; @Input() visibilityRules: Rule[] = []; @Input() datasetProfileId: String; + @Input() datasetDescription: String; @Input() linkToScroll: LinkToScroll; @Output() formChanged: EventEmitter = new EventEmitter(); @Output() fieldsetFocusChange: EventEmitter = new EventEmitter(); @@ -413,4 +414,4 @@ export enum ToCEntryType { Section = 1, FieldSet = 2, Field = 3 -} \ No newline at end of file +}