You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by tb...@apache.org on 2018/10/30 17:35:58 UTC
[07/11] brooklyn-ui git commit: height can vary by a few px depending
on pads etc so be slightly more generous with max to prevent multiline from
kicking in
height can vary by a few px depending on pads etc so be slightly more generous with max to prevent multiline from kicking in
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/e8788475
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/e8788475
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/e8788475
Branch: refs/heads/master
Commit: e8788475e371f6af5da76bf9774f0a144dc1b176
Parents: ee8bc89
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Oct 30 13:00:42 2018 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Oct 30 13:01:42 2018 +0000
----------------------------------------------------------------------
.../app/components/catalog-selector/catalog-selector.directive.js | 2 +-
.../app/views/main/graphical/graphical.state.less | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/e8788475/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
----------------------------------------------------------------------
diff --git a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
index efe0861..109bf45 100644
--- a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
+++ b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
@@ -259,7 +259,7 @@ function controller($scope, $element, $timeout, $q, $uibModal, $log, $templateCa
$timeout( () => {
// check do we need to show the multiline
let filters = angular.element($element[0].querySelector(".filters"));
- $scope.$apply( () => $scope.filterSettings.filtersMultilineAvailable = filters[0].scrollHeight > filters[0].offsetHeight );
+ $scope.$apply( () => $scope.filterSettings.filtersMultilineAvailable = filters[0].scrollHeight > filters[0].offsetHeight + 6 );
repaginate($scope, $element);
} );
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/e8788475/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.less
----------------------------------------------------------------------
diff --git a/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.less b/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.less
index 2d71564..3e5c5b8 100644
--- a/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.less
+++ b/ui-modules/blueprint-composer/app/views/main/graphical/graphical.state.less
@@ -82,7 +82,7 @@
display: flex;
flex-wrap: wrap;
- max-height: 24px; // if things wrap hide them
+ max-height: 27px; // if things wrap hide them
&.multiline { // unless toggled multiline
max-height: max-content;
}