From 5f3eb290efba0cf9c900cfefb9f9f057024fb146 Mon Sep 17 00:00:00 2001 From: chouseknecht Date: Wed, 11 Sep 2013 17:31:30 -0400 Subject: [PATCH] AC-452 fixed buttons to not wrap on desktop. At width of 768px or less buttons will wrap. Added CSS to make wrapped buttons on small screens all have same width and some space between them- wrapping now appears much more intentional or planned. --- awx/ui/static/less/ansible-ui.less | 14 ++++++++++++++ awx/ui/static/lib/ansible/list-generator.js | 6 +++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/awx/ui/static/less/ansible-ui.less b/awx/ui/static/less/ansible-ui.less index db6c07f4e4..6af34ce1fd 100644 --- a/awx/ui/static/less/ansible-ui.less +++ b/awx/ui/static/less/ansible-ui.less @@ -86,6 +86,11 @@ hr { white-space: nowrap; } +th.actions-column, +td.actions { + white-space: nowrap; +} + .tab-content { padding-top: 20px; } @@ -944,4 +949,13 @@ tr td button i { table-layout: fixed; } + th.actions-column, + td.actions { + white-space: normal; + } + + td.actions button { + width: 75px; + margin-bottom: 5px; + } } diff --git a/awx/ui/static/lib/ansible/list-generator.js b/awx/ui/static/lib/ansible/list-generator.js index 09bc51590c..ae94641d5b 100644 --- a/awx/ui/static/lib/ansible/list-generator.js +++ b/awx/ui/static/lib/ansible/list-generator.js @@ -202,7 +202,7 @@ angular.module('ListGenerator', ['GeneratorHelpers']) html += "\n"; // table header row - html += "\n"; } html += "\n"; html += "\n"; @@ -315,7 +315,7 @@ angular.module('ListGenerator', ['GeneratorHelpers']) // End List html += "\n"; html += "
\n"; - + if (options.mode == 'select' && (options.selectButton == undefined || options.selectButton == true)) { html += "
\n"; html += "