7 Commits

Author	SHA1	Message	Date
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