diff --git a/packages/core/src/components/index.scss b/packages/core/src/components/index.scss index a1ee33bbf..342cf9331 100644 --- a/packages/core/src/components/index.scss +++ b/packages/core/src/components/index.scss @@ -18,9 +18,12 @@ @forward './textarea/textarea'; @mixin components() { + // conditionally includable in other components + @include field-label.FieldLabel(); + + // all the rest @include button.Button(); @include checkbox.Checkbox(); - @include field-label.FieldLabel(); @include helper-text.HelperText(); @include icon.Icon(); @include input.Input(); diff --git a/packages/core/src/components/input/input.scss b/packages/core/src/components/input/input.scss index 10af73907..a76638df2 100644 --- a/packages/core/src/components/input/input.scss +++ b/packages/core/src/components/input/input.scss @@ -1,6 +1,13 @@ @use '../../mixins'; +@use '../includes'; + +@use '../field-label/field-label'; @mixin Input() { + @if not includes.the('field-label') { + @include field-label.FieldLabel(); + } + .ods-input { @include mixins.as-text-input(); } diff --git a/packages/core/src/components/textarea/textarea.scss b/packages/core/src/components/textarea/textarea.scss index 363532d87..9d110ec8c 100755 --- a/packages/core/src/components/textarea/textarea.scss +++ b/packages/core/src/components/textarea/textarea.scss @@ -1,6 +1,13 @@ @use '../../mixins'; +@use '../includes'; + +@use '../field-label/field-label'; @mixin Textarea() { + @if not includes.the('field-label') { + @include field-label.FieldLabel(); + } + .ods-textarea { @include mixins.as-text-input();