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

Job stdout refactor

Browse Source 
Fixed stdout container to use the the new stdout style sheet. Controller for stdout now correctly calcs height of the content container.
This commit is contained in:
Chris Houseknecht
2014-06-23 16:54:46 -04:00
parent 95ba711fc1
commit 8752c71e38
5 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/static/ansible-bootstrap/navbar.less
View File

@@ -11,7 +11,6 @@
.navbar { .navbar {
position: relative; position: relative;
min-height: @navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode) min-height: @navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)
margin-bottom: @navbar-margin-bottom;
border: 1px solid transparent; border: 1px solid transparent;
// Prevent floats from breaking the navbar // Prevent floats from breaking the navbar
@@ -30,7 +29,6 @@
.navbar-header { .navbar-header {
&:extend(.clearfix all); &:extend(.clearfix all);
@media (min-width: @grid-float-breakpoint) { @media (min-width: @grid-float-breakpoint) {
float: left; float: left;
} }
@@ -378,6 +376,7 @@
// Default navbar // Default navbar
.navbar-default { .navbar-default {
background-color: @navbar-default-bg; background-color: @navbar-default-bg;
padding-top: 5px;
.navbar-brand { .navbar-brand {
color: @navbar-default-brand-color; color: @navbar-default-brand-color;

2
awx/ui/static/css/ansible-bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
awx/ui/static/js/controllers/JobStdout.js
View File

@@ -53,14 +53,14 @@ function JobStdoutController ($rootScope, $scope, $compile, $routeParams, ClearS
}); });
function resizeToFit() { function resizeToFit() {
available_height = $(window).height() - $('.main-menu').outerHeight() - $('#main_tabs').outerHeight() - available_height = $(window).height() - $('#main-menu-container .navbar').outerHeight() -
$('#breadcrumb-container').outerHeight() - $('.site-footer').outerHeight() * 2; $('#breadcrumb-container').outerHeight() - 20;
if ($(window).width() < 768) { /*if ($(window).width() < 768) {
available_height += 55; available_height += 55;
} }
else if ($(window).width() > 1240) { else if ($(window).width() > 1240) {
available_height += 5; available_height += 5;
} }*/
$('#pre-container').height(available_height); $('#pre-container').height(available_height);
$('#pre-container').mCustomScrollbar("update"); $('#pre-container').mCustomScrollbar("update");
} }

1
awx/ui/static/less/ansible-ui.less
View File

@@ -54,6 +54,7 @@
@import "jobs.less"; @import "jobs.less";
@import "inventory-edit.less"; @import "inventory-edit.less";
@import "breadcrumbs.less"; @import "breadcrumbs.less";
@import "stdout.less";
/* Bootstrap fix that's causing a right margin to appear /* Bootstrap fix that's causing a right margin to appear

3
awx/ui/static/less/main-layout.less
View File

@@ -23,11 +23,10 @@ body {
#main-menu-container { #main-menu-container {
.navbar { .navbar {
margin-bottom: 0; margin-bottom: 0;
margin-top: 5px;
} }
.navbar-brand { .navbar-brand {
position: absolute; position: absolute;
top: 3px; top: 6px;
left: 15px; left: 15px;
padding: 0px 15px 0 15px; padding: 0px 15px 0 15px;
img { img {