From 3db571d26ccd2a04773b0dc8431643e77341f457 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Wed, 19 Jul 2017 16:25:01 -0400 Subject: [PATCH] excise system tracking and fix list action layout stuff --- awx/ui/client/legacy-styles/lists.less | 11 ++++++++--- .../related/nested-hosts/group-nested-hosts.list.js | 13 ------------- .../inventories/related/hosts/related-host.list.js | 13 ------------- .../src/shared/smart-search/smart-search.block.less | 6 ++++++ 4 files changed, 14 insertions(+), 29 deletions(-) diff --git a/awx/ui/client/legacy-styles/lists.less b/awx/ui/client/legacy-styles/lists.less index 35e6392219..a0f22e53d5 100644 --- a/awx/ui/client/legacy-styles/lists.less +++ b/awx/ui/client/legacy-styles/lists.less @@ -485,7 +485,7 @@ table, tbody { } } -@media (max-width: 600px) { +@media (max-width: 700px) { .List-header { flex-direction: column; align-items: stretch; @@ -502,8 +502,13 @@ table, tbody { .List-well { margin-top: 20px; } - .List-action:not(.ng-hide) ~ .List-action:not(.ng-hide) { - margin-left: 0; + + .List-action { + margin-left: 20px; + } + + .List-actionsInner { + margin-left: -20px; } } diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js index 10cbcb48bd..8b8322aa08 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js @@ -104,19 +104,6 @@ export default ['i18n', function(i18n) { // TODO: we don't always want to show this ngShow: true }, - system_tracking: { - buttonContent: i18n._('System Tracking'), - ngClick: 'systemTracking()', - awToolTip: i18n._("Select one or two hosts by clicking the checkbox beside the host. System tracking offers the ability to compare the results of two scan runs from different dates on one host or the same date on two hosts."), - dataTipWatch: "systemTrackingTooltip", - dataPlacement: 'top', - awFeature: 'system_tracking', - actionClass: 'btn List-buttonDefault system-tracking', - ngDisabled: 'systemTrackingDisabled || !hostsSelected', - showTipWhenDisabled: true, - tooltipInnerClass: "Tooltip-wide", - ngShow: true - }, refresh: { mode: 'all', awToolTip: i18n._("Refresh the page"), diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js index bd230354ae..51ac3d1b41 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js @@ -117,19 +117,6 @@ export default ['i18n', function(i18n) { // TODO: we don't always want to show this ngShow: true }, - system_tracking: { - buttonContent: i18n._('System Tracking'), - ngClick: 'systemTracking()', - awToolTip: i18n._("Select one or two hosts by clicking the checkbox beside the host. System tracking offers the ability to compare the results of two scan runs from different dates on one host or the same date on two hosts."), - dataTipWatch: "systemTrackingTooltip", - dataPlacement: 'top', - awFeature: 'system_tracking', - actionClass: 'btn List-buttonDefault system-tracking', - ngDisabled: 'systemTrackingDisabled || !hostsSelected', - showTipWhenDisabled: true, - tooltipInnerClass: "Tooltip-wide", - ngShow: true - }, create: { mode: 'all', ngClick: "createHost()", diff --git a/awx/ui/client/src/shared/smart-search/smart-search.block.less b/awx/ui/client/src/shared/smart-search/smart-search.block.less index 9c7262f6d5..63657b539c 100644 --- a/awx/ui/client/src/shared/smart-search/smart-search.block.less +++ b/awx/ui/client/src/shared/smart-search/smart-search.block.less @@ -243,3 +243,9 @@ width: 100%; } } + +@media (max-width: 700px) { + .SmartSearch-bar { + width: 100%; + } +}