Skip to content

Commit 99ecfae

Browse files
authored
UIDS-149 Some css updates from the project builder design review (#159)
1 parent 243a6a5 commit 99ecfae

File tree

6 files changed

+25
-11
lines changed

6 files changed

+25
-11
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-
- master
5+
- feature/UIDS-149-builder-related-followons
66
jobs:
77
gh-pages-deploy:
88
name: Deploying to gh-pages

scss/forms/control_button_group.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@
4444
}
4545

4646
.FormControlLabel {
47+
@include font-type-30;
48+
4749
flex-wrap: wrap;
4850
margin-right: 0.5rem;
4951
display: block;

scss/forms/form_control_label.scss

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

55
.FormControlLabel {
6+
@include font-type-30;
7+
68
align-items: center;
79
display: flex;
810

911
&--with-children {
12+
@include font-type-30--bold;
13+
1014
align-items: flex-start;
1115
flex-direction: column;
1216
display: flex;
1317
}
1418

1519
&__label {
16-
align-items: center;
20+
align-items: flex-start;
1721
display: flex;
1822
flex-direction: row;
1923
}
@@ -32,8 +36,6 @@
3236
}
3337

3438
&--bordered {
35-
@include font-type-30;
36-
3739
border: 1px solid $ux-gray-400;
3840
border-radius: $ux-border-radius;
3941
padding: 1rem;
@@ -53,5 +55,6 @@
5355
input[type='checkbox'], input[type='radio'] {
5456
min-height: 1rem;
5557
min-width: 1rem;
58+
margin-top: 0.125rem;
5659
}
5760
}

spec/__snapshots__/Storyshots.test.js.snap

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1437,7 +1437,7 @@ exports[`Storyshots Design System/Selects/Async Default 1`] = `
14371437
/>
14381438
<div
14391439
aria-hidden="true"
1440-
className=" css-tlfecz-indicatorContainer"
1440+
className=" css-fric97-indicatorContainer"
14411441
onMouseDown={[Function]}
14421442
onTouchEnd={[Function]}
14431443
>
@@ -1559,7 +1559,7 @@ exports[`Storyshots Design System/Selects/Async Labeled 1`] = `
15591559
/>
15601560
<div
15611561
aria-hidden="true"
1562-
className=" css-tlfecz-indicatorContainer"
1562+
className=" css-fric97-indicatorContainer"
15631563
onMouseDown={[Function]}
15641564
onTouchEnd={[Function]}
15651565
>
@@ -1629,7 +1629,7 @@ exports[`Storyshots Design System/Selects/Single Default 1`] = `
16291629
/>
16301630
<div
16311631
aria-hidden="true"
1632-
className=" css-tlfecz-indicatorContainer"
1632+
className=" css-fric97-indicatorContainer"
16331633
onMouseDown={[Function]}
16341634
onTouchEnd={[Function]}
16351635
>
@@ -1706,7 +1706,7 @@ exports[`Storyshots Design System/Selects/Single Labeled 1`] = `
17061706
/>
17071707
<div
17081708
aria-hidden="true"
1709-
className=" css-tlfecz-indicatorContainer"
1709+
className=" css-fric97-indicatorContainer"
17101710
onMouseDown={[Function]}
17111711
onTouchEnd={[Function]}
17121712
>
@@ -1776,7 +1776,7 @@ exports[`Storyshots Design System/Selects/Single Loading 1`] = `
17761776
/>
17771777
<div
17781778
aria-hidden="true"
1779-
className=" css-tlfecz-indicatorContainer"
1779+
className=" css-fric97-indicatorContainer"
17801780
onMouseDown={[Function]}
17811781
onTouchEnd={[Function]}
17821782
>
@@ -1891,7 +1891,7 @@ exports[`Storyshots Design System/Selects/Single Searchable 1`] = `
18911891
/>
18921892
<div
18931893
aria-hidden="true"
1894-
className=" css-tlfecz-indicatorContainer"
1894+
className=" css-fric97-indicatorContainer"
18951895
onMouseDown={[Function]}
18961896
onTouchEnd={[Function]}
18971897
>

src/Select/styles.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import systemColors from 'src/Styles/colors';
2+
import fontWeights from '../Styles/fontWeights';
23

34
export const SELECT_SIZES = { SMALL: 'small' };
45

@@ -23,10 +24,12 @@ const defaultStyles = ({ size }) => ({
2324
backgroundColor: isDisabled ? systemColors.inputDisabledBg : styles.backgroundColor,
2425
borderColor: systemColors.inputBorderColor,
2526
}),
27+
dropdownIndicator: (styles) => ({ ...styles, color: systemColors.uxGray600 }),
2628
indicatorSeparator: (styles) => ({ ...styles, display: 'none' }),
2729
singleValue: (styles, { data }) => ({
2830
...styles,
29-
color: (data.colors ? data.colors.text : systemColors.uxGray600) || systemColors.uxGray600,
31+
color: (data.colors ? data.colors.text : systemColors.uxGray900) || systemColors.uxGray900,
32+
fontWeight: fontWeights.light,
3033
}),
3134
option: (styles, {
3235
data,
@@ -40,6 +43,7 @@ const defaultStyles = ({ size }) => ({
4043
...styles,
4144
backgroundColor: isSelected || isFocused ? colors.hover : styles.backgroundColor,
4245
color: colors.text,
46+
fontWeight: fontWeights.light,
4347
cursor: 'pointer',
4448

4549
':active': {

src/Styles/fontWeights.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
export default {
2+
light: 300,
3+
regular: 400,
4+
bold: 700,
5+
};

0 commit comments

Comments
 (0)