Skip to content
This repository has been archived by the owner on Aug 13, 2023. It is now read-only.

Commit

Permalink
Merge pull request #713 from bbc/dynamic-font-family
Browse files Browse the repository at this point in the history
Update styled components in all packages
  • Loading branch information
ryanmccombe authored Jul 2, 2019
2 parents c9cefd0 + be31478 commit a1df445
Show file tree
Hide file tree
Showing 63 changed files with 3,937 additions and 801 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ module.exports = {
rules: {
'react/jsx-one-expression-per-line': 'off',
'linebreak-style': process.platform === 'win32' ? 'off' : ['error', 'unix'],
"import/no-extraneous-dependencies": 'off'
"import/no-extraneous-dependencies": 'off',
},
};
19 changes: 5 additions & 14 deletions .storybook/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,8 @@ import {
AMP_SCRIPT,
AMP_NO_SCRIPT,
} from '@bbc/psammead-assets/amp-boilerplate';
import {
F_REITH_SERIF_MEDIUM,
F_REITH_SERIF_MEDIUM_ITALIC,
F_REITH_SANS_REGULAR,
F_REITH_SANS_ITALIC,
F_REITH_SANS_BOLD,
F_REITH_SANS_BOLD_ITALIC,
} from '@bbc/psammead-styles/fonts';
import * as fontFaces from '@bbc/psammead-styles/fonts';

import Helmet from 'react-helmet';

const theme = create({
Expand Down Expand Up @@ -55,12 +49,9 @@ const GlobalStyle = createGlobalStyle`
box-sizing: inherit;
}
${F_REITH_SERIF_MEDIUM}
${F_REITH_SERIF_MEDIUM_ITALIC}
${F_REITH_SANS_REGULAR}
${F_REITH_SANS_ITALIC}
${F_REITH_SANS_BOLD}
${F_REITH_SANS_BOLD_ITALIC}
${Object.values(fontFaces).join('')}
`;

addDecorator(story => (
Expand Down
95 changes: 38 additions & 57 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
},
"homepage": "https://github.com/bbc/psammead#readme",
"dependencies": {
"@bbc/psammead-styles": "^0.4.1",
"styled-components": "^4.3.1",
"@bbc/psammead-styles": "^1.0.0",
"styled-components": "^4.3.2",
"styled-normalize": "^8.0.4"
},
"devDependencies": {
Expand Down
1 change: 1 addition & 0 deletions packages/components/psammead-brand/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<!-- prettier-ignore -->
| Version | Description |
| ------- | ----------- |
| 4.1.3 | [PR#713](https://github.com/bbc/psammead/pull/713) Update `styled-components` to 4.3.2 |
| 4.1.2 | [PR#684](https://github.com/bbc/psammead/pull/684) Update brand spacing breakpoint to kick in at 25rem |
| 4.1.1 | [PR#677](https://github.com/bbc/psammead/pull/677) Use `@bbc/[email protected]` |
| 4.1.0 | [PR#647](https://github.com/bbc/psammead/pull/647) Add transparent borders with borderTop and borderBottom props |
Expand Down
Loading

0 comments on commit a1df445

Please sign in to comment.