added logo

This commit is contained in:
Rick Companje 2018-01-30 00:19:05 +01:00
parent 9eb01f2f21
commit f809c28d26
3 changed files with 7 additions and 5 deletions

BIN
img/logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

6
package-lock.json generated
View File

@ -88,9 +88,6 @@
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
"integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==" "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
},
"three-js-csg": {
"version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045"
} }
} }
}, },
@ -7802,6 +7799,9 @@
"resolved": "https://registry.npmjs.org/three/-/three-0.88.0.tgz", "resolved": "https://registry.npmjs.org/three/-/three-0.88.0.tgz",
"integrity": "sha1-QlbC/Djk+yOg0j66K2zOTfjkZtU=" "integrity": "sha1-QlbC/Djk+yOg0j66K2zOTfjkZtU="
}, },
"three-js-csg": {
"version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045"
},
"through2": { "through2": {
"version": "2.0.3", "version": "2.0.3",
"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",

View File

@ -22,6 +22,7 @@ import createSceneData from 'doodle3d-core/d3/createSceneData.js';
import { generateExportMesh } from 'doodle3d-core/utils/exportUtils.js'; import { generateExportMesh } from 'doodle3d-core/utils/exportUtils.js';
import muiThemeable from 'material-ui/styles/muiThemeable'; import muiThemeable from 'material-ui/styles/muiThemeable';
import Dialog from 'material-ui/Dialog'; import Dialog from 'material-ui/Dialog';
import logo from '../../img/logo.png';
const MAX_FULLSCREEN_WIDTH = 720; const MAX_FULLSCREEN_WIDTH = 720;
@ -73,7 +74,7 @@ const styles = {
margin: '5px 0 5px 5px' margin: '5px 0 5px 5px'
}, },
controlButton: { controlButton: {
marginRight: '2px' marginRight: '5px'
}, },
buttonContainer: { buttonContainer: {
width: '100%', width: '100%',
@ -89,6 +90,7 @@ const styles = {
}, },
detail: { detail: {
userSelect: 'none', userSelect: 'none',
marginTop: '10px',
marginBottom: '10px' marginBottom: '10px'
} }
}; };
@ -400,7 +402,7 @@ class Interface extends React.Component {
}} }}
> >
<ReactResizeDetector handleWidth handleHeight onResize={this.onResizeContainer} /> <ReactResizeDetector handleWidth handleHeight onResize={this.onResizeContainer} />
<h1 className={classes.title}>Doodle3D Slicer</h1> <img src={logo} style={{ position: 'absolute', left: '20px', top: '20px', width: '150px', height: '51px' }} />
{d3Panel} {d3Panel}
{settingsPanel} {settingsPanel}
</div> </div>