diff --git a/css/main.css b/css/main.css index d715bf8b637635551dcac1e87ef924a50c65b32a..b878da648a1b49055cf64cffa2e18d0ee8eef2bd 100644 --- a/css/main.css +++ b/css/main.css @@ -20,7 +20,7 @@ pre { .navbar { margin-bottom:0; - z-index: 2; + z-index: 5; border-radius: 0; opacity:0.8; } diff --git a/js/cam/assemblers/AssemblerPost.js b/js/cam/assemblers/AssemblerPost.js index ea95ebb58d5ae12df38f7138438acbc555fdc214..2c007a6f0c673da7d7e250c4e4a37740a9d31858 100644 --- a/js/cam/assemblers/AssemblerPost.js +++ b/js/cam/assemblers/AssemblerPost.js @@ -61,7 +61,7 @@ define(['underscore', 'appState', 'lattice', 'cam'], function(_, appState, latti this.customChangeZLayer = function(currentIndex, lastIndex, exporter, settings, context, self){ var data = ""; if (lastIndex === null || (currentIndex.z-lastIndex.z)%2 != 0){ - data += exporter.addLine("G0", ["A" + ((currentIndex.z%2+1)*0.3125).toFixed(4)], "new layer"); + data += exporter.addLine("G0", ["A" + ((currentIndex.z+1)%2*0.3125).toFixed(4)], "new layer"); data += "\n"; } return data;