ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject ignite git commit: # IGNITE-843 Added border for button groups
Date Wed, 23 Sep 2015 03:27:56 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843 3f26e32e7 -> a17b30f94


# IGNITE-843 Added border for button groups


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a17b30f9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a17b30f9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a17b30f9

Branch: refs/heads/ignite-843
Commit: a17b30f94b6c2fa394ccbf883f0b339d4f3bcf07
Parents: 3f26e32
Author: Andrey <anovikov@gridgain.com>
Authored: Wed Sep 23 10:28:01 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Wed Sep 23 10:28:01 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/sql-controller.js                | 5 ++++-
 .../src/main/js/public/stylesheets/style.scss                | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/a17b30f9/modules/control-center-web/src/main/js/controllers/sql-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js
index 384a3e9..cd8ce9e 100644
--- a/modules/control-center-web/src/main/js/controllers/sql-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js
@@ -267,10 +267,13 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
 
 
     var _columnFilter = function(paragraph) {
-        return !paragraph.disabledSystemColumns && paragraph.systemColumns ? _allColumn
: _hideColumn;
+        return paragraph.disabledSystemColumns || paragraph.systemColumns ? _allColumn :
_hideColumn;
     };
 
     $scope.toggleSystemColumns = function (paragraph) {
+        if (paragraph.disabledSystemColumns)
+            return;
+
         paragraph.systemColumns = !paragraph.systemColumns;
 
         paragraph.columnFilter = _columnFilter(paragraph);

http://git-wip-us.apache.org/repos/asf/ignite/blob/a17b30f9/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 a15811f..f6daddb 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
@@ -394,6 +394,14 @@ button, a.btn {
     > button, a.btn {
         margin-right: 0;
     }
+
+    .btn + .btn {
+        margin-left: 0;
+    }
+
+    > .btn-primary:not(.dropdown-toggle) {
+        border-right-color: black;
+    }
 }
 
 h1,


Mime
View raw message