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

Merge branch 'w2p-127705_cleanup-input-form-spacing' into w2p-127705_cleanup-input-form-spacing_contribute-main

Browse Source
This commit is contained in:
Joran De Braekeleer
2025-04-07 13:32:18 +02:00
parent 27e9e61619 17d7912851
commit 6212e3fbfc
4 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
<div [class.mb-3]="(model.type !== 'GROUP' && asBootstrapFormGroup) || getClass('element', 'container').includes('mb-3')" <div [class.mb-2]="hasLabel || model.type === 'DATE' || (model.type !== 'GROUP' && asBootstrapFormGroup) || getClass('element', 'container').includes('mb-2')"
[class.d-none]="model.hidden" [class.d-none]="model.hidden"
[formGroup]="group" [formGroup]="group"
[ngClass]="[getClass('element', 'container'), getClass('grid', 'container')]"> [ngClass]="[getClass('element', 'container'), getClass('grid', 'container')]">
@if (!isCheckbox && hasLabel) { @if (!isCheckbox && hasLabel) {
@@ -24,8 +24,7 @@
class="text-muted ds-hint" [innerHTML]="model.hint | translate" [ngClass]="getClass('element', 'hint')"></small> 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 --> <!-- In case of repeatable fields show empty space for all elements except the first -->
@if (context?.index !== null @if (context?.parent?.groups?.length > 1 && (!showErrorMessages || errorMessages.length === 0)) {
&& (!showErrorMessages || errorMessages.length === 0)) {
<div class="clearfix w-100 mb-2"></div> <div class="clearfix w-100 mb-2"></div>
} }
@@ -99,7 +98,9 @@
<small <small
class="text-muted ds-hint" [innerHTML]="model.hint | translate" [ngClass]="getClass('element', 'hint')"></small> class="text-muted ds-hint" [innerHTML]="model.hint | translate" [ngClass]="getClass('element', 'hint')"></small>
} }
<div class="clearfix w-100 mb-2"></div> @if (context?.parent?.groups?.length > 1 && (!showErrorMessages || errorMessages.length === 0)) {
<div class="clearfix w-100 mb-2"></div>
}
} }
<ng-content></ng-content> <ng-content></ng-content>
</div> </div>

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

@@ -15,7 +15,6 @@
appearance: none; appearance: none;
} }
:host ::ng-deep .btn-group-toggle > .btn input[type="radio"] { :host ::ng-deep .btn-group-toggle > .btn input[type="radio"] {
position: absolute; position: absolute;
clip: rect(0,0,0,0); clip: rect(0,0,0,0);
@@ -33,3 +32,13 @@
:host ::ng-deep .custom-control-input.is-invalid ~ .custom-control-label { :host ::ng-deep .custom-control-input.is-invalid ~ .custom-control-label {
color: var(--bs-form-invalid-color); color: var(--bs-form-invalid-color);
} }
.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"> <div class="d-flex">
<span class="me-auto text-contents"> <span class="me-auto text-contents align-self-center">
@if ((metadataRepresentation$ | async) === undefined) { @if ((metadataRepresentation$ | async) === undefined) {
<ds-loading [showMessage]="false"></ds-loading> <ds-loading [showMessage]="false"></ds-loading>
} }

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

@@ -4,6 +4,7 @@
legend { legend {
font-size: initial; font-size: initial;
margin-bottom: 0;
/* Changed from Bootstrap 5's legend to ensure that the date issues label is on a different line as it's input */ /* Changed from Bootstrap 5's legend to ensure that the date issues label is on a different line as it's input */
float: none; float: none;