You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/09/11 05:01:24 UTC
ignite git commit: # GG-843 Notebook header affix.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 473390380 -> f2d30063f
# GG-843 Notebook header affix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f2d30063
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f2d30063
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f2d30063
Branch: refs/heads/ignite-843
Commit: f2d30063f1b433557d45945ee92c079f85142980
Parents: 4733903
Author: Vasiliy Sisko <vs...@gridgain.com>
Authored: Fri Sep 11 10:02:04 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Sep 11 10:02:04 2015 +0700
----------------------------------------------------------------------
.../src/main/js/public/stylesheets/style.scss | 11 +++++++--
.../src/main/js/views/sql/sql.jade | 25 ++++++++++----------
2 files changed, 22 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f2d30063/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 86abf7d..ba9911f 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
@@ -782,11 +782,18 @@ h3 {
}
}
-div.affix.padding-top-dflt {
+.affix {
z-index: 910;
background-color: white;
+
hr {
- margin-bottom: 0;
+ margin: 0;
+ }
+}
+
+.affix.padding-top-dflt {
+ hr {
+ margin-top: 10px;
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f2d30063/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 aa7eb4a..b30f57b 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
@@ -34,18 +34,19 @@ block container
.row
.col-sm-12(ng-init='noteId = "#{noteId}"')
.docs-content(ng-controller='sqlController' )
- .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.edit_name = notebook.name', 'Rename notebook')
- +btn-toolbar('fa-trash', 'removeNotebook()', 'Remove notebook')
- h1.col-sm-6(ng-show='notebook.edit')
- input.sql-name-input(ng-model='notebook.edit_name' required on-enter='renameNotebook(notebook.edit_name)' on-escape='notebook.edit = false;')
- i.tipLabel.fa.fa-floppy-o(ng-show='notebook.edit_name' ng-click='renameNotebook(notebook.edit_name)' bs-tooltip data-title='Save notebook name' data-trigger='hover')
- .pull-right
- +btn-toolbar('fa-plus', 'addParagraph()', 'Add new query')
- hr
+ 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.edit_name = notebook.name', 'Rename notebook')
+ +btn-toolbar('fa-trash', 'removeNotebook()', 'Remove notebook')
+ h1.col-sm-6(ng-show='notebook.edit')
+ input.sql-name-input(ng-model='notebook.edit_name' required on-enter='renameNotebook(notebook.edit_name)' on-escape='notebook.edit = false;')
+ i.tipLabel.fa.fa-floppy-o(ng-show='notebook.edit_name' ng-click='renameNotebook(notebook.edit_name)' bs-tooltip data-title='Save notebook name' data-trigger='hover')
+ .pull-right
+ +btn-toolbar('fa-plus', 'addParagraph()', 'Add new query')
+ hr
.docs-body.paragraphs
.panel-group(bs-collapse ng-model='notebook.expandedParagraphs' data-allow-multiple='true' data-start-collapsed='false')
.panel.panel-default(ng-repeat='paragraph in notebook.paragraphs')