Skip to content
This repository was archived by the owner on Mar 4, 2020. It is now read-only.

fix(docs): font size issue #221

Merged
levithomason merged 8 commits into from
Sep 14, 2018
Merged

fix(docs): font size issue #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2c886a3
fix font size issue
kuzhelov-ms Sep 13, 2018
5d6550a
Merge branch 'master' into fix/docs-radio-font-size
kuzhelov Sep 13, 2018
559af7c
changelog
kuzhelov-ms Sep 13, 2018
1679dc5
Merge branch 'fix/docs-radio-font-size' of https://github.com/stardus…
kuzhelov-ms Sep 13, 2018
9ba28a5
fix changelog
kuzhelov-ms Sep 13, 2018
5ffc66b
Merge branch 'master' into fix/docs-radio-font-size
kuzhelov Sep 13, 2018
7a1da6b
merge master
levithomason Sep 14, 2018
73b9a33
cleanup
levithomason Sep 14, 2018
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

## [Unreleased]

### Fix
### Fixes
- Fix Provider incorrectly rendering font face rules @levithomason ([#227](https://github.com/stardust-ui/react/pull/227))

### Features
Expand Down
4 changes: 2 additions & 2 deletions docs/src/components/ComponentDoc/ComponentExample/ComponentExample.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
scrollToAnchor,
} from 'docs/src/utils'
import evalTypeScript from 'docs/src/utils/evalTypeScript'
import { callable, doesNodeContainClick, mergeThemes, pxToRem } from 'src/lib'
import { callable, doesNodeContainClick, pxToRem } from 'src/lib'
import Editor, { EDITOR_BACKGROUND_COLOR, EDITOR_GUTTER_COLOR } from 'docs/src/components/Editor'
import ComponentControls from '../ComponentControls'
import ComponentExampleTitle from './ComponentExampleTitle'
Expand Down Expand Up @@ -354,7 +354,7 @@ class ComponentExample extends React.PureComponent<IComponentExampleProps, IComp
}

return (
<Provider theme={mergeThemes(themes.teams, newTheme)}>
<Provider theme={newTheme}>
<ExampleComponent knobs={this.getKnobsValue()} />
</Provider>
)
Expand Down