From 4c665171ed299188a971b2a20299e1d2a5be8902 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Wed, 22 Feb 2017 15:52:24 -0500
Subject: [PATCH] fix job results styling

---
 awx/ui/client/legacy-styles/stdout.less                   | 2 +-
 .../src/job-results/host-event/host-event.block.less      | 2 +-
 .../job-results-stdout/job-results-stdout.block.less      | 2 +-
 awx/ui/client/src/job-results/parse-stdout.service.js     | 8 ++++++++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/awx/ui/client/legacy-styles/stdout.less b/awx/ui/client/legacy-styles/stdout.less
index 70f83fa31f..822c10e759 100644
--- a/awx/ui/client/legacy-styles/stdout.less
+++ b/awx/ui/client/legacy-styles/stdout.less
@@ -46,7 +46,7 @@
 .ansi3 { font-weight: italic; }
 .ansi4 { text-decoration: underline; }
 .ansi9 { text-decoration: line-through; }
-.ansi30 { color: @default-stdout-txt; }
+.ansi30 { color: @default-data-txt; }
 .ansi31 { color: @default-err; }
 .ansi1.ansi31 {
     color: @default-unreachable;
diff --git a/awx/ui/client/src/job-results/host-event/host-event.block.less b/awx/ui/client/src/job-results/host-event/host-event.block.less
index 6ae8f66c27..d638011fbe 100644
--- a/awx/ui/client/src/job-results/host-event/host-event.block.less
+++ b/awx/ui/client/src/job-results/host-event/host-event.block.less
@@ -159,6 +159,7 @@
     border: 1px solid #ccc;
     font-style: normal;
     background-color: @default-no-items-bord;
+    font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
 }
 
 .HostEvent-numberColumnPreload {
@@ -189,5 +190,4 @@
 .HostEvent-stdoutColumn{
     margin-left: 46px;
     padding-top: 4px;
-    font-family: monospace;
 }
diff --git a/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less b/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less
index dc4b1e7d15..15697e8e03 100644
--- a/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less
+++ b/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less
@@ -178,7 +178,7 @@
     color: @default-err;
 }
 
-.JobResultsStdOut-stdoutColumn {
+.JobResultsStdOut-stdoutColumn--clickable {
     cursor: pointer;
 }
 
diff --git a/awx/ui/client/src/job-results/parse-stdout.service.js b/awx/ui/client/src/job-results/parse-stdout.service.js
index 2c13881ad6..34b14f112c 100644
--- a/awx/ui/client/src/job-results/parse-stdout.service.js
+++ b/awx/ui/client/src/job-results/parse-stdout.service.js
@@ -28,6 +28,10 @@ export default ['$log', 'moment', function($log, moment){
 
                 // ansi classes
                 line = line.replace(/\[1;im/g, '<span class="JobResultsStdOut-cappedLine">');
+                line = line.replace(/\[0;30m/g, '<span class="ansi30">');
+                line = line.replace(/\[1;30m/g, '<span class="ansi1 ansi30">');
+                line = line.replace(/\[1;31m/g, '<span class="ansi1 ansi31">');
+                line = line.replace(/\[0;31m/g, '<span class="ansi1 ansi31">');
                 line = line.replace(/\[1;31m/g, '<span class="ansi1 ansi31">');
                 line = line.replace(/\[0;31m/g, '<span class="ansi1 ansi31">');
                 line = line.replace(/\[0;32m/g, '<span class="ansi32">');
@@ -48,6 +52,8 @@ export default ['$log', 'moment', function($log, moment){
                 line = line.replace(/u001b/g, '');
 
                 // ansi classes
+                line = line.replace(/\[0;30m/g, '');
+                line = line.replace(/\[1;30m/g, '');
                 line = line.replace(/\[1;31m/g, '');
                 line = line.replace(/\[0;31m/g, '');
                 line = line.replace(/\[0;32m/g, '');
@@ -210,6 +216,8 @@ export default ['$log', 'moment', function($log, moment){
                 if (line.indexOf("[0m") === -1) {
                     if (line.indexOf("[1;31m") > -1) {
                         colorCode = "[1;31m";
+                    } else if (line.indexOf("[1;30m") > -1) {
+                        colorCode = "[1;30m";
                     } else if (line.indexOf("[0;31m") > -1) {
                         colorCode = "[0;31m";
                     } else if (line.indexOf("[0;32m=") > -1) {