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

fix(form): update label alignment #2200

Merged
merged 14 commits into from Sep 5, 2019
Merged

fix(form): update label alignment #2200

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a84f682
fix(form): fix horizontal form labels
christiemolloy Aug 27, 2019
5acdf50
fix(form): test
christiemolloy Aug 27, 2019
8a090a0
fix(form): add modifier to label
christiemolloy Aug 27, 2019
78345d4
fix(form): update
christiemolloy Aug 27, 2019
f673d68
fix(forms): remove line-height of 0
christiemolloy Aug 28, 2019
9e6545e
fix(form): remove one line
christiemolloy Aug 28, 2019
7deca92
fix(forms): update
christiemolloy Aug 30, 2019
71aaba7
feat(form): updates
christiemolloy Sep 5, 2019
542e467
fix(form): make it not breaking
christiemolloy Sep 5, 2019
2388388
fix(form): updates
christiemolloy Sep 5, 2019
4f1e4ab
fix(forms): update based on review
christiemolloy Sep 5, 2019
c799dd4
fix(form): update mdodifier
christiemolloy Sep 5, 2019
884016a
fix(form): more updates
christiemolloy Sep 5, 2019
4b60de4
fix(form): update text
christiemolloy Sep 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/patternfly/components/Form/docs/code.md
View file
Open in desktop
Expand Up @@ -28,4 +28,5 @@
| `.pf-m-inactive` | `.pf-c-form__helper-text`| Modifies display of helper text to none. |
| `.pf-m-border` | `.pf-c-form__section` | Modifies form element border-bottom. |
| `.pf-m-disabled` | `.pf-c-form__label` | Modifies form label to show disabled state. |
| `.pf-m-no-padding` | `.pf-c-form__label` | Removes top padding from the label element for labels adjacent to an element that isn't a form control. |
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be .pf-m-no-padding-top?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated

| `.pf-m-inline` | `.pf-c-form__group` | Modifies form group children to be inline (this is primarily for radio buttons and checkboxes). |
44 changes: 43 additions & 1 deletion src/patternfly/components/Form/examples/form-horizontal-align-labels-example.hbs
View file
Open in desktop
@@ -1,4 +1,4 @@
{{#> form form--modifier="pf-m-horizontal" form--id="horizontal-align-labels"}}
{{#> form form--modifier="pf-m-horizontal" form--id="horizontal-align-labels-1"}}
{{#> form-group}}
{{#> form-label form-label--attribute=(concat 'for="' form--id '-horizontal-form-name"') required="true"}}
Name
Expand All @@ -7,5 +7,47 @@
{{#> form-control controlType="input" input="true" form-control--attribute=(concat 'type="text" id="' form--id '-horizontal-form-name" name="' form--id '-horizontal-form-name" required')}}
{{/form-control}}
{{/horizontal-form-group}}
{{#> form-helper-text form-helper-text--modifier="pf-m-error" form-helper-text--attribute=(concat 'id="' form--id '-simple-form-name-helper" aria-live="polite"')}}
This is helper text for an invalid input
{{/form-helper-text}}
{{/form-group}}
{{/form}}

<br>

{{#> form form--modifier="pf-m-horizontal" form--id="horizontal-align-labels-2"}}
{{#> form-group}}
{{#> form-label form-label--attribute=(concat 'for="' form--id '-horizontal-form-name"')}}
Information
{{/form-label}}
{{#> horizontal-form-group}}
{{#> form-control controlType="textarea" form-control--attribute=(concat 'type="text" id="' form--id '-horizontal-form-name-2" name="' form--id '-horizontal-form-name-2" aria-label="textarea example"')}}
{{/form-control}}
{{/horizontal-form-group}}
{{#> form-helper-text form-helper-text--modifier="pf-m-error" form-helper-text--attribute=(concat 'id="' form--id '-simple-form-info-helper" aria-live="polite"')}}
This is helper text for an invalid input
{{/form-helper-text}}
{{/form-group}}
{{/form}}

<br>

{{#> form form--modifier="pf-m-horizontal" form--id="horizontal-align-labels-top"}}
{{#> form-group}}
{{#> form-label form-label--modifier="pf-m-no-padding" form-label--attribute=(concat 'for="' form--id '-horizontal-form-name"')}}
No padding label
{{/form-label}}
{{#> horizontal-form-group}}
{{#> check}}
{{#> check-input check-input--attribute='type="checkbox" id="alt-form-checkbox1" name="alt-form-checkbox1"'}}{{/check-input}}
{{#> check-label check-label--attribute='for="alt-form-checkbox1"'}}Follow up via email{{/check-label}}
{{/check}}
{{/horizontal-form-group}}
{{#> horizontal-form-group}}
{{#> check}}
{{#> check-input check-input--attribute='type="checkbox" id="alt-form-checkbox2" name="alt-form-checkbox2"'}}{{/check-input}}
{{#> check-label check-label--attribute='for="alt-form-checkbox2"'}}Remember my password for 30 days{{/check-label}}
{{/check}}
{{/horizontal-form-group}}
{{/form-group}}
{{/form}}
7 changes: 6 additions & 1 deletion src/patternfly/components/Form/form.scss
View file
Open in desktop
Expand Up @@ -69,10 +69,16 @@
grid-template-columns: var(--pf-c-form--m-horizontal--md__group--GridTemplateColumns);
}

/* stylelint-disable */
.pf-c-form__group .pf-c-form__label {
padding-top: var(--pf-c-form__label--PaddingTop);
padding-bottom: 0;

&.pf-m-no-padding {
padding-top: 0;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
padding-top: 0;
--pf-c-form__label--PaddingTop: 0;

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated

}
}
/* stylelint-enable */

.pf-c-form-control,
.pf-c-form__horizontal-group,
Expand Down Expand Up @@ -144,7 +150,6 @@
.pf-c-form__label-required {
margin-left: var(--pf-c-form__label-required--MarginLeft);
font-size: var(--pf-c-form__label-required--FontSize);
line-height: 0;
color: var(--pf-c-form__label-required--Color);
}

Expand Down