Skip to content

Commit

Permalink
chore: change some font size
Browse files Browse the repository at this point in the history
BREAKING CHANGE: remove size of tasting and trenta
  • Loading branch information
im36-123 committed Aug 6, 2019
1 parent 71007c5 commit 5596d9f
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/components/Balloon/Balloon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const Base = styled.div`
return css`
position: relative;
display: inline-block;
font-size: ${size.pxToRem(size.font.tasting)};
font-size: ${size.pxToRem(size.font.short)};
border-radius: 4px;
box-shadow: 0 2px 8px 0 rgba(51, 51, 51, 0.35);
white-space: nowrap;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Field/Field.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ const Help = styled.p`
${({ theme }: InjectedProps) => css`
margin: 0;
color: ${theme.palette.TextGrey};
font-size: ${theme.size.pxToRem(theme.size.font.tasting)};
font-size: ${theme.size.pxToRem(theme.size.font.short)};
`}
`
const Error = styled.p`
Expand Down
2 changes: 1 addition & 1 deletion src/components/Tag/Tag.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const Wrapper = styled.span`
padding: 0 ${size.pxToRem(theme.size.space.xxs)};
display: inline-block;
white-space: nowrap;
font-size: ${size.font.tasting}px;
font-size: ${size.font.short}px;
border: ${frame.border.default};
background-color: transparent;
color: ${Border};
Expand Down
12 changes: 3 additions & 9 deletions src/themes/createSize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@ export interface SizeProperty {
}
// respect for Starbucks...
font?: {
tasting?: number
short?: number
tall?: number
grande?: number
venti?: number
trenta?: number
}
mediaQuery?: {
sp?: number
Expand All @@ -42,12 +40,10 @@ export interface CreatedSizeTheme {
xxl: number
}
font: {
tasting: number
short: number
tall: number
grande: number
venti: number
trenta: number
}
mediaQuery: {
sp: number
Expand All @@ -57,12 +53,10 @@ export interface CreatedSizeTheme {

const defaultSize = {
font: {
tasting: 12,
short: 13,
short: 11,
tall: 14,
grande: 16,
venti: 20,
trenta: 22,
grande: 18,
venti: 24,
},
mediaQuery: {
sp: 599,
Expand Down

0 comments on commit 5596d9f

Please sign in to comment.