You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2016/02/09 10:26:46 UTC

[47/51] [abbrv] ignite git commit: IGNITE-843 Minor ui fix

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-rc3
Commit: 9ba3e22f4c173cef2bdf8f0608fd4d34cb36ad7c
Parents: e71b2bd
Author: Andrey <an...@gridgain.com>
Authored: Tue Feb 9 15:44:24 2016 +0700
Committer: Andrey <an...@gridgain.com>
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