Skip to content

Commit d3ec3d2

Browse files
committed
feat(themes): add themes
BREAKING CHANGE: WindowHeader related theme variables changed
1 parent 10b67b9 commit d3ec3d2

File tree

6 files changed

+653
-27
lines changed

6 files changed

+653
-27
lines changed

src/components/Checkbox/Checkbox.stories.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,13 @@ storiesOf('Checkbox', module)
3333
defaultChecked
3434
/>
3535
<br />
36-
<Checkbox name='pineapple' value='pineapple' label='Add pineapple 🍍' />
36+
<Checkbox
37+
name='pineapple'
38+
value='pineapple'
39+
label='Add pineapple 🍍'
40+
defaultChecked
41+
disabled
42+
/>
3743
</>
3844
))
3945
)

src/components/SwitchBase/SwitchBase.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import styled from 'styled-components';
1+
import styled, { css } from 'styled-components';
22
import { createDisabledTextStyles, focusOutline } from '../common';
33

44
import { padding, fontSizes } from '../common/system';
@@ -27,12 +27,20 @@ export const StyledLabel = styled.label`
2727
-ms-user-select: none;
2828
user-select: none;
2929
font-size: ${fontSizes.md};
30+
color: ${({ theme }) => theme.text};
3031
${props => props.isDisabled && createDisabledTextStyles()}
3132
3233
${StyledListItem} & {
3334
margin: 0;
3435
height: 100%;
3536
}
37+
${StyledListItem}:hover & {
38+
${({ theme, isDisabled }) =>
39+
!isDisabled &&
40+
css`
41+
color: ${theme.textInvert};
42+
`};
43+
}
3644
`;
3745

3846
// TODO how to handle focus styles in 'menu' variant of Checkbox/Radio?

src/components/TextField/TextField.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export const StyledTextInput = styled.input`
2626
background: none;
2727
font-size: ${fontSizes.md};
2828
font-family: ${fontFamily};
29+
color: ${({ theme }) => theme.inputText};
2930
${({ disabled, variant }) =>
3031
variant !== 'flat' && disabled && createDisabledTextStyles()}
3132
`;

src/components/WindowHeader/WindowHeader.js

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,12 @@ const SlyledWindowHeader = styled.div`
1212
font-weight: bold;
1313
1414
&[data-active='false'] {
15-
background: ${({ theme }) => theme.headerNotActive};
16-
color: ${({ theme }) => theme.material};
15+
background: ${({ theme }) => theme.headerNotActiveBackground};
16+
color: ${({ theme }) => theme.headerNotActiveText};
1717
}
1818
&[data-active='true'] {
19-
background: linear-gradient(
20-
to right,
21-
${({ theme }) => theme.headerMaterialDark},
22-
${({ theme }) => theme.headerMaterialLight}
23-
);
24-
color: ${({ theme }) => theme.textInvert};
19+
background: ${({ theme }) => theme.headerBackground};
20+
color: ${({ theme }) => theme.headerText};
2521
}
2622
${StyledButton} {
2723
padding-left: 0;

src/components/common/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ export const shadow = '4px 4px 10px 0 rgba(0, 0, 0, 0.35)';
44
export const insetShadow = 'inset 3px 3px 10px rgba(0, 0, 0, 0.2)';
55

66
export const createDisabledTextStyles = () => css`
7+
-webkit-text-fill-color: ${({ theme }) => theme.textDisabled};
78
color: ${({ theme }) => theme.textDisabled};
89
text-shadow: 1px 1px ${({ theme }) => theme.textDisabledShadow};
910
/* filter: grayscale(100%); */
10-
-webkit-text-fill-color: ${({ theme }) => theme.inputTextDisabled};
1111
`;
1212
export const createBoxStyles = () => css`
1313
box-sizing: border-box;
1414
display: inline-block;
15-
background-color: ${({ theme }) => theme.material};
15+
background: ${({ theme }) => theme.material};
1616
color: ${({ theme }) => theme.text};
1717
`;
1818
// TODO for flat box styles add checkered background when disabled (not solid color)

0 commit comments

Comments
 (0)