Skip to content

Commit 756d680

Browse files
committed
Merge branch 'master' into rr4
2 parents c41d250 + cf5a394 commit 756d680

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"less": "^2.7.1",
3131
"less-loader": "^2.2.3",
3232
"node-sass": "^4.5.3",
33+
"normalize.css": "^7.0.0",
3334
"null-loader": "^0.1.1",
3435
"postcss": "^5.0.21",
3536
"postcss-loader": "^1.3.3",

src/containers/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import React from 'react';
22
// import package
33
import { HashRouter as Router, Route, Switch } from 'react-router-dom';
4+
import 'normalize.css/normalize.css';
5+
46
// import relative path
57
import Home from './Home';
68
import NotFound from './NotFound';

yarn.lock

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,8 +1055,8 @@ big.js@^3.1.3:
10551055
resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.1.3.tgz#4cada2193652eb3ca9ec8e55c9015669c9806978"
10561056

10571057
binary-extensions@^1.0.0:
1058-
version "1.9.0"
1059-
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.9.0.tgz#66506c16ce6f4d6928a5b3cd6a33ca41e941e37b"
1058+
version "1.10.0"
1059+
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.10.0.tgz#9aeb9a6c5e88638aad171e167f5900abe24835d0"
10601060

10611061
block-stream@*:
10621062
version "0.0.9"
@@ -1171,8 +1171,8 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
11711171
electron-to-chromium "^1.2.7"
11721172

11731173
browserslist@^2.1.2:
1174-
version "2.3.2"
1175-
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.3.2.tgz#343ff101cce799d5eaf0b742e17d0d21efc2d379"
1174+
version "2.3.3"
1175+
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.3.3.tgz#2b0cabc4d28489f682598605858a0782f14b154c"
11761176
dependencies:
11771177
caniuse-lite "^1.0.30000715"
11781178
electron-to-chromium "^1.3.18"
@@ -2555,7 +2555,7 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@~7.1.1:
25552555
once "^1.3.0"
25562556
path-is-absolute "^1.0.0"
25572557

2558-
global@^4.3.0, global@^4.3.2:
2558+
global@^4.3.0:
25592559
version "4.3.2"
25602560
resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f"
25612561
dependencies:
@@ -3690,6 +3690,10 @@ normalize-url@^1.4.0:
36903690
query-string "^4.1.0"
36913691
sort-keys "^1.0.0"
36923692

3693+
normalize.css@^7.0.0:
3694+
version "7.0.0"
3695+
resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-7.0.0.tgz#abfb1dd82470674e0322b53ceb1aaf412938e4bf"
3696+
36933697
"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2:
36943698
version "4.1.2"
36953699
resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
@@ -5184,10 +5188,9 @@ time-stamp@^2.0.0:
51845188
resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357"
51855189

51865190
timers-browserify@^2.0.2:
5187-
version "2.0.3"
5188-
resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.3.tgz#41fd0bdc926a5feedc33a17a8e1f7d491925f7fc"
5191+
version "2.0.4"
5192+
resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.4.tgz#96ca53f4b794a5e7c0e1bd7cc88a372298fa01e6"
51895193
dependencies:
5190-
global "^4.3.2"
51915194
setimmediate "^1.0.4"
51925195

51935196
to-arraybuffer@^1.0.0:

0 commit comments

Comments
 (0)