pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed GCODE viewer in zoomed out browsers

Browse source 
Closes #612
This commit is contained in:
Gina Häußge 2015-06-03 13:25:30 +02:00
parent b714c59004
commit db980689c8
4 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -137,6 +137,7 @@
* [#516](https://github.com/foosel/OctoPrint/issues/516) - Also require API key even if ACL is disabled.
* [#556](https://github.com/foosel/OctoPrint/issues/556) - Allow login of the same user from multiple browsers without
side effects
* [#612](https://github.com/foosel/OctoPrint/issues/612) - Fixed GCODE viewer in zoomed out browsers
* [#633](https://github.com/foosel/OctoPrint/issues/633) - Correctly interpret temperature lines from multi extruder
setups under Smoothieware
* [#680](https://github.com/foosel/OctoPrint/issues/680) - Don't accidentally include a newline from the MIME headers

2
src/octoprint/static/css/octoprint.css
View file

File diff suppressed because one or more lines are too long

7
src/octoprint/static/less/octoprint.less
View file

@ -636,7 +636,14 @@ ul.dropdown-menu li a {
}
}
.canvas_container {
position: relative;
}
#gcode_layer_slider {
position: absolute;
right: 0;
top: 0;
height: 568px;
float: right;

8
src/octoprint/templates/tabs/gcodeviewer.jinja2
View file

@ -1,7 +1,9 @@
<div data-bind="visible: !waitForApproval()">
<input id="gcode_slider_layers" type="text">
<canvas id="gcode_canvas" width="568" height="568"></canvas>
<input id="gcode_slider_commands" type="text" style="width: 554px">
<div class="canvas_container">
<input id="gcode_slider_layers" type="text">
<canvas id="gcode_canvas" width="568" height="568"></canvas>
<input id="gcode_slider_commands" type="text" style="width: 554px">
</div>
<div class="progress" >
<div class="bar" style="width: 0%;" data-bind="text: ui_progress_text, style: { width: ui_progress_percentage() + '%' }"></div>