Skip to content

Commit 6570566

Browse files
authored
Merge pull request #191 from nicolethoen/merge_5.1.1_into_v6
Merge 5.1.1 into v6
2 parents d313ebc + ff1855c commit 6570566

File tree

3 files changed

+3564
-1174
lines changed

3 files changed

+3564
-1174
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ You can use a similar technique to import assets from your local app, just prefi
6969

7070
```js
7171
import loader from '@app/assets/images/loader.gif';
72-
<img src={loader} alt="Content loading />
72+
<img src={loader} alt="Content loading" />
7373
```
7474

7575
## Vector image support
@@ -88,7 +88,7 @@ body {
8888
```
8989

9090
## Adding custom CSS
91-
When importing CSS from a third-party package for the first time, you may encounter the error `Module parse failed: Unexpected token... You may need an appropriate loader to handle this file typ...`. You need to register the path to the stylesheet directory in [stylePaths.js](./stylePaths.js). We specify these explicity for performance reasons to avoid webpack needing to crawl through the entire node_modules directory when parsing CSS modules.
91+
When importing CSS from a third-party package for the first time, you may encounter the error `Module parse failed: Unexpected token... You may need an appropriate loader to handle this file typ...`. You need to register the path to the stylesheet directory in [stylePaths.js](./stylePaths.js). We specify these explicitly for performance reasons to avoid webpack needing to crawl through the entire node_modules directory when parsing CSS modules.
9292

9393
## Code quality tools
9494
* For accessibility compliance, we use [react-axe](https://github.com/dequelabs/react-axe)

0 commit comments

Comments
 (0)