Skip to content

Commit

Permalink
Merge branch 'master' into simeonoff/fix-13266-16.1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
georgianastasov authored Jul 18, 2023
2 parents 973f153 + 0af3371 commit 481576c
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,18 @@
}
}

@include mx(fluent, textarea-group) {
@include e(bundle-start) {
@extend %form-group-bundle-textarea-start--fluent !optional;
}
}

@include mx(fluent, textarea-group) {
@include e(bundle-end) {
@extend %form-group-bundle-textarea-end--fluent !optional;
}
}

@include mx(fluent, required) {
@include e(bundle) {
@extend %form-group-bundle-required--fluent !optional;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1353,7 +1353,11 @@
}

&:empty {
display: none;
@if $variant == 'fluent' {
padding: 0;
} @else {
display: none;
}
}
}

Expand Down Expand Up @@ -1618,6 +1622,13 @@
}
}

%form-group-bundle-textarea-start--fluent,
%form-group-bundle-textarea-end--fluent {
&:empty {
display: none;
}
}

// Native input
%fluent-input {
font-size: rem(14px);
Expand Down

0 comments on commit 481576c

Please sign in to comment.