🚧 Change position of the search button

ENT8R · May 23, 2021 · 2a2f855 · 2a2f855
1 parent 823a5e8
commit 2a2f855
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/app/templates/includes/header.hbs b/app/templates/includes/header.hbs
@@ -21,17 +21,24 @@
     </a>
   </section>
 
-  <section class="navbar-section">
-    <svg class="p-centered p-1 hide-md" height="44">
+  <section class="navbar-section hide-md">
+    <svg class="p-centered p-1" height="44">
       <use xlink:href="#assets-notesreview-horizontal"></use>
     </svg>
   </section>
 
   <section class="navbar-section">
-    <button class="btn btn-primary modal-trigger flex-grow" data-modal="filter" aria-label="Apply a filter to the selection" data-i18n>
+    <button id="search" class="btn btn-primary tooltip tooltip-bottom flex-grow m-1" data-i18n data-i18n-data-tooltip="description.worldwideQuery">
+      <svg class="icon"><use xlink:href="#icon-search"></use></svg>
+      <span class="hide-xs" data-i18n="action.search">Search</span>
+      <svg id="fast-search" class="icon d-hide"><use xlink:href="#icon-flash"></use></svg>
+    </button>
+    <!-- TODO: Add translation -->
+    <button class="btn btn-primary modal-trigger flex-grow m-1" data-modal="filter" aria-label="Apply a filter to the selection" data-i18n>
       <svg class="icon"><use xlink:href="#icon-filter"></use></svg>
       <span class="hide-xs" data-i18n>Filter</span>
     </button>
+
     <button class="btn btn-action modal-trigger m-1" data-modal="help" aria-label="Open frequently asked questions" data-i18n data-i18n-aria-label="accessibility.openFaq">
       <svg class="icon"><use xlink:href="#icon-help"></use></svg>
     </button>

diff --git a/app/templates/modals/filter.hbs b/app/templates/modals/filter.hbs
@@ -9,14 +9,6 @@
     </div>
 
     <div class="modal-footer">
-      <a id="search" class="btn btn-primary btn-lg modal-close float-left tooltip"
-                     data-i18n data-i18n-data-tooltip="description.worldwideQuery">
-        <svg class="icon"><use xlink:href="#icon-search"></use></svg>
-        <!-- TODO: Maybe change wording to filter or apply? -->
-        <span data-i18n="action.search">Search</span>
-        <svg id="fast-search" class="icon d-hide"><use xlink:href="#icon-flash"></use></svg>
-      </a>
-
       <a class="btn btn-link modal-close" data-i18n="action.close">Close</a>
     </div>
   </div>