Skip to content

Commit

Permalink
Normalize styles
Browse files Browse the repository at this point in the history
  • Loading branch information
Johnny Choudhury-Lucas committed Dec 17, 2017
1 parent 34c8b55 commit 9621231
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 2 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"css-loader": "^0.28.7",
"eslint": "^4.11.0",
"node-sass": "^4.7.2",
"normalize.css": "^7.0.0",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"sass-loader": "^6.0.6",
Expand Down
1 change: 1 addition & 0 deletions src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import React from 'react'
import ReactDOM from 'react-dom'
import IndecisionApp from './components/IndecisionApp'
import 'normalize.css/normalize.css'
import './styles/style.scss'

ReactDOM.render(<IndecisionApp />, document.getElementById('app'))
2 changes: 1 addition & 1 deletion src/styles/style.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import './base/base';
@import './components/header';
@import './components/header';
2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module.exports = {
exclude: /node_modules/
},
{
test: /\.scss$/,
test: /\.s?css$/,
use: [
'style-loader',
'css-loader',
Expand Down
4 changes: 4 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3446,6 +3446,10 @@ normalize-url@^1.4.0:
query-string "^4.1.0"
sort-keys "^1.0.0"

normalize.css@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-7.0.0.tgz#abfb1dd82470674e0322b53ceb1aaf412938e4bf"

npm-run-path@^2.0.0:
version "2.0.2"
resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
Expand Down

0 comments on commit 9621231

Please sign in to comment.