Merge pull request #1483 from gluneau/Integrate-new-release-of-BB-ver…

…sion-2.4.0-into-loris-15.10 BB 2.4.0 for 15.10.2
aces · Jan 22, 2016 · 0cf4079 · 0cf4079
2 parents e2cc17b + 3cd0097
commit 0cf4079
Show file tree

Hide file tree

Showing 7 changed files with 1,112 additions and 790 deletions.
diff --git a/modules/brainbrowser/css/brainbrowser.css b/modules/brainbrowser/css/brainbrowser.css
@@ -61,7 +61,6 @@ body {
     color: black;
     display: inline-block;
     width: auto;
-    min-width: 330px;
 }
 
 .control-inputs {
@@ -154,6 +153,12 @@ body {
     padding: 1px;
     float: right;
     text-align: center;
+    display: inline;
+}
+
+.intensity-heading {
+    padding: 1px;
+    display: inline;
 }
 
 #color-map-select {

diff --git a/modules/brainbrowser/css/volume-viewer-demo.css b/modules/brainbrowser/css/volume-viewer-demo.css
@@ -69,7 +69,7 @@ canvas.slice-display {
   width: auto;
   min-width: 330px;
   height: auto;
-  max-height: 480px;
+  max-height: 600px;
 }
 
 .control-heading {