From c7f624e54afa50622b4b45313ede89f9571f65b2 Mon Sep 17 00:00:00 2001 From: domyen Date: Fri, 8 Feb 2019 17:10:56 -0500 Subject: [PATCH] Remove unneccessary font declarations --- addons/info/src/components/Story.js | 2 -- addons/info/src/components/markdown/htags.js | 7 ------- addons/info/src/components/markdown/text.js | 4 ---- addons/jest/src/components/Result.js | 3 +-- 4 files changed, 1 insertion(+), 15 deletions(-) diff --git a/addons/info/src/components/Story.js b/addons/info/src/components/Story.js index a58836bf76e3..33da53ddad66 100644 --- a/addons/info/src/components/Story.js +++ b/addons/info/src/components/Story.js @@ -5,7 +5,6 @@ import { isForwardRef } from 'react-is'; import { polyfill } from 'react-lifecycles-compat'; import PropTypes from 'prop-types'; import global from 'global'; -import { baseFonts } from '@storybook/theming/dist/base'; import marksy from 'marksy'; import Node from './Node'; @@ -51,7 +50,6 @@ const stylesheetBase = { zIndex: 0, }, infoBody: { - ...baseFonts, fontWeight: 300, lineHeight: 1.45, fontSize: '15px', diff --git a/addons/info/src/components/markdown/htags.js b/addons/info/src/components/markdown/htags.js index b80e2e718575..57da398d6422 100644 --- a/addons/info/src/components/markdown/htags.js +++ b/addons/info/src/components/markdown/htags.js @@ -1,6 +1,5 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { baseFonts } from '@storybook/theming/dist/base'; const defaultProps = { children: null, @@ -13,7 +12,6 @@ const propTypes = { export function H1({ id, children }) { const styles = { - ...baseFonts, borderBottom: '1px solid #eee', fontWeight: 600, margin: 0, @@ -32,7 +30,6 @@ H1.propTypes = propTypes; export function H2({ id, children }) { const styles = { - ...baseFonts, fontWeight: 600, margin: 0, padding: 0, @@ -50,7 +47,6 @@ H2.propTypes = propTypes; export function H3({ id, children }) { const styles = { - ...baseFonts, fontWeight: 600, margin: 0, padding: 0, @@ -69,7 +65,6 @@ H3.propTypes = propTypes; export function H4({ id, children }) { const styles = { - ...baseFonts, fontWeight: 600, margin: 0, padding: 0, @@ -87,7 +82,6 @@ H4.propTypes = propTypes; export function H5({ id, children }) { const styles = { - ...baseFonts, fontWeight: 600, margin: 0, padding: 0, @@ -105,7 +99,6 @@ H5.propTypes = propTypes; export function H6({ id, children }) { const styles = { - ...baseFonts, fontWeight: 400, margin: 0, padding: 0, diff --git a/addons/info/src/components/markdown/text.js b/addons/info/src/components/markdown/text.js index 836572873a64..f7928328bd5f 100644 --- a/addons/info/src/components/markdown/text.js +++ b/addons/info/src/components/markdown/text.js @@ -1,13 +1,11 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { baseFonts } from '@storybook/theming/dist/base'; const defaultProps = { children: null }; const propTypes = { children: PropTypes.node }; export function P({ children }) { const style = { - ...baseFonts, fontSize: '15px', }; @@ -23,7 +21,6 @@ P.propTypes = propTypes; export function LI({ children }) { const style = { - ...baseFonts, fontSize: '15px', }; return
  • {children}
  • ; @@ -34,7 +31,6 @@ LI.propTypes = propTypes; export function UL({ children }) { const style = { - ...baseFonts, fontSize: '15px', }; return ; diff --git a/addons/jest/src/components/Result.js b/addons/jest/src/components/Result.js index 5359e8c82861..13de8804ec7d 100644 --- a/addons/jest/src/components/Result.js +++ b/addons/jest/src/components/Result.js @@ -1,14 +1,13 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { styled, monoFonts } from '@storybook/theming'; +import { styled } from '@storybook/theming'; import Indicator from './Indicator'; import colors from '../colors'; const Pre = styled.pre({ margin: 0, - ...monoFonts, }); const FlexContainer = styled.div({