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 2015/08/21 12:59:35 UTC
incubator-ignite git commit: IGNITE-843 Fixed scroll.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 44fd15a60 -> 41c2abaad
IGNITE-843 Fixed scroll.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/41c2abaa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/41c2abaa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/41c2abaa
Branch: refs/heads/ignite-843
Commit: 41c2abaad4b11933877e838d63010df3b13ded88
Parents: 44fd15a
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Aug 21 17:59:50 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Aug 21 17:59:50 2015 +0700
----------------------------------------------------------------------
.../control-center-web/src/main/js/public/stylesheets/style.scss | 4 ++--
.../control-center-web/src/main/js/views/templates/select.jade | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/41c2abaa/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 e9a58cb..4e34209 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
@@ -259,8 +259,8 @@ hr {
}
.dropdown-menu {
- height: 20em;
- overflow: scroll;
+ max-height: 20em;
+ overflow: auto;
overflow-x: hidden;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/41c2abaa/modules/control-center-web/src/main/js/views/templates/select.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/templates/select.jade b/modules/control-center-web/src/main/js/views/templates/select.jade
index 4b96830..16205c5 100644
--- a/modules/control-center-web/src/main/js/views/templates/select.jade
+++ b/modules/control-center-web/src/main/js/views/templates/select.jade
@@ -16,7 +16,7 @@
ul.select.dropdown-menu(tabindex='-1' ng-show='$isVisible()' role='select')
li(ng-if='$showAllNoneButtons || ($isMultiple && $matches.length > 5)')
- a(ng-click='$selectAll()') {{$allText}}
+ a(ng-click='$selectAll()') {{$allText}} ({{$matches.length}})
a(ng-click='$selectNone()') {{$noneText}}
hr(style='margin: 5px 0')
li(role='presentation' ng-repeat='match in $matches')