diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss index 13de59700c..a0f0cc173d 100644 --- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss +++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss @@ -6,3 +6,7 @@ } } } +:host ::ng-deep ds-dynamic-form-control-container > div { + margin-bottom: 1rem; +} + diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts index cc8997dc5a..9b160f486b 100644 --- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts +++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts @@ -267,6 +267,11 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy { */ newFormatBaseLayout = 'col col-sm-6 d-inline-block'; + /** + * Base layout for iiif options + */ + iiifOptionsBaseLayout = 'col col-sm-6'; + /** * Layout used for structuring the form inputs */ @@ -687,10 +692,10 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy { const iiifSub = iiifCheck$.subscribe((iiif: boolean) => { if (iiif) { this.isIIIF = true; - this.formLayout.iiifLabel.grid.host = this.newFormatBaseLayout; - this.formLayout.iiifToc.grid.host = this.newFormatBaseLayout; - this.formLayout.iiifWidth.grid.host = this.newFormatBaseLayout; - this.formLayout.iiifHeight.grid.host = this.newFormatBaseLayout; + this.formLayout.iiifLabel.grid.host = this.iiifOptionsBaseLayout; + this.formLayout.iiifToc.grid.host = this.iiifOptionsBaseLayout; + this.formLayout.iiifWidth.grid.host = this.iiifOptionsBaseLayout; + this.formLayout.iiifHeight.grid.host = this.iiifOptionsBaseLayout; this.formGroup.patchValue({ iiifLabelContainer: { iiifLabel: bitstream.firstMetadataValue(this.IIIF_LABEL_METADATA) diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.scss index 05e7421e40..4e58759f4e 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.scss +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.scss @@ -14,7 +14,3 @@ -moz-appearance: none; appearance: none; } - -label { - margin-top: calc(0.7 * var(--ds-content-spacing)); -} \ No newline at end of file diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 15c8d111ec..d2b770af9e 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -584,11 +584,11 @@ "bitstream.edit.form.iiifLabel.label": "IIIF Label", - "bitstream.edit.form.iiifLabel.hint": "Canvas label for this image", + "bitstream.edit.form.iiifLabel.hint": "Canvas label for this image. If not provided default label will be used.", "bitstream.edit.form.iiifToc.label": "IIIF Table of Contents", - "bitstream.edit.form.iiifToc.hint": "Adding label makes this image the start of a new table of contents range.", + "bitstream.edit.form.iiifToc.hint": "Adding text here makes this the start of a new table of contents range.", "bitstream.edit.form.iiifWidth.label": "IIIF canvas width",