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:35:57 UTC
incubator-ignite git commit: IGNITE-843 Added scroll for large
dropdown and move "Select all to top".
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 5f2cf5327 -> 44fd15a60
IGNITE-843 Added scroll for large dropdown and move "Select all to top".
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/44fd15a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/44fd15a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/44fd15a6
Branch: refs/heads/ignite-843
Commit: 44fd15a60392fc02a8c7dde66ed92a1c66e715b7
Parents: 5f2cf53
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Aug 21 17:36:14 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Aug 21 17:36:14 2015 +0700
----------------------------------------------------------------------
.../src/main/js/public/stylesheets/style.scss | 6 ++++++
.../src/main/js/views/templates/select.jade | 8 ++++----
2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44fd15a6/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 307fa1d..e9a58cb 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
@@ -258,6 +258,12 @@ hr {
}
}
+.dropdown-menu {
+ height: 20em;
+ overflow: scroll;
+ overflow-x: hidden;
+}
+
.theme-line .sidebar-nav ul li .subcategory {
padding-left: 15px;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44fd15a6/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 b219f13..4b96830 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
@@ -15,12 +15,12 @@
limitations under the License.
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='$selectNone()') {{$noneText}}
+ hr(style='margin: 5px 0')
li(role='presentation' ng-repeat='match in $matches')
hr(ng-if='match.value == undefined' style='margin: 5px 0')
a(style='cursor: default; padding: 3px 6px;' role='menuitem' tabindex='-1' ng-class='{active: $isActive($index)}' ng-click='$select($index, $event)')
i(class='{{$iconCheckmark}}' ng-if='$isActive($index)' ng-class='{active: $isActive($index)}' style='color: #ec1c24; margin-left: 15px; line-height: 20px; float: right;background-color: transparent;')
span(ng-bind='match.label')
- li(ng-if='$showAllNoneButtons || ($isMultiple && $matches.length > 5)')
- hr(style='margin: 5px 0')
- a(ng-click='$selectAll()') {{$allText}}
- a(ng-click='$selectNone()') {{$noneText}}
\ No newline at end of file