diff --git a/js/navbar.js b/js/navbar.js index 301bbb22be8113f74a7182829c22c15147b83963..e48dbf05c827af82725f82ff42ae687f73cd1b8c 100644 --- a/js/navbar.js +++ b/js/navbar.js @@ -17,6 +17,14 @@ function setupNavBar(){ $(menuId).show(); }); + var clearButton = $("#clearAll"); + clearButton.mouseout(function(){ + $(this).parent().removeClass("open"); + }); + + //clear canvas + clearButton.click(three.clearAll); + function hideAllMenus(){ allMenus.hide(); allNavMenuLinks.parent().removeClass("open");//no highlight @@ -41,7 +49,4 @@ function setupNavBar(){ return false; }); - //clear canvas - $("#clearAll").click(three.clearAll); - } \ No newline at end of file diff --git a/main.html b/main.html index e0e236dd93aa0e49296d08385e55b224e8c19ca3..c5ea649b39eb15429aee4ddab8b603d7c5a253c4 100644 --- a/main.html +++ b/main.html @@ -72,7 +72,10 @@ </ul> </li> </ul> - <a href="#fakelink" id="clearAll" class="navbar-right btn btn-lg btn-primary">Clear All</a> + <ul class="nav navbar-nav navbar-right"> + <li><a id="clearAll" class="menuHoverControls" href="#">Clear All</a></li> + </ul> + <!--<a href="#fakelink" id="clearAll" class=" btn btn-lg btn-primary">Clear All</a>--> </div><!-- /.navbar-collapse --> </nav> <div id="importGeometry" class="row navMenu">