From 82e8ff667ad288241b52974775a06f9fc7d2c905 Mon Sep 17 00:00:00 2001 From: ortonomy Date: Wed, 14 Feb 2018 17:48:39 +0800 Subject: [PATCH 1/2] removes external bootstrap dependency and adds sanitize.css resets --- package.json | 6 +++--- public/index.html | 24 ------------------------ src/index.js | 1 + 3 files changed, 4 insertions(+), 27 deletions(-) diff --git a/package.json b/package.json index a97ed76..62ec7cb 100644 --- a/package.json +++ b/package.json @@ -7,14 +7,14 @@ "custom-react-scripts": "^0.2.1", "font-awesome": "^4.7.0", "query-string": "^5.0.1", - "react": "^15.6.1", - "react-bootstrap": "^0.31.3", + "react": "^16.2.0", "react-cookie": "^2.1.2", - "react-dom": "^15.6.1", + "react-dom": "^16.2.0", "react-redux": "^5.0.6", "react-router-dom": "^4.2.2", "redux": "^3.7.2", "redux-logic": "^0.12.3", + "sanitize.css": "^5.0.0", "uuid": "^3.1.0" }, "devDependencies": { diff --git a/public/index.html b/public/index.html index e5440c1..1eafe85 100644 --- a/public/index.html +++ b/public/index.html @@ -4,22 +4,8 @@ - - - fling.work | freelancer management @@ -27,15 +13,5 @@ You need to enable JavaScript to run this app.
- diff --git a/src/index.js b/src/index.js index a1d08c8..f08cb4f 100644 --- a/src/index.js +++ b/src/index.js @@ -12,6 +12,7 @@ import * as Redux from './utils/Redux'; import RootContainer from './RootContainer'; // global styles +import 'sanitize.css'; import './index.css'; import 'font-awesome/css/font-awesome.min.css'; From 598e9b10994b8014dac095cf0098f662b571544c Mon Sep 17 00:00:00 2001 From: ortonomy Date: Wed, 14 Feb 2018 17:57:10 +0800 Subject: [PATCH 2/2] reverts accidental include react, react-dom upgrade in package --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 62ec7cb..1091a44 100644 --- a/package.json +++ b/package.json @@ -7,9 +7,9 @@ "custom-react-scripts": "^0.2.1", "font-awesome": "^4.7.0", "query-string": "^5.0.1", - "react": "^16.2.0", + "react": "^15.6.1", "react-cookie": "^2.1.2", - "react-dom": "^16.2.0", + "react-dom": "^15.6.1", "react-redux": "^5.0.6", "react-router-dom": "^4.2.2", "redux": "^3.7.2",