Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master branch #1746

Merged
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ and newcomers to the industry.
### Getting Started

- Follow the [getting started guide](./docs/getting-started.md) to download and run the project
([Node.js](https://nodejs.org/) >= 6.5)
([Node.js](https://nodejs.org/) >= 6.9)
- Check the [code recipes](./docs/recipes) used in this boilerplate, or share yours

### Customization
Expand All @@ -43,7 +43,7 @@ branches that you can use either as a reference or merge into your project:
— isomorphic Redux and React Intl by [Pavel Lang](https://github.com/langpavel)
(see [how to integrate React Intl](./docs/recipes/how-to-integrate-react-intl.md)) (based on `feature/apollo`)
- [feature/apollo-pure](https://github.com/kriasoft/react-starter-kit/tree/feature/apollo-pure) ([PR](https://github.com/kriasoft/react-starter-kit/pull/1664))
bare Apollo codebase by [piglovesyou](https://github.com/piglovesyou) (based on `master`)
— Apollo devtools and TypeScript integration by [piglovesyou](https://github.com/piglovesyou) (based on `master`)

You can see status of most reasonable merge combination as [PRs labeled as `TRACKING`](https://github.com/kriasoft/react-starter-kit/labels/TRACKING)

Expand Down
10 changes: 5 additions & 5 deletions docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

### Requirements

* Mac OS X, Windows, or Linux
* [Yarn](https://yarnpkg.com/) package + [Node.js](https://nodejs.org/) v6.5 or
- Mac OS X, Windows, or Linux
- [Yarn](https://yarnpkg.com/) package + [Node.js](https://nodejs.org/) v6.9 or
newer
* Text editor or IDE pre-configured with React/JSX/Flow/ESlint
- Text editor or IDE pre-configured with React/JSX/Flow/ESlint
([learn more](./how-to-configure-text-editors.md))

### Directory Layout
Expand Down Expand Up @@ -134,11 +134,11 @@ $ yarn run lint
To launch unit tests:

```shell
$ yarn run test # Run unit tests with Mocha
$ yarn run test # Run unit tests with Jest
$ yarn run test:watch # Launch unit test runner and start watching for changes
```

By default, [Mocha](https://mochajs.org/) test runner is looking for test files
By default, [Jest](https://jestjs.io/) test runner is looking for test files
matching the `src/**/*.test.js` pattern. Take a look at
`src/components/Layout/Layout.test.js` as an example.

Expand Down
34 changes: 16 additions & 18 deletions src/routes/home/Home.css
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,22 @@
font-size: 1.5rem;
}

.newsDesc {
h1,
h2,
h3,
h4,
h5,
h6 {
font-size: 1.125rem;
}

pre {
white-space: pre-wrap;
font-size: 0.875rem;
}

img {
max-width: 100%;
}
.newsDesc h1,
.newsDesc h2,
.newsDesc h3,
.newsDesc h4,
.newsDesc h5,
.newsDesc h6 {
font-size: 1.125rem;
}

.newsDesc pre {
white-space: pre-wrap;
font-size: 0.875rem;
}

.newsDesc img {
max-width: 100%;
}

.networkStatusMessage {
Expand Down