From 8c3d444eed1d8ca4fe0393c2291d55f1429eb8f4 Mon Sep 17 00:00:00 2001 From: Rick Companje Date: Thu, 25 Jan 2018 17:47:36 +0100 Subject: [PATCH] design --- package-lock.json | 6 +++--- package.json | 1 + src/interface/Settings.js | 12 +++++++++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 21fcd11..7e6bc8c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -79,6 +79,9 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.1.0.tgz", "integrity": "sha512-dQoid9tqQ+uotGhuTKEY11X4xhyYePVnqGSoSm3OGKh2E8LZ6RPULp1uXTctk33IeERlrRJYoVSBglsL05F5Uw==" + }, + "three-js-csg": { + "version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045" } } }, @@ -7846,9 +7849,6 @@ "resolved": "https://registry.npmjs.org/three/-/three-0.88.0.tgz", "integrity": "sha1-QlbC/Djk+yOg0j66K2zOTfjkZtU=" }, - "three-js-csg": { - "version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045" - }, "through2": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", diff --git a/package.json b/package.json index 2d4bd6c..5ca28fa 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "start": "webpack-dev-server -w", "dist": "NODE_ENV=production webpack -p", "prepare": "npm run build", + "upload": "npm run dist && scp -r dist/* doodle3d.com:/domains/doodle3d.com/print", "analyze": "NODE_ENV=production ANALYZE_BUNDLE=true webpack -p", "build": "npm run build:main && npm run build:main:settings && npm run build:module && npm run build:module:settings ", "build:main": "BABEL_ENV=main babel src -s -d lib", diff --git a/src/interface/Settings.js b/src/interface/Settings.js index 9a5276c..809e8c6 100644 --- a/src/interface/Settings.js +++ b/src/interface/Settings.js @@ -29,14 +29,20 @@ const styles = { width: '100%', flexGrow: 1, overflowY: 'auto', - '& p, h3': { + '& p': { fontWeight: 'bold', margin: '30px 0 0 0' + }, + '& h3': { + fontWeight: 'bold', + marginTop: '20px', + marginBottom: '20px', } }, error: { color: red500 - } + }, + }; const getLocalStorage = () => { @@ -353,7 +359,7 @@ class Settings extends React.Component { ))} -

Printer Setup

+

Print Setup