hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-06 17:44:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4713 from tdonohue/port_4180_to_8x

Browse Source 
[Port dspace-8_x] Clean up spacing in input forms
This commit is contained in:
Tim Donohue
2025-09-10 14:16:41 -05:00
committed by GitHub
parent 6f51e796db e3832352dd
commit 66f36b958a
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
View File

@@ -1,4 +1,4 @@
<div [class.form-group]="(model.type !== 'GROUP' && asBootstrapFormGroup) || getClass('element', 'container').includes('form-group')"
<div [class.form-group]="hasLabel || model.type === 'DATE' || (model.type !== 'GROUP' && asBootstrapFormGroup) || getClass('element', 'container').includes('form-group')"
[class.d-none]="model.hidden"
[formGroup]="group"
[ngClass]="[getClass('element', 'container'), getClass('grid', 'container')]">
@@ -19,8 +19,7 @@
<small *ngIf="hasHint && (formBuilderService.hasArrayGroupValue(model) || (!model.repeatable && (isRelationship === false || value?.value === null)) || (model.repeatable === true && context?.index === context?.context?.groups?.length - 1)) && (!showErrorMessages || errorMessages.length === 0)"
class="text-muted ds-hint" [innerHTML]="model.hint | translate" [ngClass]="getClass('element', 'hint')"></small>
<!-- In case of repeatable fields show empty space for all elements except the first -->
<div *ngIf="context?.index !== null
&& (!showErrorMessages || errorMessages.length === 0)" class="clearfix w-100 mb-2"></div>
<div *ngIf="context?.parent?.groups?.length > 1 && (!showErrorMessages || errorMessages.length === 0)" class="clearfix w-100 mb-2"></div>
<div *ngIf="!model.hideErrorMessages && showErrorMessages" [id]="id + '_errors'"
[ngClass]="[getClass('element', 'errors'), getClass('grid', 'errors')]">
@@ -78,7 +77,7 @@
</ds-existing-relation-list-element>
<small *ngIf="hasHint && (model.repeatable === false || context?.index === context?.context?.groups?.length - 1) && (!showErrorMessages || errorMessages.length === 0)"
class="text-muted ds-hint" [innerHTML]="model.hint | translate" [ngClass]="getClass('element', 'hint')"></small>
<div class="clearfix w-100 mb-2"></div>
<div *ngIf="context?.parent?.groups?.length > 1 && (!showErrorMessages || errorMessages.length === 0)" class="clearfix w-100 mb-2"></div>
</ng-container>
<ng-content></ng-content>
</div>

10
src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.scss
View File

@@ -14,3 +14,13 @@
-moz-appearance: none;
appearance: none;
}
.invalid-feedback {
margin-top: 0;
}
.col-form-label {
padding-top: 0;
padding-bottom: 0;
margin-bottom: 0.5rem;
}

2
src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
View File

@@ -1,5 +1,5 @@
<div class="d-flex">
<span class="mr-auto text-contents">
<span class="mr-auto text-contents align-self-center">
<ng-container *ngIf="(metadataRepresentation$ | async) === undefined">
<ds-loading [showMessage]="false"></ds-loading>
</ng-container>

1
src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.scss
View File

@@ -4,4 +4,5 @@
legend {
font-size: initial;
margin-bottom: 0;
}