Skip to content

Commit c9982d0

Browse files
author
Lise LaTorre
authored
Merge branch 'summer-19' into fix/vertical-picker-sizes
2 parents 21bf99e + 79dfbec commit c9982d0

File tree

2 files changed

+50
-16
lines changed

2 files changed

+50
-16
lines changed

ui/components/buttons/_doc.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
* @name buttons
1313
* @base
14-
* @selector .slds-button, .slds-button_stateful, .slds-button_dual-stateful
14+
* @selector .slds-button, .slds-button_stateful, .slds-button_dual-stateful, .slds-button_reset
1515
* @category base
1616
* @type action
1717
* @role button

ui/components/vertical-navigation/radio-group/example.jsx

Lines changed: 49 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,21 @@ export const NavVerticalRadioSet = props => (
5656
isNavVerticalRadioSet
5757
>
5858
<NavVerticalFieldset>
59-
<NavVerticalItemRadio checked id="recent">
59+
<NavVerticalItemRadio checked id="unique-id-01-recent">
6060
Recent
6161
</NavVerticalItemRadio>
62-
<NavVerticalItemRadio id="created-by-me">
62+
<NavVerticalItemRadio id="unique-id-01-created-by-me">
6363
Created by Me
6464
</NavVerticalItemRadio>
65-
<NavVerticalItemRadio id="private-reports">
65+
<NavVerticalItemRadio id="unique-id-01-private-reports">
6666
Private Reports
6767
</NavVerticalItemRadio>
68-
<NavVerticalItemRadio id="public-reports">
68+
<NavVerticalItemRadio id="unique-id-01-public-reports">
6969
Public Reports
7070
</NavVerticalItemRadio>
71-
<NavVerticalItemRadio id="all-reports">All Reports</NavVerticalItemRadio>
71+
<NavVerticalItemRadio id="unique-id-01-all-reports">
72+
All Reports
73+
</NavVerticalItemRadio>
7274
</NavVerticalFieldset>
7375
</NavVerticalSection>
7476
);
@@ -86,19 +88,35 @@ export let examples = [
8688
isNavVerticalRadioSet
8789
>
8890
<NavVerticalFieldset compact>
89-
<NavVerticalItemRadio checked id="recent" name="unique-id-compact">
91+
<NavVerticalItemRadio
92+
checked
93+
id="unique-id-02-recent"
94+
name="unique-id-compact"
95+
>
9096
Recent
9197
</NavVerticalItemRadio>
92-
<NavVerticalItemRadio id="created-by-me" name="unique-id-compact">
98+
<NavVerticalItemRadio
99+
id="unique-id-02-created-by-me"
100+
name="unique-id-compact"
101+
>
93102
Created by Me
94103
</NavVerticalItemRadio>
95-
<NavVerticalItemRadio id="private-reports" name="unique-id-compact">
104+
<NavVerticalItemRadio
105+
id="unique-id-02-private-reports"
106+
name="unique-id-compact"
107+
>
96108
Private Reports
97109
</NavVerticalItemRadio>
98-
<NavVerticalItemRadio id="public-reports" name="unique-id-compact">
110+
<NavVerticalItemRadio
111+
id="unique-id-02-public-reports"
112+
name="unique-id-compact"
113+
>
99114
Public Reports
100115
</NavVerticalItemRadio>
101-
<NavVerticalItemRadio id="all-reports" name="unique-id-compact">
116+
<NavVerticalItemRadio
117+
id="unique-id-02-all-reports"
118+
name="unique-id-compact"
119+
>
102120
All Reports
103121
</NavVerticalItemRadio>
104122
</NavVerticalFieldset>
@@ -116,19 +134,35 @@ export let examples = [
116134
isNavVerticalRadioSet
117135
>
118136
<NavVerticalFieldset shaded>
119-
<NavVerticalItemRadio checked id="recent" name="unique-id-shade">
137+
<NavVerticalItemRadio
138+
checked
139+
id="unique-id-03-recent"
140+
name="unique-id-shade"
141+
>
120142
Recent
121143
</NavVerticalItemRadio>
122-
<NavVerticalItemRadio id="created-by-me" name="unique-id-shade">
144+
<NavVerticalItemRadio
145+
id="unique-id-03-created-by-me"
146+
name="unique-id-shade"
147+
>
123148
Created by Me
124149
</NavVerticalItemRadio>
125-
<NavVerticalItemRadio id="private-reports" name="unique-id-shade">
150+
<NavVerticalItemRadio
151+
id="unique-id-03-private-reports"
152+
name="unique-id-shade"
153+
>
126154
Private Reports
127155
</NavVerticalItemRadio>
128-
<NavVerticalItemRadio id="public-reports" name="unique-id-shade">
156+
<NavVerticalItemRadio
157+
id="unique-id-03-public-reports"
158+
name="unique-id-shade"
159+
>
129160
Public Reports
130161
</NavVerticalItemRadio>
131-
<NavVerticalItemRadio id="all-reports" name="unique-id-shade">
162+
<NavVerticalItemRadio
163+
id="unique-id-03-all-reports"
164+
name="unique-id-shade"
165+
>
132166
All Reports
133167
</NavVerticalItemRadio>
134168
</NavVerticalFieldset>

0 commit comments

Comments
 (0)