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

..

d3d_btns.css

Thermometer class plus the changes necessary to implement it

2013-09-17 13:08:52 +02:00

debug.css

Checking printing progress and disabling/enabling print and stop buttons

2013-08-09 22:25:14 +02:00

fixedPosInterface.css

Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client into new_layouting_approach

2013-09-18 17:44:26 +02:00

normalize.css

- interfaces scales vertically

2013-07-05 19:23:28 +02:00

settings.css

Network ui

2013-09-02 18:07:22 +02:00

settingsPopup.css

made the 'ok' button have a mouseover 'hand' cursor

2013-09-18 12:06:47 +02:00