From 40c8cef821e30336f60f24e2efc9fe88e86a2715 Mon Sep 17 00:00:00 2001
From: Arik Fraimovich <arik@arikfr.com>
Date: Tue, 31 Jul 2018 15:09:23 +0300
Subject: [PATCH] Move format button next add new param button.

---
 client/app/assets/less/redash/query.less | 19 -------------------
 client/app/pages/queries/query.html      |  8 ++++----
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/client/app/assets/less/redash/query.less b/client/app/assets/less/redash/query.less
index fd1b7e616f..30231788a3 100644
--- a/client/app/assets/less/redash/query.less
+++ b/client/app/assets/less/redash/query.less
@@ -176,25 +176,6 @@ edit-in-place p.editable:hover {
   }
 }
 
-.editor__container {
-  .btn__format {
-    margin-top: -50px;
-    margin-right: 10px;
-    z-index: 999;
-    position: relative;
-    opacity: 0;
-    transition: transform 0.12s ease-out;
-    transition-duration: 0.3s;
-    transition-property: opacity;
-  }
-
-  &:hover {
-    .btn__format {
-      opacity: 1;
-    }
-  }
-}
-
 .paginator-container {
   text-align: center;
 }
diff --git a/client/app/pages/queries/query.html b/client/app/pages/queries/query.html
index e96780e629..4724cdb428 100644
--- a/client/app/pages/queries/query.html
+++ b/client/app/pages/queries/query.html
@@ -144,10 +144,6 @@ <h3>
               <div class="container p-15 m-b-10" style="height:100%;">
                 <p style="height:calc(100% - 40px); margin-bottom: 0px;" class="editor__container">
                   <query-editor query="query" schema="schema" syntax="dataSource.syntax"></query-editor>
-
-                  <button type="button" class="btn btn-default btn-s btn__format pull-right" ng-click="formatQuery()" title="Format">
-                    <span class="zmdi zmdi-format-indent-increase"></span>
-                  </button>
                 </p>
 
                 <div class="editor__control">
@@ -157,6 +153,10 @@ <h3>
                       <span ng-non-bindable>{{&nbsp;}}</span>
                     </button>
 
+                    <button type="button" class="btn btn-default" ng-click="formatQuery()" uib-tooltip="Format Query">
+                      <span class="zmdi zmdi-format-indent-increase"></span>
+                    </button>
+
                     <select class="form-control datasource-small flex-fill w-100" ng-disabled="!isQueryOwner || !sourceMode" ng-model="query.data_source_id"
                       ng-change="updateDataSource()" ng-options="ds.id as ds.name for ds in dataSources"></select>