Skip to content

Commit 57499e5

Browse files
authored
fix(icon-button): add border color (#782)
1 parent 944740c commit 57499e5

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

src/components/buttons/icon-button/icon-button.js

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ export const IconButton = props => {
4848
onMouseOut={props.handleMouseOut}
4949
css={[
5050
css`
51+
border: 1px solid ${vars.colorSurface};
5152
display: inline-block;
5253
background-color: ${vars.colorSurface};
5354
box-shadow: ${vars.shadow7};

src/components/buttons/icon-button/icon-button.styles.js

+16-3
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@ import { css } from '@emotion/core';
33
import vars from '../../../../materials/custom-properties';
44

55
const buttonSizes = {
6-
small: '16px',
7-
medium: '24px',
8-
big: '32px',
6+
small: '14px',
7+
medium: '22px',
8+
big: '30px',
99
};
1010

1111
const getStateStyles = (isDisabled, isActive, theme) => {
1212
if (isDisabled) {
1313
const disabledStyle = css`
1414
background-color: ${vars.colorAccent98};
15+
border-color: ${vars.colorNeutral};
1516
color: ${vars.colorNeutral60};
1617
box-shadow: none;
1718
`;
@@ -21,6 +22,7 @@ const getStateStyles = (isDisabled, isActive, theme) => {
2122
disabledStyle,
2223
css`
2324
&:hover {
25+
border-color: ${vars.colorInfo85};
2426
background-color: ${vars.colorInfo85};
2527
}
2628
`,
@@ -30,6 +32,7 @@ const getStateStyles = (isDisabled, isActive, theme) => {
3032
disabledStyle,
3133
css`
3234
&:hover {
35+
border-color: ${vars.colorPrimary85};
3336
background-color: ${vars.colorPrimary85};
3437
}
3538
`,
@@ -42,9 +45,11 @@ const getStateStyles = (isDisabled, isActive, theme) => {
4245
const activeStyle = css`
4346
box-shadow: ${vars.shadow9};
4447
background-color: ${vars.colorSurface};
48+
border-color: ${vars.colorSurface};
4549
&:hover {
4650
box-shadow: ${vars.shadow9};
4751
background-color: ${vars.colorNeutral95};
52+
border-color: ${vars.colorNeutral95};
4853
}
4954
`;
5055
switch (theme) {
@@ -58,15 +63,18 @@ const getStateStyles = (isDisabled, isActive, theme) => {
5863
isDisabled
5964
? `
6065
background-color: ${vars.colorInfo85};
66+
border-color: ${vars.colorInfo85};
6167
color: ${vars.colorSurface};
6268
box-shadow: ${vars.shadow9};
6369
`
6470
: ''
6571
}
6672
background-color: ${vars.colorInfo};
73+
border-color: ${vars.colorInfo};
6774
color: ${vars.colorSurface};
6875
&:hover {
6976
background-color: ${vars.colorInfo85};
77+
border-color: ${vars.colorInfo85};
7078
}
7179
`,
7280
];
@@ -80,6 +88,7 @@ const getStateStyles = (isDisabled, isActive, theme) => {
8088
isDisabled
8189
? `
8290
background-color: ${vars.colorPrimary85};
91+
border-color: ${vars.colorPrimary85};
8392
color: ${vars.colorSurface};
8493
box-shadow: ${vars.shadow9};
8594
`
@@ -89,6 +98,7 @@ const getStateStyles = (isDisabled, isActive, theme) => {
8998
color: ${vars.colorSurface};
9099
&:hover {
91100
background-color: ${vars.colorPrimary85};
101+
border-color: ${vars.colorPrimary85};
92102
}
93103
`,
94104
];
@@ -103,6 +113,7 @@ const getStateStyles = (isDisabled, isActive, theme) => {
103113
&:active {
104114
box-shadow: ${vars.shadow9};
105115
background-color: ${vars.colorSurface};
116+
border-color: ${vars.colorSurface};
106117
}
107118
`;
108119
};
@@ -165,13 +176,15 @@ const getThemeStyles = theme => {
165176
return css`
166177
&:active {
167178
background-color: ${vars.colorPrimary};
179+
border-color: ${vars.colorPrimary};
168180
color: ${vars.colorSurface};
169181
}
170182
`;
171183
case 'blue':
172184
return css`
173185
&:hover {
174186
background-color: ${vars.colorInfo};
187+
border-color: ${vars.colorInfo};
175188
color: ${vars.colorSurface};
176189
}
177190
`;

0 commit comments

Comments
 (0)