diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md index 9dae34f08eee..998867dcb4a2 100644 --- a/packages/components/docs/sass.md +++ b/packages/components/docs/sass.md @@ -2367,7 +2367,6 @@ Generate a media query for a given breakpoint - [carbon--largest-breakpoint [mixin]](#carbon--largest-breakpoint-mixin) - [fluid-type [mixin]](#fluid-type-mixin) - [breadcrumb [mixin]](#breadcrumb-mixin) - - [form [mixin]](#form-mixin) - [modal [mixin]](#modal-mixin) - [inline-notifications [mixin]](#inline-notifications-mixin) - [toast-notifications [mixin]](#toast-notifications-mixin) @@ -6839,7 +6838,7 @@ $text-02: if( 'text-02' ), map-get($carbon--theme, 'text-02'), - #393939 + #525252 ); ``` @@ -6943,7 +6942,6 @@ $text-05: if( - [carbon--theme [mixin]](#carbon--theme-mixin) - [combo-box [mixin]](#combo-box-mixin) - [date-picker [mixin]](#date-picker-mixin) - - [form [mixin]](#form-mixin) - [search [mixin]](#search-mixin) - [time-picker [mixin]](#time-picker-mixin) @@ -18163,24 +18161,19 @@ Form styles margin: $carbon--spacing-02 0 0; max-height: 0; overflow: hidden; - line-height: 1.5; display: none; } - .#{$prefix}--label + .#{$prefix}--form__helper-text { - margin-top: rem(-6px); // when both helper text and label are rendered + .#{$prefix}--select--inline .#{$prefix}--form__helper-text { + margin-top: 0; } .#{$prefix}--form__helper-text { @include type-style('helper-text-01'); - color: $text-05; + color: $text-02; z-index: 0; opacity: 1; - margin-bottom: $carbon--spacing-03; - - @include carbon--breakpoint('sm') { - max-width: 75%; - } + margin-top: $carbon--spacing-02; } .#{$prefix}--label--disabled, @@ -18194,7 +18187,6 @@ Form styles - **Group**: [form](#form) - **Requires**: - - [carbon--breakpoint [mixin]](#carbon--breakpoint-mixin) - [carbon--font-family [function]](#carbon--font-family-function) - [prefix [variable]](#prefix-variable) - [carbon--spacing-07 [variable]](#carbon--spacing-07-variable) @@ -18203,7 +18195,6 @@ Form styles - [text-error [variable]](#text-error-variable) - [carbon--spacing-05 [variable]](#carbon--spacing-05-variable) - [carbon--spacing-02 [variable]](#carbon--spacing-02-variable) - - [text-05 [variable]](#text-05-variable) - [disabled-02 [variable]](#disabled-02-variable) ## inline-loading diff --git a/packages/components/src/components/combo-box/combo-box.hbs b/packages/components/src/components/combo-box/combo-box.hbs index 670eb6b63adf..fa3a06d997e1 100644 --- a/packages/components/src/components/combo-box/combo-box.hbs +++ b/packages/components/src/components/combo-box/combo-box.hbs @@ -8,9 +8,6 @@
- {{#unless inline}} -
Optional helper text here
- {{/unless}}
+ {{#unless inline}} +
Optional helper text here
+ {{/unless}}
- {{#unless inline}} -
Optional helper text here
- {{/unless}}
+ {{#unless inline}} +
Optional helper text here
+ {{/unless}}
- {{#unless inline}} -
Optional helper text here
- {{/unless}}
@@ -76,9 +73,6 @@
- {{#unless inline}} -
Optional helper text here
- {{/unless}}
@@ -104,10 +98,6 @@
- {{#unless inline}} -
Optional helper text - here
- {{/unless}}
@@ -130,10 +120,6 @@
- {{#unless inline}} -
Optional helper text - here
- {{/unless}}
@@ -159,10 +145,6 @@
- {{#unless inline}} -
Optional helper text - here
- {{/unless}}