External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-22 05:30:18 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6156 from marshmalien/fix/stdOutPanesFillHeight

Browse Source 
Stretch standard out panes to page height
This commit is contained in:
Marliana Lara
2017-05-03 13:40:00 -04:00
committed by GitHub
parent 465d620629 82d37d3fec
commit 17a65bd67b
3 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/legacy-styles/stdout.less
View File

@@ -9,7 +9,7 @@
@import "./client/src/shared/branding/colors.less"; @import "./client/src/shared/branding/colors.less";
#jobs-stdout { #jobs-stdout {
margin-bottom: 20px; margin-bottom: 0px;
#job-status { #job-status {
label { label {

3
awx/ui/client/src/shared/layouts/one-plus-one.less
View File

@@ -8,11 +8,12 @@
.OnePlusOne-container(@height: 100%; @breakpoint: 900px){ .OnePlusOne-container(@height: 100%; @breakpoint: 900px){
height: @height; height: ~"calc(100vh - 150px)";
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@media screen and(max-width: @breakpoint){ @media screen and(max-width: @breakpoint){
flex-direction: column; flex-direction: column;
height: 100%;
} }
} }

19
awx/ui/client/src/standard-out/standard-out.block.less
View File

@@ -29,9 +29,15 @@ standard-out-log {
.StandardOut-leftPanel { .StandardOut-leftPanel {
.OnePlusOne-panel--left(100%, @breakpoint-md); .OnePlusOne-panel--left(100%, @breakpoint-md);
max-width: 600px; max-width: 600px;
display: flex;
@media (max-width: @breakpoint-md - 1px) { @media (max-width: @breakpoint-md - 1px) {
max-width: 100%; max-width: 100%;
} }
.Panel {
height: ~"calc(100% - 20px)";
overflow-y: scroll;
}
} }
.StandardOut-rightPanel { .StandardOut-rightPanel {
@@ -44,10 +50,7 @@ standard-out-log {
.Panel { .Panel {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} height: ~"calc(100% - 20px)";
.StandardOut-consoleOutput {
height: 493px;
} }
} }
@@ -57,17 +60,9 @@ standard-out-log {
.StandardOut-consoleOutput { .StandardOut-consoleOutput {
margin-top: 25px; margin-top: 25px;
background-color: @default-secondary-bg;
border-radius: 5px; border-radius: 5px;
min-height: 300px;
max-height: 100vh;
height: ~"calc(100vh - 245px)";
width: 100%; width: 100%;
overflow: auto; overflow: auto;
#pre-container {
overflow: visible !important;
}
} }
.StandardOut-details { .StandardOut-details {