From d565faff98d156971139c808ec245c83eb263acd Mon Sep 17 00:00:00 2001
From: Akita Noek <anoek@ansible.com>
Date: Thu, 2 Jun 2016 14:33:24 -0400
Subject: [PATCH 1/3] typo fix

---
 awx/ui/client/src/shared/layouts/one-plus-one.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 ee578d995b..36df990c8f 100644
--- a/awx/ui/client/src/shared/layouts/one-plus-one.less
+++ b/awx/ui/client/src/shared/layouts/one-plus-one.less
@@ -10,7 +10,7 @@
 .OnePlusOne-container(@height: 100%; @breakpoint: 900px){
 	height: @height;
 	display: flex;
-	flex-diration: row;
+	flex-direction: row;
 	@media screen and(max-width: @breakpoint){
 		flex-direction: column;
 	}

From a9426aaeb9f70386f34d458fd3fdb89f1bb21b42 Mon Sep 17 00:00:00 2001
From: Akita Noek <anoek@ansible.com>
Date: Thu, 2 Jun 2016 16:42:06 -0400
Subject: [PATCH 2/3] stdout sytle updates

* Fixed column width to 50% for both job stdout view and inventory update
script output view
* Fixed scrolling behavior so we don't have two elements doing scrolling
(inner was doing width, outter was doing height)
* Reduced max height for stdout jt output view to 900px down from
1600px
* Flexified inner output window on inventory script output view so the
gray output area always fills the height of the panel

 #2127 @2028
---
 .../src/job-detail/job-detail.block.less      |  6 +++++
 .../src/standard-out/standard-out.block.less  | 23 +++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/awx/ui/client/src/job-detail/job-detail.block.less b/awx/ui/client/src/job-detail/job-detail.block.less
index 6e6f4810da..0d6c921808 100644
--- a/awx/ui/client/src/job-detail/job-detail.block.less
+++ b/awx/ui/client/src/job-detail/job-detail.block.less
@@ -30,6 +30,12 @@
 
 .JobDetail-rightSide{
     .OnePlusOne-panel--right(100%, @breakpoint-md);
+    @media (min-width: @breakpoint-md) {
+        max-width: 50%;
+    }
+    @media (max-width: @breakpoint-md - 1px) {
+        padding-right: 15px;
+    }
 }
 .JobDetail-panelHeader{
     display: flex;
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 ccaaedead4..4dd36e27e3 100644
--- a/awx/ui/client/src/standard-out/standard-out.block.less
+++ b/awx/ui/client/src/standard-out/standard-out.block.less
@@ -3,6 +3,11 @@
 
 /** @define StandardOut */
 
+standard-out-log {
+    flex: 5;
+    display: flex;
+}
+
 .StandardOut-preContent{
     font-size: 12px;
     padding: 0 20px 0 20px;
@@ -18,6 +23,15 @@
 
 .StandardOut-rightPanel {
     .OnePlusTwo-right--panel(590px);
+
+    @media (min-width: 900px) {
+        max-width: 50%;
+    }
+
+    .Panel {
+        display: flex;
+        flex-direction: column;
+    }
 }
 
 .StandardOut-panelHeader {
@@ -26,11 +40,16 @@
 
 .StandardOut-consoleOutput {
     margin-top: 25px;
-    min-height: 200px;
     background-color: @default-secondary-bg;
     border-radius: 5px;
-    max-height: 1600px;
+    min-height: 300px;
+    max-height: 900px;
+    width: 100%;
+
     overflow: auto;
+    #pre-container {
+        overflow: visible !important;
+    }
 }
 
 .StandardOut-details {

From 1bcb80b621c9ae39d40f11f4f66697372ae9e54b Mon Sep 17 00:00:00 2001
From: Akita Noek <anoek@ansible.com>
Date: Fri, 3 Jun 2016 11:33:45 -0400
Subject: [PATCH 3/3] Made stdout window size nicely to fill the remaining
 height in the browser

Resolves PR feedback and takes care of #1575 along the way
---
 awx/ui/client/src/standard-out/standard-out.block.less | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 4dd36e27e3..33faba6273 100644
--- a/awx/ui/client/src/standard-out/standard-out.block.less
+++ b/awx/ui/client/src/standard-out/standard-out.block.less
@@ -43,7 +43,8 @@ standard-out-log {
     background-color: @default-secondary-bg;
     border-radius: 5px;
     min-height: 300px;
-    max-height: 900px;
+    max-height: 100vh;
+    height: ~"calc(100vh - 245px)";
     width: 100%;
 
     overflow: auto;