diff --git a/src/octoprint/plugins/svgtogcode/static/css/mrbeam.css b/src/octoprint/plugins/svgtogcode/static/css/mrbeam.css
index df807070..252a2755 100644
--- a/src/octoprint/plugins/svgtogcode/static/css/mrbeam.css
+++ b/src/octoprint/plugins/svgtogcode/static/css/mrbeam.css
@@ -467,7 +467,8 @@ input[type="submit"].btn.btn-mini {
}
.navbar .brand {
padding-top: 4px;
- padding-bottom: 0px;
+ padding-bottom: 4px;
+ margin-left: 0px;
}
#navbar .navbar-inner .brand span {
background-image: url(../img/mr-typo-red_x120.png);
@@ -835,10 +836,16 @@ input[type="submit"].btn.btn-mini {
.navbar {
margin-bottom: 0px;
- margin-top: 6px;
+ /*margin-top: 6px;*/
+}
+
+.navbar>.container {
+ background-color: white;
+ border-bottom: 1px dotted #EEEEEE;
}
body {
+ padding-top: 48px; /* necessary for navbar-fixed-top */
background-color:whitesmoke;
}
diff --git a/src/octoprint/plugins/svgtogcode/static/js/convert.js b/src/octoprint/plugins/svgtogcode/static/js/convert.js
index 7c26f665..5684ed6d 100644
--- a/src/octoprint/plugins/svgtogcode/static/js/convert.js
+++ b/src/octoprint/plugins/svgtogcode/static/js/convert.js
@@ -32,11 +32,14 @@ function VectorConversionViewModel(params) {
$("#dialog_vector_graphics_conversion").modal("show");
};
+ // shows conversion dialog and extracts svg first
self.show_conversion_dialog = function() {
var tmpsvg = snap.select("#scaleGroup").innerSVG(); // get working area
+ // TODO use lasercutterprofiles
var dpiFactor = 90/25.4; // convert mm to pix with 90dpi (inkscape default - TODO use 72 for illustrator svg and fetch from settings)
var w = dpiFactor * self.settings.printerProfiles.currentProfileData().volume.width;
var h = dpiFactor * self.settings.printerProfiles.currentProfileData().volume.depth;
+
self.svg = '';
// TODO: js svg conversion
self.title(gettext("Converting"));
@@ -241,6 +244,4 @@ function VectorConversionViewModel(params) {
}).on("slideStop", self.changeFeedrate);
};
- self.state.convertWorkingArea = self.show_conversion_dialog; // hack! injecting method to avoid circular dependency.
-
}
\ No newline at end of file
diff --git a/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2 b/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
index 681825d0..7137c131 100644
--- a/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
+++ b/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
@@ -12,8 +12,8 @@
-