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 2c00e9eae5..a22cf4a8c2 100644 --- a/awx/ui/client/src/job-detail/job-detail.block.less +++ b/awx/ui/client/src/job-detail/job-detail.block.less @@ -5,7 +5,7 @@ @import '../shared/layouts/one-plus-one.less'; @breakpoint-md: 1200px; -@breakpoint-sm: 420px; +@breakpoint-sm: 623px; .JobDetail-tasks.section{ margin-top:40px; 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 5b5534f64d..cdeedd92c9 100644 --- a/awx/ui/client/src/shared/layouts/one-plus-one.less +++ b/awx/ui/client/src/shared/layouts/one-plus-one.less @@ -36,7 +36,7 @@ flex: 1 1; height: @height; width: 100%; - max-wdith: 50%; + max-width: 50%; margin-right: 0px; .Panel{ height: 100%; diff --git a/awx/ui/client/src/standard-out/adhoc/standard-out-adhoc.partial.html b/awx/ui/client/src/standard-out/adhoc/standard-out-adhoc.partial.html index 04c762e436..238ffb90a6 100644 --- a/awx/ui/client/src/standard-out/adhoc/standard-out-adhoc.partial.html +++ b/awx/ui/client/src/standard-out/adhoc/standard-out-adhoc.partial.html @@ -16,12 +16,12 @@
-
Name
+
Name
{{ job.module_name }}
-
STATUS
+
STATUS
{{ job.status }} @@ -29,33 +29,33 @@
-
STARTED
+
STARTED
{{ job.started | longDate }}
-
FINISHED
+
FINISHED
{{ job.finished | longDate }}
-
ELAPSED
+
ELAPSED
{{ job.elapsed }} seconds
-
Module Args
+
Module Args
{{ job.module_args }}
-
Inventory
+
Inventory
-
Credential
+
Credential
-
Launched By
+
Launched By
diff --git a/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html b/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html index 174160f4c8..d7724959ce 100644 --- a/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html +++ b/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html @@ -16,7 +16,7 @@
-
NAME
+
NAME
-
STATUS
+
STATUS
{{ job.status }} @@ -33,42 +33,42 @@
-
LICENSE ERROR
+
LICENSE ERROR
{{ job.license_error }}
-
STARTED
+
STARTED
{{ job.started | longDate }}
-
FINISHED
+
FINISHED
{{ job.finished | longDate }}
-
ELAPSED
+
ELAPSED
{{ job.elapsed }} seconds
-
LAUNCH TYPE
+
LAUNCH TYPE
{{ job.launch_type }}
-
CREDENTIAL
+
CREDENTIAL
-
GROUP
+
GROUP
-
SOURCE
+
SOURCE
{{ source }}
-
REGIONS
+
REGIONS
{{ source_regions }}
-
OVERWRITE
+
OVERWRITE
{{ job.overwrite }}
-
OVERWRITE VARS
+
OVERWRITE VARS
{{ job.overwrite_vars }}
diff --git a/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.partial.html b/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.partial.html index 67507383bd..48be9fde42 100644 --- a/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.partial.html +++ b/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.partial.html @@ -15,12 +15,12 @@
-
NAME
+
NAME
{{ job.name }}
-
STATUS
+
STATUS
{{ job.status }} @@ -28,28 +28,28 @@
-
STARTED
+
STARTED
{{ job.started | longDate }}
-
FINISHED
+
FINISHED
{{ job.finished | longDate }}
-
ELAPSED
+
ELAPSED
{{ job.elapsed }} seconds
-
LAUNCH TYPE
+
LAUNCH TYPE
{{ job.launch_type }}
@@ -59,7 +59,7 @@
EXTRA VARS
-
+
diff --git a/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.partial.html b/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.partial.html index 258dacee3b..65e403b252 100644 --- a/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.partial.html +++ b/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.partial.html @@ -16,7 +16,7 @@
-
NAME
+
NAME
-
STATUS
+
STATUS
{{ job.status }} @@ -33,35 +33,35 @@
-
STARTED
+
STARTED
{{ job.started | longDate }}
-
FINISHED
+
FINISHED
{{ job.finished | longDate }}
-
ELAPSED
+
ELAPSED
{{ job.elapsed }} seconds
-
LAUNCH TYPE
+
LAUNCH TYPE
{{ job.launch_type }}
-
PROJECT
+
PROJECT
-
CREDENTIAL
+
CREDENTIAL
{{ credential_name }} 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 3142d32496..445e332e15 100644 --- a/awx/ui/client/src/standard-out/standard-out.block.less +++ b/awx/ui/client/src/standard-out/standard-out.block.less @@ -1,8 +1,10 @@ @import "../shared/branding/colors.default.less"; -@import "awx/ui/client/src/shared/layouts/one-plus-two.less"; +@import "../shared/layouts/one-plus-one.less"; /** @define StandardOut */ +@breakpoint-md: 900px; + standard-out-log { flex: 5; display: flex; @@ -13,8 +15,9 @@ standard-out-log { padding: 0 20px 0 20px; font-family: Menlo,Monaco,Consolas,"Courier New",monospace; } + .StandardOut-container { - .OnePlusTwo-container; + .OnePlusOne-container(100%, @breakpoint-md); &.fullscreen { .StandardOut-rightPanel { @@ -24,14 +27,18 @@ standard-out-log { } .StandardOut-leftPanel { - .OnePlusTwo-left--panel(590px); + .OnePlusOne-panel--left(100%, @breakpoint-md); + max-width: 600px; + @media (max-width: @breakpoint-md - 1px) { + max-width: 100%; + } } .StandardOut-rightPanel { - .OnePlusTwo-right--panel(590px); - - @media (min-width: 900px) { - max-width: 50%; + .OnePlusOne-panel--right(100%, @breakpoint-md); + max-width: 100%; + @media (max-width: @breakpoint-md - 1px) { + padding-right: 15px; } .Panel { @@ -45,7 +52,7 @@ standard-out-log { } .StandardOut-panelHeader { - .OnePlusTwo-panelHeader + .OnePlusOne-panelHeader } .StandardOut-consoleOutput { @@ -64,11 +71,16 @@ standard-out-log { } .StandardOut-details { - .OnePlusTwo-left--details; + display: flex; + flex-wrap: wrap; + flex-direction: row; + padding-top: 25px; } .StandardOut-detailsRow { - .OnePlusTwo-left--detailsRow; + width: 100%; + display: flex; + margin: 0 -15px; } .StandardOut-detailsRow + .StandardOut-detailsRow { @@ -76,15 +88,27 @@ standard-out-log { } .StandardOut-detailsRow--extraVars { - margin-bottom: 10px; + margin: 20px 0; + width: 100%; +} + +.StandardOut-extraVarsContainer { + width: 100%; + padding-right: 15px; } .StandardOut-detailsLabel { - .OnePlusTwo-left--detailsLabel; + flex: 2.5 0 auto; + text-transform: uppercase; + color: @default-interface-txt; } .StandardOut-detailsContent { - .OnePlusTwo-left--detailsContent; + width: 40%; + flex: 1 0 auto; + padding: 0px 29px; + text-transform: none; + word-wrap: break-word; } .StandardOut-statusText {