Skip to content

Commit c1684ad

Browse files
mcokermattnolting
authored andcommitted
fix(buttons): add tokens (patternfly#6127)
1 parent a0f9897 commit c1684ad

File tree

7 files changed

+629
-762
lines changed

7 files changed

+629
-762
lines changed
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
{{> button-list}}
2+
3+
<br><br>
4+
5+
<div><strong>Icon</strong></div>
6+
{{> button-list button--HasIcon=true}}
7+
8+
<br><br>
9+
10+
<div><strong>Icon end</strong></div>
11+
{{> button-list button--HasIconEnd=true}}
12+
13+
{{#*inline "button-list"}}
14+
{{#> button button--IsPrimary=true}}
15+
Primary
16+
{{/button}}
17+
18+
{{#> button button--IsSecondary=true}}
19+
Secondary
20+
{{/button}}
21+
22+
{{#> button button--IsSecondary=true button--IsDanger=true}}
23+
Secondary danger
24+
{{/button}}
25+
26+
{{#> button button--IsTertiary=true}}
27+
Tertiary
28+
{{/button}}
29+
30+
{{#> button button--IsDanger=true}}
31+
Danger
32+
{{/button}}
33+
34+
{{#> button button--IsWarning=true}}
35+
Warning
36+
{{/button}}
37+
38+
<br><br>
39+
40+
{{#> button button--IsLink=true}}
41+
Link
42+
{{/button}}
43+
44+
{{#> button button--IsLink=true button--IsDanger=true}}
45+
Link danger
46+
{{/button}}
47+
48+
{{#> button button--IsLink=true button--IsInline=true}}
49+
Inline link
50+
{{/button}}
51+
52+
{{#> button button--IsPlain=true button--attribute='aria-label="Remove"' button--HasIcon=false button--HasIconEnd=false}}
53+
<i class="fas fa-times" aria-hidden="true"></i>
54+
{{/button}}
55+
56+
<br><br>
57+
58+
{{#> button button--IsControl=true}}
59+
Control
60+
{{/button}}
61+
62+
{{#> button button--IsControl=true button--HasIcon=false button--HasIconEnd=false button--attribute='aria-label="Copy input"'}}
63+
<i class="fas fa-copy" aria-hidden="true"></i>
64+
{{/button}}
65+
{{/inline}}

src/patternfly/components/Button/button.hbs

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
<{{#if button--type}}{{button--type}}{{else if button--IsInlineLinkSpan}}span{{else if button--IsAnchor}}a{{else}}button{{/if}} class="{{pfv}}button
2+
{{#if button--IsPrimary}} pf-m-primary{{/if}}
3+
{{#if button--IsSecondary}} pf-m-secondary{{/if}}
4+
{{#if button--IsTertiary}} pf-m-tertiary{{/if}}
5+
{{#if button--IsWarning}} pf-m-warning{{/if}}
6+
{{#if button--IsDanger}} pf-m-danger{{/if}}
7+
{{#if button--IsLink}} pf-m-link{{/if}}
8+
{{#if button--IsPlain}} pf-m-plain{{/if}}
9+
{{#if button--IsInline}} pf-m-inline{{/if}}
10+
{{#if button--IsControl}} pf-m-control{{/if}}
211
{{#if button--IsExpanded}} pf-m-expanded{{/if}}
312
{{#if button--IsProgress}} pf-m-progress{{/if}}
413
{{#if button--IsInProgress}} pf-m-in-progress{{/if}}
5-
{{#if button--IsInline}} pf-m-inline{{/if}}
6-
{{#if button--IsPlain}} pf-m-plain{{/if}}
14+
{{#if button--IsAriaDisabled}} pf-m-aria-disabled{{/if}}
15+
{{#if button--IsSmall}} pf-m-small{{/if}}
16+
{{#if button--IsClicked}} pf-m-clicked{{/if}}
717
{{#if button--IsDisabled}}
818
{{#if (concat button--type button--IsInlineLinkSpan button--IsAnchor)}}
919
pf-m-disabled
@@ -29,6 +39,9 @@
2939
{{#if button--aria-label}}
3040
aria-label="{{button--aria-label}}"
3141
{{/if}}
42+
{{#if button--IsAriaDisabled}}
43+
aria-disabled="true"
44+
{{/if}}
3245
{{#if button--IsDisabled}}
3346
{{#unless (concat button--type button--IsInlineLinkSpan button--IsAnchor)}}
3447
disabled
@@ -43,5 +56,15 @@
4356
{{#if button--IsInProgress}}
4457
{{> button-progress}}
4558
{{/if}}
59+
{{#if button--HasIcon}}
60+
{{#> button-icon button-icon--modifier="pf-m-start"}}
61+
<i class="fas fa-plus-circle" aria-hidden="true"></i>
62+
{{/button-icon}}
63+
{{/if}}
4664
{{> @partial-block}}
65+
{{#if button--HasIconEnd}}
66+
{{#> button-icon button-icon--modifier="pf-m-end"}}
67+
<i class="fas fa-plus-circle" aria-hidden="true"></i>
68+
{{/button-icon}}
69+
{{/if}}
4770
</{{#if button--type}}{{button--type}}{{else if button--IsInlineLinkSpan}}span{{else if button--IsAnchor}}a{{else}}button{{/if}}>

0 commit comments

Comments
 (0)