Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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')]">
Expand All @@ -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')]">
Expand Down Expand Up @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@

legend {
font-size: initial;
margin-bottom: 0;
}