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

docs(number-input): avoid double helper text #1771

Merged
merged 3 commits into from
Feb 11, 2019
Merged

docs(number-input): avoid double helper text #1771

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8e9170
docs(number-input): avoid double helper text
emyarod Feb 11, 2019
73e7e2d
Merge branch 'master' into 1770-number-input-docs
aledavila Feb 11, 2019
a58d138
Merge branch 'master' into 1770-number-input-docs
asudoh Feb 11, 2019
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
5 changes: 4 additions & 1 deletion src/components/number-input/number-input.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,10 @@
<div data-invalid data-numberinput
class="{{@root.prefix}}--number {{#if light}}{{@root.prefix}}--number--light{{/if}} {{@root.prefix}}--number--helpertext">
<label for="number-input4" class="{{@root.prefix}}--label">Number Input label</label>
{{#if @root.featureFlags.componentsX}}
<div class="{{@root.prefix}}--form__helper-text">
Optional helper text here; if message is more than one line text should wrap (~100 character count maximum)
</div>
{{#if @root.featureFlags.componentsX}}
<div class="{{@root.prefix}}--number__input-wrapper">
<input id="number-input4" type="number" min="0" max="100" value="1">
{{ carbon-icon 'WarningFilled16' class=(add @root.prefix '--number__invalid')}}
Expand Down Expand Up @@ -239,6 +239,9 @@
</div>
{{/if}}
{{#unless @root.featureFlags.componentsX}}
<div class="{{@root.prefix}}--form-requirement">
Invalid number
</div>
<div class="{{@root.prefix}}--form__helper-text">
Optional helper text here; if message is more than one line text should wrap (~100 character count maximum)
</div>
Expand Down