From 57ce7138915decbc1585c183988874f08cf6b07c Mon Sep 17 00:00:00 2001 From: Marliana Lara Date: Tue, 2 May 2017 10:54:45 -0400 Subject: [PATCH] Stretch standard out panes to page height * Fix #5962 * Give StandardOut-container a fixed height so flex children will stretch to fill 100%. * Edit overflow and height properties to make panel content scrollable and visible --- awx/ui/client/legacy-styles/lists.less | 2 +- awx/ui/client/src/shared/layouts/one-plus-one.less | 1 + awx/ui/client/src/standard-out/standard-out.block.less | 9 +++------ 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/awx/ui/client/legacy-styles/lists.less b/awx/ui/client/legacy-styles/lists.less index 96b24aeb69..06a8b5b3ef 100644 --- a/awx/ui/client/legacy-styles/lists.less +++ b/awx/ui/client/legacy-styles/lists.less @@ -60,7 +60,7 @@ table, tbody { height: 40px; font-size: 14px; color: @list-item; - border-bottom: 1px solid #d7d7d7; + border-bottom: 1px solid @default-white-button-bord; } .List-tableRow:last-of-type { diff --git a/awx/ui/client/src/shared/layouts/one-plus-one.less b/awx/ui/client/src/shared/layouts/one-plus-one.less index 10be58981d..e7479cdc5b 100644 --- a/awx/ui/client/src/shared/layouts/one-plus-one.less +++ b/awx/ui/client/src/shared/layouts/one-plus-one.less @@ -13,6 +13,7 @@ flex-direction: row; @media screen and(max-width: @breakpoint){ flex-direction: column; + height: 100%; } } diff --git a/awx/ui/client/src/standard-out/standard-out.block.less b/awx/ui/client/src/standard-out/standard-out.block.less index 684677dee8..fe55a2b766 100644 --- a/awx/ui/client/src/standard-out/standard-out.block.less +++ b/awx/ui/client/src/standard-out/standard-out.block.less @@ -8,6 +8,7 @@ standard-out-log { flex: 5; display: flex; + overflow: hidden; } .StandardOut-preContent{ @@ -17,7 +18,7 @@ standard-out-log { } .StandardOut-container { - .OnePlusOne-container(100%, @breakpoint-md); + .OnePlusOne-container(80vh, @breakpoint-md); &.fullscreen { .StandardOut-rightPanel { @@ -47,7 +48,7 @@ standard-out-log { } .StandardOut-consoleOutput { - height: 493px; + height: 94%; } } @@ -57,7 +58,6 @@ standard-out-log { .StandardOut-consoleOutput { margin-top: 25px; - background-color: @default-secondary-bg; border-radius: 5px; min-height: 300px; max-height: 100vh; @@ -65,9 +65,6 @@ standard-out-log { width: 100%; overflow: auto; - #pre-container { - overflow: visible !important; - } } .StandardOut-details {