diff --git a/css/main.css b/css/main.css index 5160e7b3e98a5cf3b340eb21e1a90fd18d3ca0f7..70110c0dd0e3d47a4c638289a0ea8f93f32d3384 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 401ee6f127e7f097ef12cf67250cb7b9ab107359..05a964b9a47bbdcb7c966cbd30c1c86f3f1bb039 100644 --- a/index.html +++ b/index.html @@ -113,7 +113,7 @@ <li><a class="importJSON" href="#">Open JSON...     (CTRL/⌘ + 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 18a8f01e2ef5aa1acb507a3a95a31e126b45a4d5..49c2a9e19ee5303f8f9aca942b76fb87db57f23f 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){