Skip to content

Commit

Permalink
Remove reset.css file calls
Browse files Browse the repository at this point in the history
update package.json
  • Loading branch information
tmikeschu committed Feb 21, 2017
1 parent e42ac9c commit e92cffe
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 4 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"private": true,
"devDependencies": {
"node-sass": "^4.5.0",
"react-scripts": "0.9.0",
"react-scripts": "0.7.0",
"sass-loader": "^6.0.1",
"webpack": "^2.2.1"
"webpack": "^0.1.3"
},
"dependencies": {
"react": "^15.4.2",
Expand Down
1 change: 1 addition & 0 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from 'react';
import ReactDOM from 'react-dom';
import App from './components/app.jsx';
import './stylesheets/reset.css';
import './stylesheets/App.css';

ReactDOM.render(
Expand Down
43 changes: 42 additions & 1 deletion src/stylesheets/App.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,45 @@
@import url(./reset.css);
/* http://meyerweb.com/eric/tools/css/reset/ 2. v2.0 | 20110126
License: none (public domain)
*/

html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
}


/* HTML5 display-role reset for older browsers */

article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {
display: block;
}

body {
line-height: 1;
}

ol, ul {
list-style: none;
}

blockquote, q {
quotes: none;
}

blockquote:before, blockquote:after, q:before, q:after {
content: '';
content: none;
}

table {
border-collapse: collapse;
border-spacing: 0;
}

@import url("https://fonts.googleapis.com/css?family=Raleway|Josefin+Sans");
body, ul {
font-family: "Josefin Sans", sans-serif; }
Expand Down
1 change: 0 additions & 1 deletion src/stylesheets/App.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import "./reset.css";
@import "./base.scss";
@import "./skeleton.scss";
@import "./components/header.scss";
Expand Down

0 comments on commit e92cffe

Please sign in to comment.