Skip to content
Snippets Groups Projects
Commit 332f06df authored by Amanda Ghassaei's avatar Amanda Ghassaei
Browse files

css fix

parent 8d520f55
No related branches found
No related tags found
No related merge requests found
......@@ -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;
}
......
......@@ -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>
......
......@@ -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){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment