Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(helper-text): move helper text below form inputs #5867

Merged
merged 11 commits into from
May 14, 2020
Merged

feat(helper-text): move helper text below form inputs #5867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f32d526
feat(helper-text): move helper text below number-input
tw15egan Apr 14, 2020
fbdb74f
feat(helper-text): rearrange more components
tw15egan Apr 14, 2020
ff53864
feat(helper-text): remove helper text when invalid
tw15egan Apr 15, 2020
404a9bf
feat(helper-text): update vanilla examples, change text-02 value
tw15egan Apr 16, 2020
4346f81
fix(helper-text): update PR after downshift updates
tw15egan May 12, 2020
a2ddc09
fix(textarea): add height to textarea for proper safari rendering
tw15egan May 13, 2020
2174bb0
Merge branch 'master' into helper-text-swap
tw15egan May 13, 2020
82ee68a
Merge branch 'master' into helper-text-swap
tw15egan May 13, 2020
3f44113
Merge branch 'master' into helper-text-swap
tw15egan May 13, 2020
141aba8
Merge branch 'master' into helper-text-swap
tw15egan May 13, 2020
84b7a11
Merge branch 'master' into helper-text-swap
tw15egan May 14, 2020
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
19 changes: 5 additions & 14 deletions packages/components/docs/sass.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -6839,7 +6838,7 @@ $text-02: if(
'text-02'
),
map-get($carbon--theme, 'text-02'),
#393939
#525252
);
```

Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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,
Expand All @@ -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)
Expand All @@ -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
Expand Down
53 changes: 16 additions & 37 deletions packages/components/src/components/combo-box/combo-box.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
<div class="{{@root.prefix}}--form-item">
<div class="{{@root.prefix}}--list-box__wrapper{{#if inline}} {{@root.prefix}}--list-box__wrapper--inline{{/if}}">
<label class="{{@root.prefix}}--label">Combo box label</label>
{{#unless inline}}
<div class="{{@root.prefix}}--form__helper-text">Optional helper text here</div>
{{/unless}}
<div
class="{{@root.prefix}}--combo-box {{@root.prefix}}--list-box{{#if inline}} {{@root.prefix}}--list-box--inline{{/if}}{{#if light}} {{@root.prefix}}--list-box--light{{/if}}">
<div role="combobox" class="{{@root.prefix}}--list-box__field" aria-label="open menu" aria-expanded="false"
Expand All @@ -22,15 +19,15 @@
</div>
</div>
</div>
{{#unless inline}}
<div class="{{@root.prefix}}--form__helper-text">Optional helper text here</div>
{{/unless}}
</div>
</div>

<div class="{{@root.prefix}}--form-item">
<div class="{{@root.prefix}}--list-box__wrapper{{#if inline}} {{@root.prefix}}--list-box__wrapper--inline{{/if}}">
<label class="{{@root.prefix}}--label">Combo box label</label>
{{#unless inline}}
<div class="{{@root.prefix}}--form__helper-text">Optional helper text here</div>
{{/unless}}
<div
class="{{@root.prefix}}--combo-box {{@root.prefix}}--list-box{{#if inline}} {{@root.prefix}}--list-box--inline{{/if}}{{#if light}} {{@root.prefix}}--list-box--light{{/if}}">
<div role="combobox" class="{{@root.prefix}}--list-box__field" aria-label="open menu" aria-expanded="false"
Expand All @@ -45,15 +42,15 @@
</div>
</div>
</div>
{{#unless inline}}
<div class="{{@root.prefix}}--form__helper-text">Optional helper text here</div>
{{/unless}}
</div>
</div>

<div class="{{@root.prefix}}--form-item">
<div class="{{@root.prefix}}--list-box__wrapper {{#if inline}}{{@root.prefix}}--list-box__wrapper--inline{{/if}}">
<label class="{{@root.prefix}}--label">Combo box label</label>
{{#unless inline}}
<div class="{{@root.prefix}}--form__helper-text">Optional helper text here</div>
{{/unless}}
<div
class="{{@root.prefix}}--combo-box {{@root.prefix}}--list-box{{#if inline}} {{@root.prefix}}--list-box--inline{{/if}}{{#if light}} {{@root.prefix}}--list-box--light{{/if}}"
data-invalid>
Expand All @@ -76,9 +73,6 @@
<div class="{{@root.prefix}}--form-item">
<div class="{{@root.prefix}}--list-box__wrapper {{#if inline}}{{@root.prefix}}--list-box__wrapper--inline{{/if}}">
<label class="{{@root.prefix}}--label">Combo box label</label>
{{#unless inline}}
<div class="{{@root.prefix}}--form__helper-text">Optional helper text here</div>
{{/unless}}
<div
class="{{@root.prefix}}--combo-box {{@root.prefix}}--list-box{{#if inline}} {{@root.prefix}}--list-box--inline{{/if}}{{#if light}} {{@root.prefix}}--list-box--light{{/if}}"
data-invalid>
Expand All @@ -104,10 +98,6 @@
<div class="{{@root.prefix}}--form-item">
<div class="{{@root.prefix}}--list-box__wrapper {{#if inline}}{{@root.prefix}}--list-box__wrapper--inline{{/if}}">
<label class="{{@root.prefix}}--label {{@root.prefix}}--label--disabled">Combo box label</label>
{{#unless inline}}
<div class="{{@root.prefix}}--form__helper-text {{@root.prefix}}--form__helper-text--disabled">Optional helper text
here</div>
{{/unless}}
<div
class="{{@root.prefix}}--combo-box {{@root.prefix}}--list-box {{@root.prefix}}--list-box--disabled{{#if inline}} {{@root.prefix}}--list-box--inline{{/if}}{{#if light}} {{@root.prefix}}--list-box--light{{/if}}"
data-invalid>
Expand All @@ -130,10 +120,6 @@
<div class="{{@root.prefix}}--form-item">
<div class="{{@root.prefix}}--list-box__wrapper {{#if inline}}{{@root.prefix}}--list-box__wrapper--inline{{/if}}">
<label class="{{@root.prefix}}--label {{@root.prefix}}--label--disabled">Combo box label</label>
{{#unless inline}}
<div class="{{@root.prefix}}--form__helper-text {{@root.prefix}}--form__helper-text--disabled">Optional helper text
here</div>
{{/unless}}
<div
class="{{@root.prefix}}--combo-box {{@root.prefix}}--list-box {{@root.prefix}}--list-box--disabled{{#if inline}} {{@root.prefix}}--list-box--inline{{/if}}{{#if light}} {{@root.prefix}}--list-box--light{{/if}}"
data-invalid>
Expand All @@ -159,10 +145,6 @@
<div class="{{@root.prefix}}--form-item">
<div class="{{@root.prefix}}--list-box__wrapper {{#if inline}}{{@root.prefix}}--list-box__wrapper--inline{{/if}}">
<label class="{{@root.prefix}}--label {{@root.prefix}}--label--disabled">Combo box label</label>
{{#unless inline}}
<div class="{{@root.prefix}}--form__helper-text {{@root.prefix}}--form__helper-text--disabled">Optional helper text
here</div>
{{/unless}}
<div
class="{{@root.prefix}}--combo-box {{@root.prefix}}--list-box {{@root.prefix}}--list-box--disabled{{#if inline}} {{@root.prefix}}--list-box--inline{{/if}}{{#if light}} {{@root.prefix}}--list-box--light{{/if}}">
<div role="combobox" class="{{@root.prefix}}--list-box__field" aria-label="open menu" aria-expanded="false"
Expand All @@ -180,11 +162,6 @@
<div class="{{@root.prefix}}--form-item">
<div class="{{@root.prefix}}--list-box__wrapper {{#if inline}}{{@root.prefix}}--list-box__wrapper--inline{{/if}}">
<label class="{{@root.prefix}}--label">Combo box label</label>
{{#unless inline}}
<div class="{{@root.prefix}}--form__helper-text">Optional helper text
here
</div>
{{/unless}}
<div
class="{{@root.prefix}}--combo-box {{@root.prefix}}--list-box {{@root.prefix}}--list-box--expanded{{#if inline}} {{@root.prefix}}--list-box--inline{{/if}}{{#if light}} {{@root.prefix}}--list-box--light{{/if}}">
<div role="combobox" class="{{@root.prefix}}--list-box__field" aria-label="close menu" aria-expanded="true"
Expand All @@ -207,17 +184,17 @@
{{/each}}
</ul>
</div>
{{#unless inline}}
<div class="{{@root.prefix}}--form__helper-text">Optional helper text
here
</div>
{{/unless}}
</div>
</div>

<div class="{{@root.prefix}}--form-item">
<div class="{{@root.prefix}}--list-box__wrapper {{#if inline}}{{@root.prefix}}--list-box__wrapper--inline{{/if}}">
<label class="{{@root.prefix}}--label">Combo box label</label>
{{#unless inline}}
<div class="{{@root.prefix}}--form__helper-text">Optional helper text
here
</div>
{{/unless}}
<div
class="{{@root.prefix}}--combo-box {{@root.prefix}}--list-box {{@root.prefix}}--list-box--expanded{{#if inline}} {{@root.prefix}}--list-box--inline{{/if}}{{#if light}} {{@root.prefix}}--list-box--light{{/if}}">
<div role="combobox" class="{{@root.prefix}}--list-box__field" aria-label="close menu" aria-expanded="true"
Expand All @@ -244,15 +221,17 @@
{{/each}}
</ul>
</div>
{{#unless inline}}
<div class="{{@root.prefix}}--form__helper-text">Optional helper text
here
</div>
{{/unless}}
</div>
</div>

<div class="{{@root.prefix}}--form-item">
<div class="{{@root.prefix}}--list-box__wrapper {{#if inline}}{{@root.prefix}}--list-box__wrapper--inline{{/if}}">
<label class="{{@root.prefix}}--label">Combo box label</label>
{{#unless inline}}
<div class="{{@root.prefix}}--form__helper-text">Optional helper text here</div>
{{/unless}}
<div
class="{{@root.prefix}}--combo-box {{@root.prefix}}--list-box{{#if inline}} {{@root.prefix}}--list-box--inline{{/if}}{{#if light}} {{@root.prefix}}--list-box--light{{/if}}"
data-invalid>
Expand Down
Loading