Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 40FBA180EA for ; Tue, 9 Feb 2016 08:44:29 +0000 (UTC) Received: (qmail 82992 invoked by uid 500); 9 Feb 2016 08:44:29 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 82959 invoked by uid 500); 9 Feb 2016 08:44:29 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 82950 invoked by uid 99); 9 Feb 2016 08:44:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Feb 2016 08:44:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E5926E0099; Tue, 9 Feb 2016 08:44:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.apache.org Message-Id: <74a4077dbc7c40a3b907ec9b910a0c20@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-843 Minor ui fix Date: Tue, 9 Feb 2016 08:44:28 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/ignite-843-rc2 e71b2bd91 -> 9ba3e22f4 IGNITE-843 Minor ui fix Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9ba3e22f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9ba3e22f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9ba3e22f Branch: refs/heads/ignite-843-rc2 Commit: 9ba3e22f4c173cef2bdf8f0608fd4d34cb36ad7c Parents: e71b2bd Author: Andrey Authored: Tue Feb 9 15:44:24 2016 +0700 Committer: Andrey Committed: Tue Feb 9 15:44:24 2016 +0700 ---------------------------------------------------------------------- .../src/main/js/public/stylesheets/style.scss | 21 ++++++++++++++++---- .../src/main/js/views/sql/sql.jade | 5 +++-- 2 files changed, 20 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9ba3e22f/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 2d36ebe..08a6082 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 @@ -626,10 +626,23 @@ button.form-control { color: $ignite-placeholder-color; } - .sql-error-result { - margin-bottom: 10px; - text-align: center; - color: $brand-danger; + .sql-next { + float: right; + + .disabled { + cursor: default; + text-decoration: none; + } + + a { + margin-right: 5px; + margin-bottom: 5px; + } + + i { + margin-top: 3px; + margin-right: 10px; + } } } http://git-wip-us.apache.org/repos/asf/ignite/blob/9ba3e22f/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 f4893dd..cc280d3 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 @@ -177,5 +177,6 @@ mixin chart-settings(mdl) hr(style='margin-top: 0; margin-bottom: 5px') a(ng-show='paragraph.queryArgs.type' style='float: left; margin-left: 10px; margin-bottom: 5px' ng-click='showResultQuery(paragraph)') Show query - i.fa.fa-chevron-circle-right(ng-show=nextVisibleCondition style='float: right;margin-right: 10px; margin-top: 3px' ng-click='nextPage(paragraph)') - a(ng-show=nextVisibleCondition ng-disabled='paragraph.loading' ng-click='!paragraph.loading && nextPage(paragraph)' style='float: right; margin-bottom: 5px;margin-right: 5px;') Next + .sql-next(ng-show=nextVisibleCondition ) + i.fa.fa-chevron-circle-right(ng-class='{disabled: paragraph.loading}' ng-click='!paragraph.loading && nextPage(paragraph)') + a(ng-class='{disabled: paragraph.loading}' ng-click='!paragraph.loading && nextPage(paragraph)') Next