Skip to content

Commit ed4d395

Browse files
sghowerisghoweri
committed
fix: revert premature merge of a handful of v2.5.0 features
1 parent e953dec commit ed4d395

File tree

109 files changed

+4183
-37996
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+4183
-37996
lines changed

‎docs-site/src/pages/pattern-lab/_patterns/02-components/action-blocks/10-action-blocks-valign-variations.twig renamed to ‎docs-site/src/pages/pattern-lab/_patterns/02-components/action-blocks/10-action-blocks-align-variations.twig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{% set schema = bolt.data.components["@bolt-components-action-blocks"].schema %}
22

3-
{% for valign in schema.properties.valign.enum %}
4-
<h3>Vertical alignment: {{ valign }}</h3>
3+
{% for align in schema.properties.align.enum %}
4+
<h3>Vertical alignment: {{ align }}</h3>
55
<div class="u-bolt-margin-bottom-medium">
66
{% include "@bolt-components-action-blocks/action-blocks.twig" with {
7-
valign: valign,
7+
align: align,
88
contentItems: [
99
{
1010
text: "Item 1",

‎docs-site/src/pages/pattern-lab/_patterns/02-components/action-blocks/15-action-blocks-borderless-variations.twig renamed to ‎docs-site/src/pages/pattern-lab/_patterns/02-components/action-blocks/15-action-blocks-border-variations.twig

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% set schema = bolt.data.components["@bolt-components-action-blocks"].schema %}
22

3-
{% set borderless_options = [
3+
{% set border_options = [
44
{
55
label: "True",
66
value: true
@@ -12,14 +12,11 @@
1212
]
1313
%}
1414

15-
{# {% for borderless_option in borderless_options %} #}
16-
{% for borderless in schema.properties.borderless.enum %}
17-
<h3>
18-
Borderless: {% if borderless is sameas(true) %}true{% elseif borderless is sameas(false) %}false{% endif %}
19-
</h3>
15+
{% for border_option in border_options %}
16+
<h3>Border: {{ border_option.label }}</h3>
2017
<div class="u-bolt-margin-bottom-medium">
2118
{% include "@bolt-components-action-blocks/action-blocks.twig" with {
22-
borderless: borderless,
19+
border: border_option.value,
2320
contentItems: [
2421
{
2522
text: "Item 1",

‎docs-site/src/pages/pattern-lab/_patterns/02-components/action-blocks/25-action-blocks-max-items-per-row.twig

Lines changed: 5 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
{% set schema = bolt.data.components["@bolt-components-action-blocks"].schema %}
1+
{% set maxRows = [6,4,3,2] %}
22

3-
{% for max_items_per_row in schema.properties.max_items_per_row.enum %}
4-
<h3>Max items per row: {{ max_items_per_row }}</h3>
3+
{% for max in maxRows %}
4+
<h3>Max items per row: {{ max }}</h3>
55
<div class="u-bolt-margin-bottom-medium">
66
{% include "@bolt-components-action-blocks/action-blocks.twig" with {
7-
max_items_per_row: max_items_per_row,
7+
maxItemsPerRow: max,
88
contentItems: [
99
{
1010
text: "Item 1",
@@ -47,55 +47,7 @@
4747
}
4848
},
4949
{
50-
text: "Item 6",
51-
url: "#!",
52-
icon: {
53-
name: "copy-to-clipboard",
54-
size: "large",
55-
}
56-
},
57-
{
58-
text: "Item 7",
59-
url: "#!",
60-
icon: {
61-
name: "download",
62-
size: "large",
63-
}
64-
},
65-
{
66-
text: "Item 8",
67-
url: "#!",
68-
icon: {
69-
name: "copy-to-clipboard",
70-
size: "large",
71-
}
72-
},
73-
{
74-
text: "Item 9",
75-
url: "#!",
76-
icon: {
77-
name: "calendar",
78-
size: "large",
79-
}
80-
},
81-
{
82-
text: "Item 10",
83-
url: "#!",
84-
icon: {
85-
name: "copy-to-clipboard",
86-
size: "large",
87-
}
88-
},
89-
{
90-
text: "Item 11",
91-
url: "#!",
92-
icon: {
93-
name: "download",
94-
size: "large",
95-
}
96-
},
97-
{
98-
text: "Item 12",
50+
text: "Item 5",
9951
url: "#!",
10052
icon: {
10153
name: "copy-to-clipboard",

‎docs-site/src/pages/pattern-lab/_patterns/02-components/list/05-list.twig

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,16 @@
1-
{# Setting variables for demo purposes #}
2-
{% set placeholder_1 %}
3-
{% include "@bolt-components-placeholder/placeholder.twig" with {
4-
text: "Item 1",
5-
size: "xsmall",
6-
} only %}
7-
{% endset %}
8-
{% set placeholder_2 %}
9-
{% include "@bolt-components-placeholder/placeholder.twig" with {
10-
text: "Item 2",
11-
size: "xsmall",
12-
} only %}
13-
{% endset %}
14-
{% set placeholder_3 %}
15-
{% include "@bolt-components-placeholder/placeholder.twig" with {
16-
text: "Item 3",
17-
size: "xsmall",
18-
} only %}
19-
{% endset %}
20-
21-
{# Start component specific code #}
221
{% include "@bolt-components-list/list.twig" with {
232
items: [
24-
placeholder_1,
25-
placeholder_2,
26-
placeholder_3,
3+
include("@bolt-components-placeholder/placeholder.twig", {
4+
text: "Placeholder 1",
5+
size: "xsmall",
6+
}),
7+
include("@bolt-components-placeholder/placeholder.twig", {
8+
text: "Placeholder 2",
9+
size: "xsmall",
10+
}),
11+
include("@bolt-components-placeholder/placeholder.twig", {
12+
text: "Placeholder 3",
13+
size: "xsmall",
14+
}),
2715
]
2816
} only %}
29-
{# End component specific code #}

‎docs-site/src/pages/pattern-lab/_patterns/02-components/list/10-list-item-variations.twig

Lines changed: 46 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,66 @@
1-
{# Setting variables for demo purposes #}
2-
{% set link_1 %}
3-
{% include "@bolt-components-link/link.twig" with {
4-
text: "Item 1",
5-
url: "#!",
6-
} only %}
7-
{% endset %}
8-
{% set button_1 %}
9-
{% include "@bolt-components-button/button.twig" with {
10-
text: "Item 1",
11-
url: "#!",
12-
} only %}
13-
{% endset %}
14-
{% set button_2 %}
15-
{% include "@bolt-components-button/button.twig" with {
16-
text: "Item 2",
17-
url: "#!",
18-
} only %}
19-
{% endset %}
20-
{% set button_3 %}
21-
{% include "@bolt-components-button/button.twig" with {
22-
text: "Item 3",
23-
url: "#!",
24-
} only %}
25-
{% endset %}
26-
{% set chip_1 %}
27-
{% include "@bolt-components-chip/chip.twig" with {
28-
text: "Item 1",
29-
url: "#!",
30-
} only %}
31-
{% endset %}
32-
{% set chip_2 %}
33-
{% include "@bolt-components-chip/chip.twig" with {
34-
text: "Item 2",
35-
url: "#!",
36-
} only %}
37-
{% endset %}
38-
{% set chip_3 %}
39-
{% include "@bolt-components-chip/chip.twig" with {
40-
text: "Item 3",
41-
url: "#!",
42-
} only %}
43-
{% endset %}
44-
45-
{# Start component specific code #}
461
<h3>Inline list of different items</h3>
472
{% include "@bolt-components-list/list.twig" with {
483
display: "inline",
494
items: [
50-
link_1,
51-
chip_2,
52-
button_3,
53-
"Item 4",
5+
"Item 1",
6+
include("@bolt-components-link/link.twig", {
7+
text: "Item 2",
8+
url: "#!",
9+
}),
10+
include("@bolt-components-chip/chip.twig", {
11+
text: "Item 3",
12+
url: "#!",
13+
}),
14+
include("@bolt-components-button/button.twig", {
15+
text: "Item 4",
16+
url: "#!",
17+
size: "small",
18+
}),
5419
"Item 5",
5520
"Item 6",
21+
"Item 7",
22+
"Item 8",
23+
"Item 9",
24+
"Item 10",
25+
"Item 11",
5626
]
5727
} only %}
58-
5928
<h3>Inline list of chips</h3>
6029
{% include "@bolt-components-list/list.twig" with {
6130
display: "inline",
6231
items: [
63-
chip_1,
64-
chip_2,
65-
chip_3,
32+
include("@bolt-components-chip/chip.twig", {
33+
text: "Item 1",
34+
url: "#!",
35+
}),
36+
include("@bolt-components-chip/chip.twig", {
37+
text: "Item 2",
38+
url: "#!",
39+
}),
40+
include("@bolt-components-chip/chip.twig", {
41+
text: "Item 3",
42+
url: "#!",
43+
}),
6644
]
6745
} only %}
68-
6946
<h3>Inline list of buttons</h3>
7047
{% include "@bolt-components-list/list.twig" with {
7148
display: "inline",
7249
items: [
73-
button_1,
74-
button_2,
75-
button_3,
50+
include("@bolt-components-button/button.twig", {
51+
text: "Item 1",
52+
url: "#!",
53+
style: "primary",
54+
}),
55+
include("@bolt-components-button/button.twig", {
56+
text: "Item 2",
57+
url: "#!",
58+
style: "secondary",
59+
}),
60+
include("@bolt-components-button/button.twig", {
61+
text: "Item 3",
62+
url: "#!",
63+
style: "text",
64+
}),
7665
]
7766
} only %}
78-
{# End component specific code #}

‎docs-site/src/pages/pattern-lab/_patterns/02-components/list/15-list-display-variations.twig

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,25 @@
1-
{# Setting variables for demo purposes #}
21
{% set schema = bolt.data.components["@bolt-components-list"].schema %}
3-
{% set placeholder_1 %}
4-
{% include "@bolt-components-placeholder/placeholder.twig" with {
5-
text: "Item 1",
6-
size: "xsmall",
7-
} only %}
8-
{% endset %}
9-
{% set placeholder_2 %}
10-
{% include "@bolt-components-placeholder/placeholder.twig" with {
11-
text: "Item 2",
12-
size: "xsmall",
13-
} only %}
14-
{% endset %}
15-
{% set placeholder_3 %}
16-
{% include "@bolt-components-placeholder/placeholder.twig" with {
17-
text: "Item 3",
18-
size: "xsmall",
19-
} only %}
20-
{% endset %}
212

22-
{# Start component specific code #}
233
{% for display in schema.properties.display.enum %}
244
<h3>{{ display|capitalize }}</h3>
255
{% include "@bolt-components-list/list.twig" with {
266
display: display,
277
items: [
28-
placeholder_1,
29-
placeholder_2,
30-
placeholder_3,
8+
include("@bolt-components-placeholder/placeholder.twig", {
9+
text: "Placeholder 1",
10+
size: "xsmall",
11+
}),
12+
include("@bolt-components-placeholder/placeholder.twig", {
13+
text: "Placeholder 2",
14+
size: "xsmall",
15+
}),
16+
include("@bolt-components-placeholder/placeholder.twig", {
17+
text: "Placeholder 3",
18+
size: "xsmall",
19+
}),
3120
]
3221
} only %}
3322
{% endfor %}
3423

35-
<h3>Inline@breakpoint</h3>
36-
<p><mark>Note: this type of display option will transform a block list to inline when the browser is equal to or greater than the breakpoint specified.</mark></p>
37-
{# End component specific code #}
24+
<h3>inline@breakpoint</h3>
25+
<p><mark>This display option means a block list transforming to inline at a specific breakpoint.</mark></p>

0 commit comments

Comments
 (0)