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 2016/02/17 07:37:21 UTC
ignite git commit: IGNITE-843 Fixed sql error style.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 5990bbcf3 -> 68d171c9f
IGNITE-843 Fixed sql error style.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/68d171c9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/68d171c9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/68d171c9
Branch: refs/heads/ignite-843-rc2
Commit: 68d171c9f09b7dda020d99d04914ffc1710d8d1f
Parents: 5990bbc
Author: Andrey <an...@gridgain.com>
Authored: Wed Feb 17 13:37:46 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Feb 17 13:37:46 2016 +0700
----------------------------------------------------------------------
.../src/main/js/public/stylesheets/style.scss | 9 +++++++++
modules/control-center-web/src/main/js/views/sql/sql.jade | 4 +---
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/68d171c9/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 adbfa1b..226b2b7 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
@@ -619,6 +619,15 @@ button.form-control {
line-height: 55px;
}
+ .sql-error-result {
+ padding: 10px 0;
+
+ text-align: center;
+ color: $brand-primary;
+
+ border-top: 1px solid $ignite-border-color;
+ }
+
.sql-empty-result {
margin-top: 10px;
margin-bottom: 10px;
http://git-wip-us.apache.org/repos/asf/ignite/blob/68d171c9/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 cc280d3..8627118 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
@@ -130,9 +130,7 @@ mixin chart-settings(mdl)
button.btn.btn-default.fa.fa-clock-o.tipLabel(title='Click to show refresh rate dialog' ng-class='{"btn-info": paragraph.rate && paragraph.rate.installed}' bs-popover data-template-url='/sql/paragraph-rate.html' data-placement='left' data-auto-close='1' data-trigger='click') {{rateAsString(paragraph)}}
label.tipLabel Page size:
button.select-toggle.fieldButton.btn.btn-default(ng-model='paragraph.pageSize' bs-options='item for item in pageSizes' bs-select bs-tooltip data-title='Max number of rows to show in query result as one page')
- .col-sm-12(ng-show='paragraph.errMsg')
- hr(style='margin-top: 0; margin-bottom: 10px')
- .sql-error-result(ng-show='paragraph.errMsg') Error: {{paragraph.errMsg}}
+ .col-sm-12.sql-error-result(ng-show='paragraph.errMsg') Error: {{paragraph.errMsg}}
.col-sm-12(ng-show='!paragraph.errMsg && paragraph.result != "none"')
hr(style='margin-top: 0; margin-bottom: 10px')
.sql-empty-result(ng-show='!paragraph.nonEmpty()') Result set is empty