Tidy up.

ABI-Software · May 16, 2019 · 97e56cf · 97e56cf
1 parent 3dc3d11
commit 97e56cf
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 179 deletions.
diff --git a/src/index.js b/src/index.js
@@ -1,18 +1,17 @@
 //require("./styles/bootstrap.min.css");
 require("./styles/w3.css");
-require("./styles/sidebar.css");
 require('./styles/bootstrap.min.css');
 
 exports.BaseModule = require("./modules/BaseModule").BaseModule;
 exports.BodyViewer = require("./modules/bodyRenderer").BodyViewer;
 exports.RendererModule = require("./modules/RendererModule").RendererModule;
-exports.CellPanel = require("./cell_panel").CellPanel;
+//exports.CellPanel = require("./cell_panel").CellPanel;
 exports.ModelsLoader = require("./modelsLoader").ModelsLoader;
-exports.ModelPanel = require("./modules/model_panel").ModelPanel;
-exports.ModelViewerDialog = require("./ui/ModelViewerDialog").ModelViewerDialog;
+//exports.ModelPanel = require("./modules/model_panel").ModelPanel;
+//exports.ModelViewerDialog = require("./ui/ModelViewerDialog").ModelViewerDialog;
 exports.OrgansViewer = require("./modules/organsRenderer").OrgansViewer;
 exports.ScaffoldViewer = require("./modules/ScaffoldViewer").ScaffoldViewer;
-exports.TissueViewer = require("./tissueRenderer").TissueViewer;
+//exports.TissueViewer = require("./tissueRenderer").TissueViewer;
 exports.BaseDialog = require("./ui/BaseDialog").BaseDialog;
 exports.OrgansViewerDialog = require("./ui/OrgansViewerDialog").OrgansViewerDialog;
 exports.ScaffoldDialog = require("./ui/ScaffoldDialog").ScaffoldDialog;

diff --git a/src/modules/ScaffoldViewer.js b/src/modules/ScaffoldViewer.js
@@ -1,4 +1,3 @@
-require("../styles/my_styles.css");
 var THREE = require('zincjs').THREE;
 var ITEM_LOADED = require("../utility").ITEM_LOADED;
 

diff --git a/src/modules/bodyRenderer.js b/src/modules/bodyRenderer.js
@@ -1,4 +1,3 @@
-require("../styles/my_styles.css");
 var THREE = require('zincjs').THREE;
 var ITEM_LOADED = require("../utility").ITEM_LOADED;
 

diff --git a/src/snippets/main.html b/src/snippets/main.html
diff --git a/src/snippets/managerSidebar.html b/src/snippets/managerSidebar.html
@@ -12,10 +12,7 @@
 	  <option value="8">Use case 8</option>
 	</select>
   <button class="w3-bar-item w3-button sidebar-topbutton" id="addManager">+ Add Manager</button>
-  <div style="width:100%;position:absolute;bottom:1%;">
-  	<button class="w3-bar-item w3-button sidebar-topbutton" id="Feedback" style="text-align:center!important;">Feedback</button>
-  </div>
-
+  <button class="w3-bar-item w3-button sidebar-topbutton" id="Feedback" style="text-align:center!important;bottom:0px;position:absolute;">Feedback</button>
 </div>
 
 <div style="z-index:200000">

diff --git a/src/styles/my_styles.css b/src/styles/my_styles.css
@@ -1,67 +1,3 @@
-.switch {
-  position: relative;
-  display: inline-block;
-  width: 140px;
-  height: 25px;
-  left:10%;
-}
-
-.switch input {display:none;}
-
-.switch_text {
-	position: absolute;
-	left: 50px;
-	padding-left:10%;
-	font-size: 1.2em;
-}
-
-.switchSlider {
-  position: absolute;
-  cursor: pointer;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  width: 50px;
-  background-color: #ccc;
-  -webkit-transition: .4s;
-  transition: .4s;
-}
-
-.switchSlider:before {
-  position: absolute;
-  content: "";
-  height: 19px;
-  width: 19px;
-  left: 4px;
-  bottom: 4px;
-  background-color: white;
-  -webkit-transition: .4s;
-  transition: .4s;
-}
-
-input:checked + .switchSlider {
-  background-color: #2196F3;
-}
-
-input:focus + .switchSlider {
-  box-shadow: 0 0 1px #2196F3;
-}
-
-input:checked + .switchSlider:before {
-  -webkit-transform: translateX(19px);
-  -ms-transform: translateX(19px);
-  transform: translateX(19px);
-}
-
-/* Rounded switchSliders */
-.switchSlider.round {
-  border-radius: 25px;
-}
-
-.switchSlider.round:before {
-  border-radius: 50%;
-}
 
 .play {
   width:48px;
@@ -85,37 +21,6 @@ input:checked + .switchSlider:before {
   background-image: url(./images/pause_hover_small.png);
 }
 
-.switchSlider_style {
-	position: absolute;
-	width:50%;
-	left:25%;
-	background-color: #FFF;
-	opacity: 1.0;
-}
-
-.screenButton {
-    position:absolute;
-    right: 1%;
-    z-index:2;
-}
-
-.bodyDisplayPortCollapse {
-	position:absolute;
-	height:100%;
-	width:25%;
-	left:0%;
-	border-right: 2px solid #000000;
-}
-
-.organsDisplayPortCollapse {
-	position:absolute;
-	height:100%;
-	width:25%;
-	left:25%;
-	border-right: 2px solid #000000;
-	display: block;
-}
-
 .tissueDisplayPortCollapse {
 	position:absolute;
 	width:25%;
@@ -143,22 +48,6 @@ input:checked + .switchSlider:before {
 	display: block;
 }
 
-.apinatomyDisplayPortCollapse {
-	position:absolute;
-	height:30%;
-	width:100%;
-	top:70%;
-	border-top: 1px solid black;
-	display: block;
-}
-
-.fullPortDisplay {
-	position:relative;
-	height:100%;
-	width:100%;
-	left:0%;
-	display: block;
-}
 
 #bodyGui, #organGui, #tissueGui, #modelGui, #cellGui {
 	position: absolute;
@@ -231,19 +120,10 @@ img.model {
 	width:100%;
 }
 
-.fullPortDisplay .svgContainer {
-	height:90%;
-	width:100%;
-}
-
 #ZoomControl{
 	visibility: visible;
 }
 
-.fullPortDisplay #ZoomControl{
-	visibility: visible;
-}
-
 #systemToggle {
 	position:absolute;
 	top:20%;
@@ -295,11 +175,6 @@ img.model {
 	margin-top:5%;
 }
 
-.fullPortDisplay .modelButton{
-	margin-top:0%;
-	margin-left:40%;
-}
-
 #modelsController {
 	position:relative;
 	text-align:center;
@@ -311,33 +186,6 @@ img.model {
     z-index:2;
 }
 
-.fullPortDisplay #modelsController{
-	display:flex;
-}
-
-.hideApinatomyButton {
-    position:absolute;
-    left: 1%;
-    z-index:2;
-}
-
-.showApinatomyButton {
-    position:absolute;
-    left: 1%;
-    bottom: 1%;
-    z-index:2;
-    visibility:hidden;
-}
-
-
-.topPanelExpand {
-	height:100%;
-}
-
-.topPanelCollapse {
-	height:70%;
-}
-
 .organsImg {
 	max-height: 100%;
 	max-width: 100%;

diff --git a/src/ui/ManagerSidebar.js b/src/ui/ManagerSidebar.js
@@ -1,3 +1,5 @@
+require("../styles/sidebar.css");
+
 var SidebarItemArray = function() {
   var array = new Object();
   var _this = this;

diff --git a/src/ui/OrgansViewerDialog.js b/src/ui/OrgansViewerDialog.js
@@ -1,3 +1,5 @@
+require("../styles/my_styles.css");
+
 var OrgansViewerDialog = function(organsViewerIn, parentIn) {
   (require('./BaseDialog').BaseDialog).call(this);
   this.parent = parentIn;