Skip to content

Commit 7d23cea

Browse files
rroppoloRachel Roppolojasonbasuil
authored
Feature/UI ds 272 update checkbox groups (#295)
* UIDS-272 Add new checkbox button group stories * UIDS-272 Update checkbox group stories * UIDS-272 Add temporary deploy * UIDS-272 Add helper text and font-weigh tweaks * UIDS-272 Update single CheckboxButton story * UIDS-272 Add new checkbox button group stories * UIDS-272 Update checkbox group stories * UIDS-272 Add temporary deploy * UIDS-272 Add helper text and font-weigh tweaks * UIDS-272 Update single CheckboxButton story Co-authored-by: Rachel Roppolo <[email protected]> Co-authored-by: Jason Basuil <[email protected]>
1 parent 20bad44 commit 7d23cea

File tree

13 files changed

+1047
-288
lines changed

13 files changed

+1047
-288
lines changed

.github/workflows/gh-pages-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
on:
33
push:
44
branches:
5-
- main
5+
- feature/UIDS-272-update-checkbox-groups
66
jobs:
77
gh-pages-deploy:
88
name: Deploying to gh-pages

scss/forms/control_button_group.scss

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,9 @@
3232
padding: 0.3125rem 0.625rem;
3333
margin-right: 0.5rem;
3434
}
35-
36-
.FormControlLabel--active {
37-
background-color: $ux-blue-100;
38-
border-color: $ux-blue-200;
39-
40-
.FormControlLabel__label {
41-
color: $ux-blue-700;
42-
}
43-
}
4435
}
4536

4637
.FormControlLabel {
47-
@include font-type-30;
48-
4938
flex-wrap: wrap;
5039
margin-right: 0.5rem;
5140
display: block;

scss/forms/form_control_label.scss

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
@import '../typography';
44

55
.FormControlLabel {
6-
@include font-type-30;
7-
6+
@include font-type-30--light;
87
align-items: center;
8+
color: $ux-gray-900;
99
display: flex;
1010

1111
&--with-children {
12-
@include font-type-30--bold;
12+
@include font-type-30;
1313

1414
align-items: flex-start;
1515
flex-direction: column;
@@ -22,6 +22,11 @@
2222
flex-direction: row;
2323
}
2424

25+
&__helper-text {
26+
@include font-type-30;
27+
font-weight: 100;
28+
}
29+
2530
&__control {
2631
display: flex;
2732
margin-right: .5rem;
@@ -30,7 +35,7 @@
3035
&__children {
3136
@include font-type-30;
3237

33-
color: $ux-gray-800;
38+
font-weight: 100;
3439
margin-top: 0.5rem;
3540
width: 100%;
3641
}
@@ -40,6 +45,13 @@
4045
border-radius: $ux-border-radius;
4146
padding: 1rem;
4247
cursor: pointer;
48+
49+
50+
&.FormControlLabel--active {
51+
background-color: $ux-blue-100;
52+
border-color: $ux-blue-200;
53+
color: $ux-blue-700;
54+
}
4355
}
4456

4557
&--disabled {

scss/forms/form_group.scss

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
&__helper-text {
2222
@include font-type-30--light;
23+
font-weight: 100;
2324
color: $ux-gray-900;
2425
}
2526
}
@@ -36,9 +37,30 @@
3637
}
3738
}
3839

40+
&--inline {
41+
align-items: center;
42+
display: flex;
43+
flex-direction: row;
44+
45+
.InputLabel {
46+
margin-right: 1rem;
47+
margin-bottom: 0.5rem;
48+
}
49+
50+
.FormControlLabel {
51+
white-space: nowrap;
52+
margin-right: 1rem;
53+
}
54+
55+
.FormControlLabel--active {
56+
white-space: nowrap;
57+
}
58+
}
59+
3960
&__helper-text {
4061
@include font-type-20;
41-
color: $ux-gray-800;
62+
font-weight: 100;
63+
color: $ux-gray-900;
4264
padding: .375rem 0;
4365
margin: 0;
4466

scss/forms/input_label.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99

1010
&__helper-text {
1111
@include font-type-30;
12-
color: $ux-gray-800;
12+
font-weight: 100;
13+
color: $ux-gray-900;
1314
}
1415
}
1516

0 commit comments

Comments
 (0)