GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-04 19:01:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

REMOVE duplicated theme.js

Browse Source
This commit is contained in:
Norbert de Langen 2017-08-16 15:43:02 +02:00
parent df5dbcae83
commit 36b3671871
6 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/info/package.json
View File

@ -15,6 +15,7 @@
},
"dependencies": {
"@storybook/addons": "^3.2.0",
"@storybook/components": "^3.2.0",
"babel-runtime": "^6.23.0",
"global": "^4.3.2",
"marksy": "^2.0.0",

2
addons/info/src/components/Story.js
View File

@ -3,12 +3,12 @@
import React from 'react';
import PropTypes from 'prop-types';
import global from 'global';
import { baseFonts } from '@storybook/components';
import marksy from 'marksy';
import PropTable from './PropTable';
import Node from './Node';
import { baseFonts } from './theme';
import { Pre } from './markdown';
global.STORYBOOK_REACT_CLASSES = global.STORYBOOK_REACT_CLASSES || [];

2
addons/info/src/components/markdown/htags.js
View File

@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { baseFonts } from '../theme';
import { baseFonts } from '@storybook/components';
const defaultProps = {
children: null,

2
addons/info/src/components/markdown/text.js
View File

@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { baseFonts } from '../theme';
import { baseFonts } from '@storybook/components';
const defaultProps = { children: null };
const propTypes = { children: PropTypes.node };

8
addons/info/src/components/theme.js
View File

@ -1,8 +0,0 @@
export const baseFonts = {
fontFamily: `
-apple-system, ".SFNSText-Regular", "San Francisco", "Roboto",
"Segoe UI", "Helvetica Neue", "Lucida Grande", sans-serif
`,
color: '#444',
WebkitFontSmoothing: 'antialiased',
};

7
lib/components/src/theme.js Executable file → Normal file
View File

@ -1,7 +1,6 @@
export const baseFonts = {
fontFamily: `
-apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu",
"Cantarell", "Fira Sans", "Droid Sans", "Arial", sans-serif
`,
fontFamily:
'-apple-system, ".SFNSText-Regular", "San Francisco", BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Lucida Grande", "Arial", sans-serif',
color: '#444',
WebkitFontSmoothing: 'antialiased',
};