Skip to content
This repository was archived by the owner on Mar 4, 2020. It is now read-only.

feat(Divider): Redlining divider component for Teams dark & contrast themes #338

Merged
merged 9 commits into from
Oct 9, 2018
1 change: 1 addition & 0 deletions src/themes/teams-dark/componentVariables.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export { default as Button } from './components/Button/buttonVariables'
export { default as Divider } from './components/Divider/dividerVariables'
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export default (siteVars: any) => {
return {
primaryColor: siteVars.brand06,
textColor: siteVars.gray02,
}
}
6 changes: 3 additions & 3 deletions src/themes/teams-dark/siteVariables.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ import { white } from '../teams/siteVariables'
// COLORS
//
export const black = '#201f1f'
export const gray02 = '#bfbfbf'
export const gray02 = '#c8c6c4'
export const gray03 = '#a6a6a6'
export const gray04 = '#808080'
export const gray06 = '#4d4d4d'
export const gray08 = '#262626'
export const gray09 = '#292827'
export const gray09 = '#3b3a39'
export const gray10 = '#2d2c2c'
export const gray14 = '#292828'

export const brand = '#6264A7'
export const brand02 = '#e2e2f6'
export const brand04 = '#bdbde6'
export const brand06 = '#a6a7dc'
export const brand08 = '#8b8cc7'
export const brand08 = '#393942'
export const brand12 = brand
export const brand14 = '#464775'
export const brand16 = '#33344a'
Expand Down
1 change: 1 addition & 0 deletions src/themes/teams-high-contrast/componentVariables.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default as Divider } from './components/Divider/dividerVariables'
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export default (siteVars: any) => {
return {
dividerColor: siteVars.white,
textColor: siteVars.white,
primaryColor: siteVars.white,
}
}
3 changes: 2 additions & 1 deletion src/themes/teams-high-contrast/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import mergeThemes from '../../lib/mergeThemes'
import * as siteVariables from './siteVariables'
import * as componentVariables from './componentVariables'
import teams from '../teams'

export default mergeThemes(teams, { siteVariables })
export default mergeThemes(teams, { siteVariables, componentVariables })
10 changes: 2 additions & 8 deletions src/themes/teams/components/Divider/dividerStyles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ const beforeAndAfter = (size, type, variables): ICSSPseudoElementStyle => ({
...(type === 'primary' && {
...dividerBorderStyle(size, variables.primaryColor),
}),
...(type === 'secondary' && {
...dividerBorderStyle(size, variables.secondaryColor),
}),
})

const dividerStyles: IComponentPartStylesInput<IDividerPropsWithDefaults, any> = {
Expand All @@ -30,14 +27,11 @@ const dividerStyles: IComponentPartStylesInput<IDividerPropsWithDefaults, any> =
color: variables.textColor,
display: 'flex',
alignItems: 'center',
paddingTop: pxToRem(variables.dividerPadding),
paddingBottom: pxToRem(variables.dividerPadding),
paddingTop: variables.dividerPadding,
paddingBottom: variables.dividerPadding,
...(type === 'primary' && {
color: variables.primaryColor,
}),
...(type === 'secondary' && {
color: variables.secondaryColor,
}),
...(important && {
fontWeight: variables.importantFontWeight,
}),
Expand Down
5 changes: 3 additions & 2 deletions src/themes/teams/components/Divider/dividerVariables.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { pxToRem } from '../../../../lib'

export default (siteVars: any) => {
return {
dividerColor: siteVars.gray09,
textColor: siteVars.gray03,
textFontSize: siteVars.fontSizeSmall,
textLineHeight: siteVars.lineHeightSmall,
primaryColor: siteVars.brand,
secondaryColor: siteVars.gray04,
importantFontWeight: siteVars.fontWeightBold,
dividerPadding: 4,
dividerPadding: pxToRem(4),
}
}