From 523d05eaf1c47bc0d6f5d904940737fc24ac9d53 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Fri, 9 Jan 2015 02:54:23 -0500
Subject: [PATCH] styling
---
js/navbar.js | 11 ++++++++---
main.html | 5 ++++-
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/js/navbar.js b/js/navbar.js
index 301bbb22..e48dbf05 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 e0e236dd..c5ea649b 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">
--
GitLab