14 Commits

Author	SHA1	Message	Date
Wouter R	d634f2e9c3	Merge branch 'text-experiment' into develop ... Conflicts: js/Help.js js/buttonbehaviors.js js/main.js js_src/Keyboard.js js_src/Shape.js js_src/verticalShapes.js www/index.html	2014-01-17 13:21:02 +01:00
Rick Companje	0ad800b021	removed files	2014-01-09 18:10:54 +01:00
Adriaan Wormgoor	4ec660fd74	overhaul of client files to 'www' dir. This dir will now as a 'bin' dir of sorts. Outside of the 'www' dir there will be old files, temp files and also shell scripts which support continuous compilation and minification of css and js files	2013-10-21 11:40:38 +02:00
Adriaan Wormgoor	e01175ed81	styles and html pertaining to the new Progressbar and Thermometer look and feel	2013-10-16 23:11:06 +02:00
peteruithoven	1c930efdf5	Starting print right away, remove some target temp display hacks	2013-10-11 15:34:18 +02:00
Adriaan Wormgoor	58b3a12c6b	massive commit due to merging branch 'new_layouting_approach' into feature/printerdriver ... ---------------------------------------------------------------------- Merge branch 'new_layouting_approach' into feature/printerdriver * new_layouting_approach: (22 commits) changed chmod adjustments to make preview be initialized and updated better (when resizing) updates css styles changes to how the draw and preview canvasses are positioned and initted many updates CSS and LESS files and generally a responsive scaling overhaul of the settings page new LESS simple js lib for managing the folded in/out state of the sidebars on the minimal interface arrow file used in the minimal doodle3d interface the resulting css files which LESS outputs removed this because it's being rolled into the styles.css by LESS moved logos to their own dir + removed a few redundant ones copy normalize.css to the LESS dir since it's a source file smallest size of the doodle3d logo started using LESS for stylesheeting commit of current state of this branch. It's a work-in-progress (comitting because I need to change to other branch) a lot of changes -> almost there but the drawing is not consistent yet across devices. Drawing on the draw canvas is going OK but the preview is not drawing well now. Giving up for now. changes (sry) intermediary progress commented out part of the css (not final solution) added todo for future ...	2013-10-11 15:02:26 +02:00
peteruithoven	abc9841bc7	Handling new print3d driver (using new api, printer states)	2013-10-11 12:39:05 +02:00
Adriaan Wormgoor	aee5fecb88	Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client into new_layouting_approach ... # By Adriaan Wormgoor (6) and peteruithoven (4) # Via Adriaan Wormgoor (2) and peteruithoven (2) * 'master' of https://github.com/Doodle3D/doodle3d-client: objectHeight and twist fix and temp display fix minor repositioning of temp-guage so that it doesn't overlap with the info-button gcode generated twist now complies with the doodle preview made the 'ok' button have a mouseover 'hand' cursor commented out call to missing setPrintprogress() removed wrong unit in settings Removed unused draw logic additions to Thermometer to allow the general Update function to show() and hide() the Thermometer's container DIV new favicon (for Firefox) a few new favicons and homescreen icons Conflicts: js/Thermometer.js js/gcodeGenerating_v01.js	2013-09-18 17:44:26 +02:00
Adriaan Wormgoor	d7c32c926f	added todo for future	2013-09-18 12:04:06 +02:00
Adriaan Wormgoor	51aabf56c1	tiny, tiny indent change	2013-09-18 11:39:34 +02:00
Adriaan Wormgoor	82165c585b	additions to Thermometer to allow the general Update function to show() and hide() the Thermometer's container DIV	2013-09-18 10:57:46 +02:00
Adriaan Wormgoor	6eddb1835c	first implementation of different layouting. Doesn't work well yet..	2013-09-18 10:46:36 +02:00
Adriaan Wormgoor	84ee0c259a	updated Thermometer code (should be final for now)	2013-09-17 13:10:27 +02:00
Adriaan Wormgoor	95bedd09f1	Thermometer class plus the changes necessary to implement it	2013-09-17 13:08:52 +02:00