diff options
| -rw-r--r-- | webapp/static/style.css | 16 | ||||
| -rw-r--r-- | webapp/templates/jigerator.html | 11 |
2 files changed, 22 insertions, 5 deletions
diff --git a/webapp/static/style.css b/webapp/static/style.css index b9a696e..bebb762 100644 --- a/webapp/static/style.css +++ b/webapp/static/style.css @@ -122,7 +122,6 @@ body { a.btn { display: block; font-weight: 700; - background-color: #b50000; border-radius: 0.5em; padding: .4em 1em .4em 1em; margin-top: .2em; @@ -132,6 +131,17 @@ a.btn:active, a.btn:hover, a.btn:visited, a.btn:link { text-decoration: none; } +a.btn.red { + background-color: #b50000; + color: #fff; +} + +a.btn.green { + background-color: #00b500; + color: #fff; +} + + .workflow-images { display: flex; @@ -235,3 +245,7 @@ a.btn:active, a.btn:hover, a.btn:visited, a.btn:link { .render_output { padding-bottom: 8em; } + +#stl-target { + width: 100%; +} diff --git a/webapp/templates/jigerator.html b/webapp/templates/jigerator.html index e89228b..66dc9c0 100644 --- a/webapp/templates/jigerator.html +++ b/webapp/templates/jigerator.html @@ -103,11 +103,12 @@ <div class="render_output"> {% if has_renders %} + <a href="{{url_for('render_download', file='sources.zip')}}" class="btn green render">Download renders</a> + {# <div class="preview-images"> - <a href="{{url_for('render_download', file='sources.zip')}}" class="render">Download renders</a> - - <div id="stl-target" class="madeleine"></div> + <div id="stl-target" class="madeleine"></div> </div> + #} {% elif 'render_job' in session and not has_renders %} <div class="loading-message"> <div class="lds-ring"><div></div><div></div><div></div><div></div></div> @@ -132,6 +133,7 @@ <div class="copyright">© 2019 jaseg</div> </div> </div> + {# {% if has_renders %} <!-- STL viewer --> <link href="static/Madeleine.js/src/css/Madeleine.css" rel="stylesheet"> @@ -144,10 +146,11 @@ var madeleine = new Madeleine({ target: 'stl-target', // target div id data: '{{url_for('render_download', file='jig.stl')}}', // data path - path: '.' // path to source directory from current html file + path: 'static/Madeleine.js/src' // path to source directory from current html file }); }; </script> {% endif %} + #} </body> </html> |