From 2af123ecabab0839f2c5918cd73fe307c6b0759b Mon Sep 17 00:00:00 2001 From: Brent Jackson Date: Sat, 9 Mar 2019 16:38:31 -0500 Subject: [PATCH] Test out themes --- docs/index.mdx | 2 +- packages/components/src/MDXDeck.js | 3 --- packages/components/src/Provider.js | 3 ++- packages/components/src/Root.js | 1 + packages/themes/src/index.js | 1 + packages/themes/src/poppins.js | 14 ++++++++++++++ 6 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 packages/themes/src/poppins.js diff --git a/docs/index.mdx b/docs/index.mdx index c4c68b8..1a7937c 100644 --- a/docs/index.mdx +++ b/docs/index.mdx @@ -1,4 +1,4 @@ -export { big as theme } from '@mdx-deck/themes' +export { future as theme } from '@mdx-deck/themes' import { Head, Image, Notes, Appear } from '@mdx-deck/components' import { Invert, Split, SplitRight, FullScreenCode, Horizontal} from '@mdx-deck/layouts' import Counter from './Counter' diff --git a/packages/components/src/MDXDeck.js b/packages/components/src/MDXDeck.js index 9eed485..1cf4e3f 100644 --- a/packages/components/src/MDXDeck.js +++ b/packages/components/src/MDXDeck.js @@ -10,7 +10,6 @@ import Overview from './Overview' import Print from './Print' import GoogleFonts from './GoogleFonts' import Catch from './Catch' -import { default as defaultTheme } from '@mdx-deck/themes' const NORMAL = 'normal' const PRESENTER = 'presenter' @@ -249,13 +248,11 @@ export class MDXDeck extends React.Component { MDXDeck.propTypes = { slides: PropTypes.array.isRequired, - theme: PropTypes.object.isRequired, headTags: PropTypes.array.isRequired, } MDXDeck.defaultProps = { slides: [], - theme: defaultTheme, headTags: [], } diff --git a/packages/components/src/Provider.js b/packages/components/src/Provider.js index 506a061..1bd9e93 100644 --- a/packages/components/src/Provider.js +++ b/packages/components/src/Provider.js @@ -5,6 +5,7 @@ import { ThemeProvider } from 'emotion-theming' import merge from 'lodash.merge' import { HeadProvider } from './Head' import { MDXProvider } from '@mdx-js/tag' +import defaultTheme from '@mdx-deck/themes' import mdxComponents from './mdx-components' const DefaultProvider = props => <>{props.children} @@ -18,7 +19,7 @@ const mergeThemes = themes => export const Provider = props => { const { headTags, theme: baseTheme, themes = [] } = props - const theme = mergeThemes([baseTheme, ...themes]) + const theme = mergeThemes([defaultTheme, baseTheme, ...themes]) const { Provider: UserProvider = DefaultProvider, components: themeComponents = {}, diff --git a/packages/components/src/Root.js b/packages/components/src/Root.js index ef95343..5c18668 100644 --- a/packages/components/src/Root.js +++ b/packages/components/src/Root.js @@ -22,6 +22,7 @@ const themedCode = props => ({ '& code, & pre': { fontFamily: props.theme.monospace, color: props.theme.colors.code, + background: props.theme.colors.codeBackground, }, }) diff --git a/packages/themes/src/index.js b/packages/themes/src/index.js index 86b6d21..73ce736 100644 --- a/packages/themes/src/index.js +++ b/packages/themes/src/index.js @@ -4,6 +4,7 @@ export { default as future } from './future' export { default as condensed } from './condensed' export { default as yellow } from './yellow' export { default as swiss } from './swiss' +export { default as poppins } from './poppins' // serif export { default as book } from './book' diff --git a/packages/themes/src/poppins.js b/packages/themes/src/poppins.js new file mode 100644 index 0000000..9b61544 --- /dev/null +++ b/packages/themes/src/poppins.js @@ -0,0 +1,14 @@ +export default { + font: '"Poppins", sans-serif', + googleFont: 'https://fonts.googleapis.com/css?family=Poppins:400,900', + heading: { + fontWeight: 900, + letterSpacing: '-0.05em', + }, + blockquote: { + fontSize: '1.75em', + textAlign: 'left', + fontWeight: 900, + letterSpacing: '-0.05em', + }, +}