Skip to content
Snippets Groups Projects
Commit 951c893e authored by amandaghassaei's avatar amandaghassaei
Browse files

menu scrolling

parent 64d6ec70
No related branches found
No related tags found
No related merge requests found
......@@ -4,6 +4,10 @@ body {
overflow:hidden;/*hide scroll bar*/
}
html, body {
height: 100%;
}
.navbar {
margin-bottom:0;
z-index: 2;
......@@ -136,9 +140,11 @@ nav .btn {
#menuContent{
padding: 30px;
height:100%;
/*min-height:100%;*/
/*overflow-y: auto;*/
overflow-y: scroll;
top: 100px;
bottom: 0;
position: fixed;
width: 400px;
}
hr {
......
......@@ -9,12 +9,12 @@ ShopbotExporter.prototype.makeHeader = function(){
var data = "";
data += this.addLine("FG", [], "single step mode");
data += this.addLine("SA", [], "absolute distances");
data += this.goHome();
data += this.addLine("SM", [], "move/cut mode");
var rapidSpeeds = dmaGlobals.assembler.get("rapidSpeeds");
data += this.addLine("JS", [rapidSpeeds.xy, rapidSpeeds.z], "jog speed xy, z");
var feedRate = dmaGlobals.assembler.get("feedRate");
data += this.addLine("MS", [feedRate.xy, feedRate.z], "move speed xy, z");
data += this.goHome();
return data;
};
......
......@@ -35,9 +35,9 @@ AppState = Backbone.Model.extend({
optimize:"Optimize"
},
navAssemble:{
assembler:"Assembler",
animate:"Preview",
assembler:"Assembler",
cam: "Process",
animate:"Preview",
send: "Send"
}
},
......
......@@ -155,4 +155,4 @@
</body>
</html>
\ No newline at end of file
</html
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment