This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit 70335dc416c483b772f9f903c42a0101855f17db Author: Alex Heneveld <[email protected]> AuthorDate: Wed Apr 21 09:29:32 2021 +0100 undo the centering of palette, looks bad w few elements add a bit of spacing instead --- .../catalog-selector/catalog-selector.template.html | 4 ++++ .../app/views/main/graphical/graphical.state.less | 14 +++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.template.html b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.template.html index a78c9fd..8419eff 100644 --- a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.template.html +++ b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.template.html @@ -96,6 +96,8 @@ </div> </div> + <div class="palette-spacer"></div> + <div class="row grid"> <!-- here and below, col-xs-3 or -4 or -2 all work giving different densities; this could be configurable ("compressed"=xs-2 w no labels, "normal"=xs-3, "big"=xs-4) --> @@ -144,6 +146,8 @@ </div> </div> + <div class="palette-spacer"></div> + <div class="catalog-palette-footer"> <div uib-pagination total-items="searchedItems.length" items-per-page="pagination.itemsPerPage" ng-model="pagination.page" boundary-link-numbers="true" rotate="false" max-size="4" ng-show="searchedItems.length > pagination.itemsPerPage" class="pagination-sm pull-right"></div> <ng-include src="templateUrls.footer"/> 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 dfb6a30..915d352 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 @@ -143,13 +143,21 @@ margin-left: 0; margin-right: 0; } - + + .palette-spacer { + max-height: 12px; + height: 6px; + flex: 10 10 auto; // doesn't work to grow/shrink as hoped, but still looks better + } + &, .palette-full-height-wrapper { display: flex; flex-direction: column; - justify-content: space-between; - flex: 1 1 auto; + // this looks bad if just a few elements being shown + //justify-content: space-between; + + flex: 0 0 auto; margin-left: 0; margin-right: 0; }
