Fix scaling, include... jquery

7coil · 7coil · commit 8c50929a36e8 · 2018-04-24T22:23:20.000+01:00
diff --git a/package.json b/package.json
@@ -4,6 +4,7 @@
   "private": true,
   "dependencies": {
     "d": "^1.0.0",
+    "jquery": "^3.3.1",
     "monaco-editor": "^0.12.0",
     "npm-run-all": "^4.1.2",
     "react": "^16.3.1",
diff --git a/src/components/ErrorBox.js b/src/components/ErrorBox.js
@@ -19,5 +19,5 @@ export default class ErrorBox extends Component {
 
 ErrorBox.propTypes = {
   colour: PropTypes.string,
-  children: PropTypes.oneOf([PropTypes.string, PropTypes.React])
+  children: PropTypes.oneOfType([PropTypes.string, PropTypes.children])
 }
diff --git a/src/routers/NotFound.js b/src/routers/NotFound.js
@@ -3,7 +3,7 @@ import ErrorBox from './../components/ErrorBox'
 
 export default class Test extends Component {
   render () {
-   return (
+    return (
       <main>
         <ErrorBox colour="red">Not Found</ErrorBox>
       </main>
diff --git a/src/sass/components/_main.sass b/src/sass/components/_main.sass
@@ -8,8 +8,7 @@ main
   padding: 2em
   box-sizing: border-box
   flex-grow: 1
-  @media screen and (min-width: 600px)
-    width: 100%
+  width: 100%
   @media screen and (min-width: 800px)
     width: 70%
   @media screen and (min-width: 1200px)
diff --git a/src/sass/index.css b/src/sass/index.css
diff --git a/src/sass/index.css.map b/src/sass/index.css.map
diff --git a/yarn.lock b/yarn.lock
@@ -4215,6 +4215,10 @@ jest@20.0.4:
   dependencies:
     jest-cli "^20.0.4"
 
+jquery@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
+
 js-base64@^2.1.9:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582"

Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,5 @@ export default class ErrorBox extends Component {`
`19`	`19`
`20`	`20`	`ErrorBox.propTypes = {`
`21`	`21`	`colour: PropTypes.string,`
`22`		`- children: PropTypes.oneOf([PropTypes.string, PropTypes.React])`
	`22`	`+ children: PropTypes.oneOfType([PropTypes.string, PropTypes.children])`
`23`	`23`	`}`