Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 0 additions & 90 deletions index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -243,89 +243,6 @@ interface Typography {
mono: string
ui: string
}
headings: {
100: {
color: string
fontFamily: string
fontSize: string
fontWeight: number
letterSpacing: string
lineHeight: string
marginTop: number
textTransform: string
}
200: {
color: string
fontFamily: string
fontSize: string
fontWeight: number
lineHeight: string
marginTop: number
}
300: {
color: string
fontFamily: string
fontSize: string
fontWeight: number
letterSpacing: string
lineHeight: string
marginTop: number
}
400: {
color: string
fontFamily: string
fontSize: string
fontWeight: number
letterSpacing: string
lineHeight: string
marginTop: number
}
500: {
color: string
fontFamily: string
fontSize: string
fontWeight: number
letterSpacing: string
lineHeight: string
marginTop: number
}
600: {
color: string
fontFamily: string
fontSize: string
fontWeight: number
letterSpacing: string
lineHeight: string
marginTop: number
}
700: {
color: string
fontFamily: string
fontSize: string
fontWeight: number
letterSpacing: string
lineHeight: string
marginTop: number
}
800: {
color: string
fontFamily: string
fontSize: string
fontWeight: number
letterSpacing: string
lineHeight: string
marginTop: number
}
900: {
color: string
fontFamily: string
fontSize: string
fontWeight: number
letterSpacing: string
lineHeight: string
marginTop: number
}
}
paragraph: {
300: {
fontSize: string
Expand Down Expand Up @@ -383,13 +300,6 @@ interface Typography {
}

export interface Theme {
colors: Colors
fills: Fills
overlayBackgroundColor: string
palette: Palette
scales: ColorScales
spinnerColor: string
typography: Typography
}

export const defaultTheme: Theme
Expand Down
6 changes: 3 additions & 3 deletions src/alert/__tests__/__snapshots__/Alert.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ exports[`<Alert /> appearance snapshot 1`] = `
</svg>
</div>
<h4
className="ub-mt_0px ub-mb_0px ub-fnt-sze_14px ub-f-wght_500 ub-ln-ht_1 ub-ltr-spc_-0-05px ub-fnt-fam_b77syt ub-color_inherit ub-box-szg_border-box"
className="ub-mt_0px ub-mb_0px ub-color_inherit ub-fnt-fam_b77syt ub-f-wght_500 ub-fnt-sze_16px ub-ln-ht_1 ub-ltr-spc_-0-05px ub-box-szg_border-box"
>
Test title
</h4>
Expand Down Expand Up @@ -61,7 +61,7 @@ exports[`<Alert /> basic snapshot 1`] = `
</svg>
</div>
<h4
className="ub-mt_0px ub-mb_0px ub-fnt-sze_14px ub-f-wght_500 ub-ln-ht_1 ub-ltr-spc_-0-05px ub-fnt-fam_b77syt ub-color_inherit ub-box-szg_border-box"
className="ub-mt_0px ub-mb_0px ub-color_inherit ub-fnt-fam_b77syt ub-f-wght_500 ub-fnt-sze_16px ub-ln-ht_1 ub-ltr-spc_-0-05px ub-box-szg_border-box"
>
A simple general message
</h4>
Expand Down Expand Up @@ -96,7 +96,7 @@ exports[`<Alert /> intent snapshot 1`] = `
</svg>
</div>
<h4
className="ub-mt_0px ub-mb_0px ub-fnt-sze_14px ub-f-wght_500 ub-ln-ht_1 ub-ltr-spc_-0-05px ub-fnt-fam_b77syt ub-color_inherit ub-box-szg_border-box"
className="ub-mt_0px ub-mb_0px ub-color_inherit ub-fnt-fam_b77syt ub-f-wght_500 ub-fnt-sze_16px ub-ln-ht_1 ub-ltr-spc_-0-05px ub-box-szg_border-box"
>
Test title
</h4>
Expand Down
18 changes: 0 additions & 18 deletions src/theme/src/hooks/useHeadingStyle.js

This file was deleted.

82 changes: 82 additions & 0 deletions src/themes/classic/components/heading.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
const baseStyle = {
color: 'colors.dark',
fontFamily: 'fontFamilies.display',
fontWeight: 'fontWeights.semibold'
}

const appearances = {}

const sizes = {
900: {
fontSize: 'fontSizes.7',
lineHeight: 'lineHeights.6',
letterSpacing: 'letterSpacings.tightest',
marginTop: 52
},
800: {
fontSize: 'fontSizes.6',
lineHeight: 'lineHeights.5',
letterSpacing: 'letterSpacings.tightest',
marginTop: 40
},
700: {
fontSize: 'fontSizes.5',
lineHeight: 'lineHeights.3',
letterSpacing: 'letterSpacings.tighter',
marginTop: 40
},
600: {
fontSize: 'fontSizes.4',
lineHeight: 'lineHeights.3',
letterSpacing: 'letterSpacings.tighter',
marginTop: 28
},
500: {
fontFamily: 'fontFamilies.ui',
fontSize: 'fontSizes.3',
letterSpacing: 'letterSpacings.tight',
lineHeight: 'lineHeights.2',
marginTop: 24
},
400: {
fontSize: 'fontSizes.3',
fontWeight: 'fontWeights.bold',
lineHeight: 'lineHeights.2',
letterSpacing: 'letterSpacings.tight',
marginTop: 16,
fontFamily: 'fontFamilies.ui'
},
300: {
fontSize: 'fontSizes.1',
fontWeight: 'fontWeights.bold',
lineHeight: 'lineHeights.0',
letterSpacing: 'letterSpacings.normal',
marginTop: 16,
fontFamily: 'fontFamilies.ui'
},
200: {
fontSize: 'fontSizes.1',
fontWeight: 'fontWeights.bold',
lineHeight: 'lineHeights.0',
letterSpacing: 'letterSpacings.normal',
marginTop: 16,
fontFamily: 'fontFamilies.ui',
color: 'colors.muted'
},
100: {
fontSize: 'fontSizes.0',
fontWeight: 'fontWeights.normal',
textTransform: 'uppercase',
lineHeight: 'lineHeights.0',
letterSpacing: 'letterSpacings.wide',
marginTop: 16,
fontFamily: 'fontFamilies.ui',
color: 'colors.muted'
}
}

export default {
baseStyle,
appearances,
sizes
}
2 changes: 2 additions & 0 deletions src/themes/classic/components/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import Button from './button'
import Card from './card'
import Checkbox from './checkbox'
import Code from './code'
import Heading from './heading'
import Icon from './icon'
import InlineAlert from './inline-alert'
import Input from './input'
Expand All @@ -25,6 +26,7 @@ export default {
Card,
Checkbox,
Code,
Heading,
Icon,
InlineAlert,
Input,
Expand Down
51 changes: 0 additions & 51 deletions src/themes/classic/deprecated/component-specific/checkbox.js

This file was deleted.

1 change: 0 additions & 1 deletion src/themes/classic/deprecated/component-specific/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ export { default as getRowClassName } from './getRowClassName'
export { default as getMenuItemClassName } from './getMenuItemClassName'

export { default as segmentedControl } from './segmentedControl'
export { default as checkbox } from './checkbox'
Loading