down with the search-bar, on with the tool-bar

2 files changed, 20 insertions, 72 deletions

diff --git a/res/client/css/partials/search-bar.scss b/res/client/css/partials/search-bar.scss
index b9f0de7d..ef6d8dfd 100644
--- a/res/client/css/partials/search-bar.scss
+++ b/res/client/css/partials/search-bar.scss
@@ -1,33 +1,8 @@
 @import '../modules/mixins'; // For box-shadow
 
-.search-bar{
-  position: relative;
-  width:100%;
-  height:$four-baselines;
-  background: white;
-  @include rz-box-shadow(0px, 1px, 6px, 0px, rgba(0,0,0,0.3) );
-  z-index: 100;
-}
-
-.search-input{
-  width: 70%;
-  height:$icon-height;
-  float: left;
-  margin: 8px 12px 12px $doc-margin;
-}
-
-.search-input:before {
-  content: "";
-  background: url(../img/search-icon.png);
-  padding: 0px 10px 0px 10px;
-  background-position: center;
-  background-repeat: no-repeat;
-}
-
 #search {
   font-family: $base-font-family;
   font-size: $h3-size;
-  width: 80%;
 }
 
 #search-suggestion {
@@ -44,23 +19,3 @@
 #search-suggestion .suggestion-item.selected, #search-suggestion .suggestion-item:hover {
   padding: $one-baseline 0px $one-baseline 22px;
 }
-
-
-
-.export {
-  cursor: pointer;
-  text-align: right;
-  width: 60px;
-  float: right;
-  color: $dark-grey;
-  font-size: $h5-size;
-  margin: 14px $doc-margin 12px 12px ;
-}
-
-.export:before {
-  content: "";
-  background: url(../img/export.png);
-  padding: 0px 9px 0px 9px;
-  background-position: center;
-  background-repeat: no-repeat;
-}
\ No newline at end of file
diff --git a/res/templates/index.html b/res/templates/index.html
index 9179d50c..8a98b83e 100644
--- a/res/templates/index.html
+++ b/res/templates/index.html
@@ -18,33 +18,6 @@
       </div>
     </div>
   </div>
-  <div class="search-bar">
-      <div class="search-input">
-        <input id="search" placeholder="Search for nodes and relationships"/>
-      </div>
-      <div id="search-suggestion" class="suggestion" style="display: none">
-      </div>
-      <div style="right: 200px; position: absolute;">
-		<ul class="dropdown-menu">
-			<li class="dropdown-item dropdown-menu-heading">Filter by node type</li>
-			<li class="dropdown-item dropdown-item-type dropdown-item-type-person" style="display:none">
-				<label><input type="checkbox" checked="checked" name="interest">Interest</label>
-			</li>
-			<li class="dropdown-item dropdown-item-type dropdown-item-type dropdown-item-type-Skill" style="display:none">
-				<label><input type="checkbox" checked="checked" name="skill">Skill</label>
-			</li>
-			<li class="dropdown-item dropdown-item-type dropdown-item-type-Club" style="display:none">
-				<label><input type="checkbox" checked="checked" name="club">Club</label>
-			</li>
-			<li class="dropdown-item dropdown-item-type dropdown-item-type-person" style="display:none">
-				<label><input type="checkbox" checked="checked" name="person">Person</label>
-			</li>
-			<li class="dropdown-item dropdown-item-type dropdown-item-type-Internship-proposal" style="display:none">
-				<label><input type="checkbox" checked="checked" name="internship-proposal">Intership Proposal</label>
-			</li>
-		</ul>
-       </div>
-  </div>
   <div id="intro-task" class="task-alert" style="display:none">
     <h3 class="task-desc">Connect between <span>yourself</span> and the  <span> clubs,</span><span> internship proposals,</span><span> skills,</span><span> and</span><span> scientific interests</span></span> you have:
     </h3>
@@ -52,6 +25,26 @@
   </div>
   <div id="tool-bar">
     <div class="tool_bar_btn" id="btn_export" title="Export"></div>
+    <div class="tool_bar_btn" id="btn_filter" title="Filter">
+         <ul class="dropdown-menu" id="menu__type-filter" style="display:none">
+           <li class="dropdown-item dropdown-menu-heading">Filter by node type</li>
+           <li class="dropdown-item dropdown-item-type dropdown-item-type-person">
+             <label><input type="checkbox" checked="checked" name="interest">Interest</label>
+           </li>
+           <li class="dropdown-item dropdown-item-type dropdown-item-type dropdown-item-type-Skill">
+             <label><input type="checkbox" checked="checked" name="skill">Skill</label>
+           </li>
+           <li class="dropdown-item dropdown-item-type dropdown-item-type-Club">
+             <label><input type="checkbox" checked="checked" name="club">Club</label>
+           </li>
+           <li class="dropdown-item dropdown-item-type dropdown-item-type-person">
+             <label><input type="checkbox" checked="checked" name="person">Person</label>
+           </li>
+           <li class="dropdown-item dropdown-item-type dropdown-item-type-Internship-proposal">
+             <label><input type="checkbox" checked="checked" name="internship-proposal">Internship Proposal</label>
+           </li>
+         </ul>
+    </div>
   </div>
   <div class="graph-view">
     <div class="input-container">