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/08/26 13:06:14 UTC
[1/2] ignite git commit: # GG-843 Remove cursor from summary.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 517e2e637 -> 89df91993
# GG-843 Remove cursor from summary.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5bb0f096
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5bb0f096
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5bb0f096
Branch: refs/heads/ignite-843
Commit: 5bb0f09687c54ded0ea8733428f7739726ae9fb8
Parents: 3ba8145
Author: Andrey <an...@gridgain.com>
Authored: Wed Aug 26 18:06:18 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Aug 26 18:06:18 2015 +0700
----------------------------------------------------------------------
.../src/main/js/public/stylesheets/style.scss | 6 ++++--
modules/control-center-web/src/main/js/views/sql/sql.jade | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5bb0f096/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 b3ccfdd..9f644a4 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
@@ -1436,6 +1436,8 @@ a {
.ace_hidden-cursors { opacity:0 }
+.ace_cursor { opacity:0 }
+
.ace_editor, #ace_document {
margin: 0.65em 0 0 0;
@@ -1453,8 +1455,8 @@ a {
}
}
-.ace-preview {
- .ace_cursor { opacity:0 }
+.sql-editor {
+ .ace_cursor { opacity:1 }
}
.preview-legend {
http://git-wip-us.apache.org/repos/asf/ignite/blob/5bb0f096/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 d344119..b5a03c9 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
@@ -52,7 +52,7 @@ block container
.panel-body(ng-show='paragraph.editor')
.row
.col-xs-8.col-sm-9(style='border-right: 1px solid #eee')
- div(style='height: 200px' ui-ace='{ theme: "chrome", mode: "sql",' +
+ .sql-editor(style='height: 200px' ui-ace='{ theme: "chrome", mode: "sql",' +
'require: ["ace/ext/language_tools"],' +
'rendererOptions: {showPrintMargin: false, highlightGutterLine: false, fontSize: 14},' +
'advanced: {enableSnippets: false, enableBasicAutocompletion: true, enableLiveAutocompletion: true}}' ng-model='paragraph.query'
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Posted by an...@apache.org.
Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/89df9199
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/89df9199
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/89df9199
Branch: refs/heads/ignite-843
Commit: 89df9199351e7e467b7ce5076fe19aac320fb3b1
Parents: 5bb0f09 517e2e6
Author: Andrey <an...@gridgain.com>
Authored: Wed Aug 26 18:06:35 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Aug 26 18:06:35 2015 +0700
----------------------------------------------------------------------
modules/control-center-web/src/main/js/package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------