From 6c02343da3d55dbed7366afb73ad656260d505ad Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Thu, 14 Dec 2017 11:55:14 +0100 Subject: [PATCH] update css --- index.js | 18 +++++++++++++----- package-lock.json | 5 +++++ package.json | 1 + 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/index.js b/index.js index 859a0a7..5edf58e 100644 --- a/index.js +++ b/index.js @@ -6,14 +6,22 @@ import { render } from 'react-dom'; import fileSaver from 'file-saver'; import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider'; import injectTapEventPlugin from 'react-tap-event-plugin'; +import jss from 'jss'; +import preset from 'jss-preset-default'; +import normalize from 'normalize-jss'; injectTapEventPlugin(); -document.body.style.margin = 0; -document.body.style.padding = 0; -document.body.style.height = '100%'; -document.documentElement.style.height = '100%' -document.getElementById('app').style.height = '100%'; +jss.setup(preset()); +jss.createStyleSheet(normalize).attach(); +jss.createStyleSheet({ + '@global': { + '*': { margin: 0, padding: 0 }, + '#app, body, html': { height: '100%', fontFamily: 'sans-serif' }, + body: { overflow: 'auto' }, + html: { overflow: 'hidden' } + } +}).attach(); const downloadGCode = ({ gcode: { gcode } }) => { const file = new File([gcode], 'gcode.gcode', { type: 'text/plain' }); diff --git a/package-lock.json b/package-lock.json index 73f5ee7..69480fb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5113,6 +5113,11 @@ "vm-browserify": "0.0.4" } }, + "normalize-jss": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/normalize-jss/-/normalize-jss-4.0.0.tgz", + "integrity": "sha512-zsn6yP0fOoDpzktjHCWKGVDMssYso0h6wxjW3+ABUp5CeEPpYc9YUy6cy7/SLO2yrPvtEzx0vu79Y9iEF2qSnA==" + }, "normalize-package-data": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", diff --git a/package.json b/package.json index 16d542d..18cf566 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "file-saver": "^1.3.3", "html-webpack-template": "^6.0.2", "imports-loader": "^0.7.1", + "normalize-jss": "^4.0.0", "material-ui": "^0.19.4", "react-tap-event-plugin": "^3.0.2", "url-loader": "^0.5.9",