fixed editor and run-button height and visibility issues

neo4j-contrib · Oct 12, 2014 · dbe7d48 · dbe7d48
1 parent 8eb7e5e
commit dbe7d48
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/src/main/webapp/javascripts/console.js b/src/main/webapp/javascripts/console.js
@@ -347,8 +347,9 @@ function showWelcome(json) {
 
 function resizeOutput() {
     var $output = $("#output");
-    var editorHeight = $(".CodeMirror-scroll").height();
+    var editorHeight = Math.min($(".CodeMirror-scroll").height(),128);
     var windowHeight = $(window).height();
+//    console.log("editorHeight",editorHeight,"scrollHeight",$(".CodeMirror-scroll").height(),"windowHeight",windowHeight);
     $output.css({
         'height': ( windowHeight - editorHeight - 15 ) + 'px'
     });
@@ -424,7 +425,7 @@ function sendNext(msg) {
     post("console/cypher"+getPostQueryParams(), _query, function (res) {
         if (msg.action === "query" && msg.call_id && graphgistWindow) {
             res.call_id = msg.call_id;
-            console.log("res",res);
+//            console.log("res",res);
             graphgistWindow.postMessage(JSON.stringify(res), "*");
         }
         else {

diff --git a/src/main/webapp/javascripts/visualization.js b/src/main/webapp/javascripts/visualization.js
@@ -84,7 +84,7 @@ function GraphVisualization() {
 
     function visualize(id, w, h, data) {
         var vis = d3.select("#" + id).append("svg").attr("id", "graph").attr("width", w / 2).attr("height", h)
-            .attr("style", "pointer-events:fill; margin-left:" + w / 2);
+            .attr("style", "pointer-events:fill; margin-left:" + w / 2+"px");
 
         var force = self.force = d3.layout.force().nodes(data.nodes).links(data.links).gravity(.2).distance(80)
             .charge(-1000).size([ w / 2, h ]).start();

diff --git a/src/main/webapp/stylesheets/light.css b/src/main/webapp/stylesheets/light.css
@@ -46,7 +46,7 @@ code {
 
 .cm-s-cypher {
     text-shadow: none;
-    background: #f5f5f5;
+    background: white;
     color: black;
 }
 

diff --git a/src/main/webapp/stylesheets/main.css b/src/main/webapp/stylesheets/main.css
@@ -47,6 +47,8 @@ a:link, a:visited {
     bottom: 0;
     left: 0;
     right: 0;
+    min-height: 64px;
+    max-height: 128px;
 }
 
 #graph {
@@ -140,6 +142,7 @@ pre {
     bottom: 1px;
     width: 4.7%;
     margin: 0px;
+    max-height: 128px;
 }
 
 
@@ -165,8 +168,9 @@ h3 {
 }
 
 .CodeMirror-scroll {
-    height: auto;
-    overflow-y: hidden;
+    min-height: 64px;
+    max-height: 128px;
+    overflow-y: scroll;
     overflow-x: auto;
 }
 
@@ -184,4 +188,7 @@ h3 {
 
 #editor .cm-s-neo {
     margin: 0;
+    max-height: 128px;
+    overflow-y: scroll;
+    background: #ffffff;
 }