From 29ad4708c5c5493b6c08ae782ea1e73c06a32f7b Mon Sep 17 00:00:00 2001 From: Alex Lobera Date: Tue, 16 Oct 2018 19:08:40 +0100 Subject: [PATCH 1/2] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a4b9cb54..f6699353 100644 --- a/README.md +++ b/README.md @@ -25,9 +25,9 @@ styled-components is a npm package which we need to add to our project ### Part 2, sharing variables -You can share variables(like colours) between CSS and JavaScript by using :export from CSS Modules. +You can share variables(like colours in this case) between CSS and JavaScript by using :export from CSS Modules. -Copy the Sass variables from `src/styles/variables.scss` into `src/styles/export/colours.scss`. You have an example on how we export `$white` in `colours.scss`. This way you can share you SASS variables with JavaScript to incrementally migrate the CSS in styled-components. +Copy the Sass variables from `src/styles/variables.scss` into `src/styles/export/colours.scss`. You have an example on how we export `$white` in `colours.scss`. This way you can share your SASS variables with JavaScript to incrementally migrate the CSS in styled-components. `src/components/App.js` shows you how we use the Sass `$white` variable as a JavaScript variable. From 38abcbbd3df7db5702044aa54ff72afaf83b1627 Mon Sep 17 00:00:00 2001 From: Alex Lobera Date: Mon, 22 Oct 2018 22:26:47 +0100 Subject: [PATCH 2/2] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f6699353..4c5c5cc5 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Current styles, which are being mapped to our components via classes, can be fou - Take appropriate styles from the stylesheet for each of the component and create styled components within each of the components or as a separate component should you need it (if the styled-component is being used on multiple places). - You can work your way through your application, starting with smaller components in the Layout folder to the bigger ones in Messenger. -## Links +## Articles and links - [LeanJS article on Styling in React](https://medium.com/leanjs/styling-in-react-ddfb47eda4d0) - [https://www.styled-components.com/](https://www.styled-components.com/)