Skip to content

Commit

Permalink
feat(Table): change border color
Browse files Browse the repository at this point in the history
  • Loading branch information
ej9x committed Sep 6, 2019
1 parent 05ca460 commit ceab9f3
Show file tree
Hide file tree
Showing 15 changed files with 13 additions and 12 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/components/Table/TableAction.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ const [TableActionTag, themeAction] = createThemeTag(name, ({ COLORS }: *) => ({
},
modifiers: {
bordered: {
borderLeft: `1px solid ${COLORS.PRIMARY_BORDER_COLOR}`,
borderRight: `1px solid ${COLORS.PRIMARY_BORDER_COLOR}`,
borderLeft: `1px solid ${COLORS.TABLE_BORDER_COLOR}`,
borderRight: `1px solid ${COLORS.TABLE_BORDER_COLOR}`,
},
},
defaults: {
Expand Down
4 changes: 2 additions & 2 deletions src/components/Table/TableBody.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ const [TableBodyTag, themeBody] = createThemeTag(name, ({ COLORS }: *): * => ({
justifyContent: 'space-between',
overflow: 'auto',

borderBottom: action ? `1px solid ${COLORS.PRIMARY_BORDER_COLOR}` : 'none',
borderBottom: action ? `1px solid ${COLORS.TABLE_BORDER_COLOR}` : 'none',
}),

modifiers: {
bordered: {
'&:first-child': {
borderTop: `1px solid ${COLORS.PRIMARY_BORDER_COLOR}`,
borderTop: `1px solid ${COLORS.TABLE_BORDER_COLOR}`,
},
},
},
Expand Down
4 changes: 2 additions & 2 deletions src/components/Table/TableBodyCell.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ const [TableBodyCellTag, theme] = createThemeTag(name, ({ COLORS }: *) => ({
}),
modifiers: {
bordered: {
borderLeft: `1px solid ${COLORS.PRIMARY_BORDER_COLOR}`,
borderLeft: `1px solid ${COLORS.TABLE_BORDER_COLOR}`,

'&:last-child': {
borderRight: `1px solid ${COLORS.PRIMARY_BORDER_COLOR}`,
borderRight: `1px solid ${COLORS.TABLE_BORDER_COLOR}`,
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/Table/TableBodyRow.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const [TableBodyRowTag, theme] = createThemeTag(name, ({ COLORS }: *) => ({
root: props => ({
display: 'grid',
minHeight: '48px',
borderBottom: `1px solid ${COLORS.PRIMARY_BORDER_COLOR}`,
borderBottom: `1px solid ${COLORS.TABLE_BORDER_COLOR}`,
columnGap: gapSizes[props.columnGap],
}),
modifiers: {
Expand Down
4 changes: 2 additions & 2 deletions src/components/Table/TableHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const [TableHeaderTag, theme] = createThemeTag(name, ({ COLORS }: *) => ({
display: 'grid',
height: '48px',
backgroundColor: COLORS.LIGHT_GRAY5,
borderBottom: `1px solid ${COLORS.PRIMARY_BORDER_COLOR}`,
borderBottom: `1px solid ${COLORS.TABLE_BORDER_COLOR}`,
color: COLORS.GRAY4,
columnGap: gapSizes[props.columnGap],
}),
Expand All @@ -31,7 +31,7 @@ const [TableHeaderTag, theme] = createThemeTag(name, ({ COLORS }: *) => ({

bordered: {
'&:first-child': {
borderTop: `1px solid ${COLORS.PRIMARY_BORDER_COLOR}`,
borderTop: `1px solid ${COLORS.TABLE_BORDER_COLOR}`,
},
},
},
Expand Down
4 changes: 2 additions & 2 deletions src/components/Table/TableHeaderCell.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ const [TableHeaderCellTag, theme] = createThemeTag(name, ({ SIZES, COLORS }: *)

modifiers: {
bordered: {
borderLeft: `1px solid ${COLORS.PRIMARY_BORDER_COLOR}`,
borderLeft: `1px solid ${COLORS.TABLE_BORDER_COLOR}`,

'&:last-child': {
borderRight: `1px solid ${COLORS.PRIMARY_BORDER_COLOR}`,
borderRight: `1px solid ${COLORS.TABLE_BORDER_COLOR}`,
},
},
},
Expand Down
3 changes: 2 additions & 1 deletion src/theme/colors.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const DEFINE_PALETTE = {
GRAY5: '#A5AFB6',

LIGHT_GRAY1: '#d0d7dd',
LIGHT_GRAY2: '#DCE1E6',
LIGHT_GRAY2: '#E9EFF4',
LIGHT_GRAY3: '#E5E9EC',
LIGHT_GRAY4: '#EDF0F2',
LIGHT_GRAY5: '#f4f7f9',
Expand Down Expand Up @@ -61,6 +61,7 @@ const COLORS = {
...PALETTE,

PRIMARY_BORDER_COLOR: PALETTE.LIGHT_GRAY1,
TABLE_BORDER_COLOR: PALETTE.LIGHT_GRAY2,
PRIMARY_HOVER_GRAY_COLOR: DSM.GREY_COLORS.DSM_LIGHT_GREY_3,
DISABLED_COLOR: PALETTE.LIGHT_GRAY1,
PLACEHOLDER_COLOR: PALETTE.LIGHT_GRAY1,
Expand Down

0 comments on commit ceab9f3

Please sign in to comment.