diff --git a/awx/ui/static/js/helpers/inventory.js b/awx/ui/static/js/helpers/inventory.js index 607de905e5..bfbff2bf58 100644 --- a/awx/ui/static/js/helpers/inventory.js +++ b/awx/ui/static/js/helpers/inventory.js @@ -14,18 +14,18 @@ angular.module('InventoryHelper', ['RestServices', 'Utilities', 'OrganizationLis 'InventoryHelper', 'InventoryFormDefinition', 'ParseHelper', 'SearchHelper', 'VariablesHelper', ]) -.factory('GetContainerHeight', [ function() { +.factory('GetGroupContainerHeight', [ function() { return function() { return $(window).height() - $('.main-menu').outerHeight() - $('#main_tabs').outerHeight() - $('#breadcrumbs').outerHeight() - $('.site-footer').outerHeight() - $('#groups-container .list-actions').outerHeight() - $('#groups-table-header').height() - 15; }; }]) -.factory('SetGroupContainerHeight', [ 'GetContainerHeight', function(GetContainerHeight) { +.factory('SetGroupContainerHeight', [ 'GetGroupContainerHeight', function(GetGroupContainerHeight) { return function() { var height; if ($(window).width() > 1210) { - height = GetContainerHeight(); + height = GetGroupContainerHeight(); $('#groups-container .list-table-container').height(height); } else { diff --git a/awx/ui/static/less/ansible-ui.less b/awx/ui/static/less/ansible-ui.less index d585910eed..7680e313ae 100644 --- a/awx/ui/static/less/ansible-ui.less +++ b/awx/ui/static/less/ansible-ui.less @@ -1332,6 +1332,9 @@ input[type="checkbox"].checkbox-no-label { .list-table-container { overflow: auto; } + .list-actions { + margin-bottom: 0; + } } #inventories_table i[class*="icon-job-"],