Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move format button next Add New Param button. #2709

Merged
merged 1 commit into from
Jul 31, 2018
Merged

Move format button next Add New Param button. #2709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions client/app/assets/less/redash/query.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
8 changes: 4 additions & 4 deletions client/app/pages/queries/query.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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>

Expand Down