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

DS-737 multi-column form layout and grid spacing fix #2453

Merged
merged 10 commits into from
Mar 28, 2022
Merged

DS-737 multi-column form layout and grid spacing fix #2453

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fb4e292
ds-737: set up form layout page
mikemai2awesome Mar 14, 2022
8aa147c
ds-737: fix grid bugs
mikemai2awesome Mar 16, 2022
bef00b2
ds-737: fix grid spacing and add form docs
mikemai2awesome Mar 17, 2022
d48a588
ds-737: fix grid validations
mikemai2awesome Mar 17, 2022
a3962b1
Merge branch 'master' into feature/ds-737-two-column-form-layout
mikemai2awesome Mar 25, 2022
634b57d
ds-737: rename demo page
mikemai2awesome Mar 25, 2022
9101db6
ds-737: remove unused var
mikemai2awesome Mar 25, 2022
d5e7106
ds-737: fix grid item schema typo
mikemai2awesome Mar 28, 2022
aeb4470
ds-737: fix package.json and remove unused var
mikemai2awesome Mar 28, 2022
96a9e7c
ds-737: fix shemas
mikemai2awesome Mar 28, 2022
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
Binary file added docs-site/src/assets/images/backgrounds/contact.jpg
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
409 changes: 409 additions & 0 deletions ...e/src/pages/pattern-lab/_patterns/40-components/form/-55a-form-demo-multiple-columns.twig
View file
Open in desktop

Large diffs are not rendered by default.

325 changes: 325 additions & 0 deletions ...src/pages/pattern-lab/_patterns/40-components/form/55-form-use-case-multiple-columns.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,325 @@
{% set description %}
Use the grid to create multi-column form layouts.
{% endset %}

{% set demo %}
{% set icon_external_link %}
{% include '@bolt-elements-icon/icon.twig' with {
name: 'external-link',
} only %}
{% endset %}
{% include '@bolt-elements-text-link/text-link.twig' with {
content: 'View full page demo',
icon_after: icon_external_link,
attributes: {
href: link['components-form-demo-multiple-columns'],
target: '_blank',
rel: 'noopener'
}
} only %}
{% endset %}

{% set twig_markup %}{% verbatim %}
{% set form_children %}
{% set category_input %}
{% set label %}
{% include '@bolt-components-form/form-label.twig' with {
title: 'Category',
displayType: 'floating',
attributes: {
for: 'category',
},
} only %}
{% endset %}
{% set select %}
{% include '@bolt-components-form/form-select.twig' with {
options: [
{
type: 'option',
value: '',
label: '- Select a category -',
},
{
type: 'option',
value: 'option-a',
label: 'Option A'
},
{
type: 'option',
value: 'option-b',
label: 'Option B'
}
],
attributes: {
id: 'category',
required: true,
},
} only %}
{% endset %}
{% include '@bolt-components-form/form-element.twig' with {
label: label,
children: select,
} only %}
{% endset %}
{% set first_name_input %}
{% set label %}
{% include '@bolt-components-form/form-label.twig' with {
title: 'First name',
displayType: 'floating',
attributes: {
for: 'first-name',
},
} only %}
{% endset %}
{% set input %}
{% include '@bolt-components-form/form-input.twig' with {
attributes: {
placeholder: 'Enter first name',
type: 'text',
id: 'first-name',
required: true,
},
} only %}
{% endset %}
{% include '@bolt-components-form/form-element.twig' with {
label: label,
children: input,
} only %}
{% endset %}
{% set last_name_input %}
{% set label %}
{% include '@bolt-components-form/form-label.twig' with {
title: 'Last name',
displayType: 'floating',
attributes: {
for: 'last-name',
},
} only %}
{% endset %}
{% set input %}
{% include '@bolt-components-form/form-input.twig' with {
attributes: {
placeholder: 'Enter last name',
type: 'text',
id: 'last-name',
required: true,
},
} only %}
{% endset %}
{% include '@bolt-components-form/form-element.twig' with {
label: label,
children: input,
} only %}
{% endset %}
{% set work_email_input %}
{% set label %}
{% include '@bolt-components-form/form-label.twig' with {
title: 'Work email',
displayType: 'floating',
attributes: {
for: 'work-email',
},
} only %}
{% endset %}
{% set input %}
{% include '@bolt-components-form/form-input.twig' with {
attributes: {
placeholder: 'Enter work email',
type: 'email',
id: 'work-email',
required: true,
},
} only %}
{% endset %}
{% include '@bolt-components-form/form-element.twig' with {
label: label,
children: input,
} only %}
{% endset %}
{% set phone_number_input %}
{% set label %}
{% include '@bolt-components-form/form-label.twig' with {
title: 'Phone number',
displayType: 'floating',
attributes: {
for: 'phone-number',
},
} only %}
{% endset %}
{% set input %}
{% include '@bolt-components-form/form-input.twig' with {
attributes: {
placeholder: 'Enter phone number',
type: 'tel',
id: 'phone-number',
required: true,
},
} only %}
{% endset %}
{% include '@bolt-components-form/form-element.twig' with {
label: label,
children: input,
} only %}
{% endset %}
{% set country_input %}
{% set label %}
{% include '@bolt-components-form/form-label.twig' with {
title: 'Country',
displayType: 'floating',
attributes: {
for: 'country',
},
} only %}
{% endset %}
{% set select %}
{% include '@bolt-components-form/form-select.twig' with {
options: [
{
type: 'option',
value: '',
label: '- Select a country -',
},
{
type: 'option',
value: 'option-a',
label: 'Option A'
},
{
type: 'option',
value: 'option-b',
label: 'Option B'
}
],
attributes: {
id: 'country',
required: true,
},
} only %}
{% endset %}
{% include '@bolt-components-form/form-element.twig' with {
label: label,
children: select,
} only %}
{% endset %}
{% set message_input %}
{% set label %}
{% include '@bolt-components-form/form-label.twig' with {
title: 'Message',
displayType: 'floating',
attributes: {
for: 'message',
},
} only %}
{% endset %}
{% set textarea %}
{% include '@bolt-components-form/form-textarea.twig' with {
attributes: {
placeholder: 'Enter a message',
rows: 5,
required: true,
id: 'message',
}
} only %}
{% endset %}
{% include '@bolt-components-form/form-element.twig' with {
label: label,
children: textarea,
} only %}
{% endset %}
{% set agreement_input %}
{% set label %}
{% include '@bolt-components-form/form-label.twig' with {
title: 'Lorem ipsum dolor sit amet, consectetur adipisicing elit.',
displayType: 'inline-checkbox',
attributes: {
for: 'agreement',
name: 'agreement',
},
} only %}
{% endset %}
{% set input %}
{% include '@bolt-components-form/form-input.twig' with {
attributes: {
type: 'checkbox',
id: 'agreement',
},
} only %}
{% endset %}
{% include '@bolt-components-form/form-element.twig' with {
label: label,
children: input,
} only %}
{% endset %}
{% set submit_button %}
{% include '@bolt-elements-button/button.twig' with {
content: 'Send',
display: 'block',
attributes: {
type: 'submit'
},
} only %}
{% endset %}


{% include '@bolt-components-grid/grid.twig' with {
items: [
{
column_start: '1',
column_span: '12',
content: category_input,
},
{
column_start: '1',
column_span: '12 6@small',
content: first_name_input,
},
{
column_start: '1 7@small',
column_span: '12 6@small',
content: last_name_input,
},
{
column_start: '1',
column_span: '12 6@small',
content: work_email_input,
},
{
column_start: '1 7@small',
column_span: '12 6@small',
content: phone_number_input,
},
{
column_start: '1',
column_span: '12',
content: country_input,
},
{
column_start: '1',
column_span: '12',
content: message_input,
},
{
column_start: '1',
column_span: '12',
content: agreement_input,
},
{
column_start: '1',
column_span: '12',
content: submit_button,
},
]
} only %}
{% endset %}

{% include '@bolt-components-form/form.twig' with {
children: form_children,
} only %}
{% endverbatim %}{% endset %}

{% include '@utils/pattern-doc-page.twig' with {
title: 'Use Case: Multiple Columns',
description: description,
demo: demo,
twig_markup: twig_markup,
} only %}
3 changes: 3 additions & 0 deletions ...ages/pattern-lab/_patterns/40-components/form/55a-form-demo-multiple-columns.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
title: "Demo: Multi-column Form"
---
3 changes: 0 additions & 3 deletions packages/components/bolt-grid/src/_grid-item.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ $bolt-grid-item-directions: (
);

bolt-grid-item {
display: block;
width: auto;

@each $valignment in $bolt-grid-item-alignments {
&[valign='#{$valignment}'] {
align-self: #{$valignment};
Expand Down
5 changes: 5 additions & 0 deletions packages/components/bolt-grid/src/_grid-item.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
{% set schema = bolt.data.components['@bolt-components-grid'].schema['grid'] %}
{% if enable_json_schema_validation %}
{{ validate_data_schema(schema, _self)|raw }}
{% endif %}

{% set item_attributes = create_attribute(attributes|default({})) %}

{% set item_row_start = item.row_start %}
Expand Down