From 332f06dff0e5cc9ddf7abac0c2c734789788b690 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Wed, 25 Mar 2015 13:12:31 -0400
Subject: [PATCH] css fix

---
 css/main.css      | 18 +-----------------
 index.html        |  2 +-
 js/cam/Machine.js |  4 ++--
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/css/main.css b/css/main.css
index 5160e7b3..70110c0d 100644
--- a/css/main.css
+++ b/css/main.css
@@ -210,6 +210,7 @@ input.numberInput{
 
 .dropdown-submenu a{
     color: #e1e4e7!important;
+    white-space: normal;
 }
 
 .dropdown-submenu li:hover{
@@ -231,23 +232,6 @@ input.numberInput{
     display: block;
 }
 
-.dropdown-submenu>a:after {
-    display: block;
-    content: " ";
-    float: right;
-    width: 0;
-    height: 0;
-    border-color: transparent;
-    border-style: solid;
-    border-width: 5px 0 5px 5px;
-    border-left-color: #ccc;
-    margin-top: 5px;
-}
-
-.dropdown-submenu:hover>a:after {
-    border-left-color: #fff;
-}
-
 .dropdown-submenu.pull-left {
     float: none;
 }
diff --git a/index.html b/index.html
index 401ee6f1..05a964b9 100644
--- a/index.html
+++ b/index.html
@@ -113,7 +113,7 @@
                 <li><a class="importJSON" href="#">Open JSON... &nbsp&nbsp&nbsp&nbsp(CTRL/&#8984 + O)</a></li>
                 <li class="divider"></li>
                 <li class="dropdown-submenu">
-                <a tabindex="-1">Load User Settings</a>
+                <a tabindex="-1">Load User Settings<span class="pull-right fui-arrow-right"></span></a>
                 <ul class="dropdown-menu">
                     <!--<li><a id="resetDefaultSettings" href="#">Reset Settings</a></li>-->
                     <li><a data-file="ben.user" class="savedUserSettings" href="#">Ben</a></li>
diff --git a/js/cam/Machine.js b/js/cam/Machine.js
index 18a8f01e..49c2a9e1 100644
--- a/js/cam/Machine.js
+++ b/js/cam/Machine.js
@@ -31,16 +31,16 @@ Machine.prototype.setVisibility = function(visible){
     else this.cell.hide();
     this._setAlpha();
     this._setMeshesVisiblity(visible);
+    dmaGlobals.three.render();
 };
 
-Machine.prototype._setAlpha = function(visible){
+Machine.prototype._setAlpha = function(){
     //todo make stock transparent
     if (dmaGlobals.appState.get("currentTab") == "cam"){
         this.material.opacity = 0.5;
     } else {
         this.material.opacity = 1;
     }
-
 };
 
 Machine.prototype._setMeshesVisiblity = function(visible){
-- 
GitLab