From 951c893effbda4ee673edb3f5e98c6cb2d6b7cb0 Mon Sep 17 00:00:00 2001
From: amandaghassaei <amandaghassaei@gmail.com>
Date: Sat, 14 Mar 2015 05:31:19 -0400
Subject: [PATCH] menu scrolling
---
css/main.css | 12 +++++++++---
js/cam/ShopbotExporter.js | 2 +-
js/models/AppState.js | 4 ++--
main.html | 2 +-
4 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/css/main.css b/css/main.css
index 3820bace..efde705d 100644
--- a/css/main.css
+++ b/css/main.css
@@ -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 {
diff --git a/js/cam/ShopbotExporter.js b/js/cam/ShopbotExporter.js
index a2d26f5e..06394390 100644
--- a/js/cam/ShopbotExporter.js
+++ b/js/cam/ShopbotExporter.js
@@ -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;
};
diff --git a/js/models/AppState.js b/js/models/AppState.js
index f57e20b5..a0c15228 100644
--- a/js/models/AppState.js
+++ b/js/models/AppState.js
@@ -35,9 +35,9 @@ AppState = Backbone.Model.extend({
optimize:"Optimize"
},
navAssemble:{
- assembler:"Assembler",
- animate:"Preview",
+ assembler:"Assembler",
cam: "Process",
+ animate:"Preview",
send: "Send"
}
},
diff --git a/main.html b/main.html
index 55757d9a..ba0b482c 100644
--- a/main.html
+++ b/main.html
@@ -155,4 +155,4 @@
</body>
-</html>
\ No newline at end of file
+</html
\ No newline at end of file
--
GitLab