From 14829947e084dd8cd80135d6bd51442bc27fbfd1 Mon Sep 17 00:00:00 2001 From: Thomas Broadley Date: Fri, 22 Dec 2017 21:22:44 -0500 Subject: [PATCH] docs: fix typos --- CHANGELOG.md | 6 +++--- CONTRIBUTING.md | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 624ad161..a43ecbcf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,7 +52,7 @@ All notable changes to this project will be documented in this file. If a contri - Refactor out theme logic in StyledComponent's componentWillMount & componentWillReceiveProps (see [#1130](https://github.com/styled-components/styled-components/issues/1130)) - Add onReset to valid react props list (see [#1234](https://github.com/styled-components/styled-components/pull/1234)) - Add support for ServerStyleSheet PropType in both StyleSheetManager and StyledComponent (see [#1245](https://github.com/styled-components/styled-components/pull/1245)) -- Prevent component styles from being static if `attrs` are dynmaic (see [#1219](https://github.com/styled-components/styled-components/pull/1219)) +- Prevent component styles from being static if `attrs` are dynamic (see [#1219](https://github.com/styled-components/styled-components/pull/1219)) - Changed 'too many classes' error to recommend attrs for frequently changed styles (see [#1213](https://github.com/styled-components/styled-components/pull/1213)) ## [v2.2.1] - 2017-10-04 @@ -135,7 +135,7 @@ All notable changes to this project will be documented in this file. If a contri - Migrated from the deprecated `React.PropTypes` to the `prop-types` package, thanks to [@YasserKaddour](https://github.com/YasserKaddour). (see [#668](https://github.com/styled-components/styled-components/pull/668)) - Add FlatList, SectionList & VirtualizedList support, thanks to @Kureev(https://github.com/Kureev). (see [#662](https://github.com/styled-components/styled-components/pull/662)) -- Removed dependency on `glamor` and migrated remaining references to the internval vendored `glamor` module. (see [#663](https://github.com/styled-components/styled-components/pull/663)) +- Removed dependency on `glamor` and migrated remaining references to the internal vendored `glamor` module. (see [#663](https://github.com/styled-components/styled-components/pull/663)) - Fix missing autoprefixing on GlobalStyle model. (see [#702](https://github.com/styled-components/styled-components/pull/702)) - Better support for `keyframes` on older iOS/webkit browsers (see [#720](https://github.com/styled-components/styled-components/pull/720)) @@ -193,7 +193,7 @@ All notable changes to this project will be documented in this file. If a contri - Fix regression from previous release and only delete `innerRef` if it is being passed down to native elements, thanks to [@IljaDaderko](https://github.com/IljaDaderko). (see [#368](https://github.com/styled-components/styled-components/pull/368)) - Fixed defaultProps theme overriding ThemeProvider theme, thanks to [@diegohaz](https://github.com/diegohaz). (see [#345](https://github.com/styled-components/styled-components/pull/345)) -- Removed custom flowtype supressor in favour of default `$FlowFixMe` [@relekang](https://github.com/relekang). (see [#335](https://github.com/styled-components/styled-components/pull/335)) +- Removed custom flowtype suppressor in favour of default `$FlowFixMe` [@relekang](https://github.com/relekang). (see [#335](https://github.com/styled-components/styled-components/pull/335)) - Updated all dependencies to latest semver, thanks to [@amilajack](https://github.com/amilajack). (see [#324](https://github.com/styled-components/styled-components/pull/324)) - Updated all demos to link to latest version, thanks to [@relekang](https://github.com/relekang). (see [#350](https://github.com/styled-components/styled-components/pull/350)) - Converted to DangerJS, thanks to [@orta](https://github.com/orta). (see [#169](https://github.com/styled-components/styled-components/pull/169)) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0fd0761d..b8cfc64e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -96,7 +96,7 @@ Now you should have the sandbox running on `localhost:3000`. The Sandbox support You can use an interactive editor, powered by [`react-live`](https://react-live.philpl.com/), to test your changes. But if you want more control, you can edit the sandbox itself too: -* Root `` componens is located at `styled-components/sandbox/src/App.js` file +* Root `` components is located at `styled-components/sandbox/src/App.js` file * Client-side entry point is at `styled-components/sandbox/src/browser.js` @@ -112,7 +112,7 @@ When you commit our pre-commit hook will run, which executes `lint-staged`. It w 1. Install `np` by Sindre Sorhus with `npm i -g np`. (note: you only have to do this once) `np` makes sure that everything is correct and runs tests and a build before it releases the new version for you. 2. Make sure you have the latest changes and are on the master branch: `git checkout master && git pull origin master` -3. Create a new branch based on the the version number, for example `git checkout -b 3.4.1` +3. Create a new branch based on the version number, for example `git checkout -b 3.4.1` 4. Update the [CHANGELOG.md](./CHANGELOG.md) with the new version number, add a new Unreleased section at the top and edit the links at the bottom so everything is linked correctly 5. Commit the Changelog changes with `git commit -m 'Update CHANGELOG'` 6. Push the branch to the repo with `git push -u origin `