Repository: ignite Updated Branches: refs/heads/ignite-843-rc1 a2e00c28c -> 5427b87d2
IGNITE-1706 Fixed editor UI Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5427b87d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5427b87d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5427b87d Branch: refs/heads/ignite-843-rc1 Commit: 5427b87d2c5aa61c42ee77798d1c5938b22ee032 Parents: a2e00c2 Author: Andrey <[email protected]> Authored: Tue Oct 20 16:46:19 2015 +0700 Committer: Andrey <[email protected]> Committed: Tue Oct 20 16:46:19 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/public/stylesheets/style.scss | 20 +++++++++++++++++--- .../src/main/js/views/sql/sql.jade | 8 +++++--- 2 files changed, 22 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5427b87d/modules/control-center-web/src/main/js/public/stylesheets/style.scss ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss index 5fa1f97..cd38de5 100644 --- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss +++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss @@ -479,10 +479,24 @@ button.form-control { line-height: 44px; height: 44px; margin: 0; - } - .btn-group { - margin: -5px 0 0 10px; + label { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + .btn-group { + float: right; + line-height: $line-height-base; + top: 0.4em; + margin-left: 5px; + } + + > i.btn { + float: right; + line-height: 44px; + } } input { http://git-wip-us.apache.org/repos/asf/ignite/blob/5427b87d/modules/control-center-web/src/main/js/views/sql/sql.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/sql/sql.jade b/modules/control-center-web/src/main/js/views/sql/sql.jade index 1f1eb2f..c4baf89 100644 --- a/modules/control-center-web/src/main/js/views/sql/sql.jade +++ b/modules/control-center-web/src/main/js/views/sql/sql.jade @@ -54,13 +54,15 @@ block container div(bs-affix) .docs-header.notebook-header h1.col-sm-6(ng-hide='notebook.edit') - label {{notebook.name}} .btn-group +btn-toolbar('fa-pencil', 'notebook.edit = true;notebook.editName = notebook.name', 'Rename notebook') +btn-toolbar('fa-trash', 'removeNotebook()', 'Remove notebook') + .input-tip + label {{notebook.name}} h1.col-sm-6(ng-show='notebook.edit') - input.sql-name-input(ng-model='notebook.editName' required on-enter='renameNotebook(notebook.editName)' on-escape='notebook.edit = false;') - i.tipLabel.fa.fa-floppy-o(ng-show='notebook.editName' ng-click='renameNotebook(notebook.editName)' bs-tooltip data-title='Save notebook name' data-trigger='hover') + i.btn.fa.fa-floppy-o(ng-show='notebook.editName' ng-click='renameNotebook(notebook.editName)' bs-tooltip data-title='Save notebook name' data-trigger='hover') + .input-tip + input.form-control(ng-model='notebook.editName' required on-enter='renameNotebook(notebook.editName)' on-escape='notebook.edit = false;') .pull-right +btn-toolbar('fa-plus', 'addParagraph()', 'Add new query') .block-callout-parent
