From cb01dea55f20b207d7ca26d8dcc156eb7217c2b9 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Fri, 13 Apr 2018 10:34:39 -0400
Subject: [PATCH 1/2] Make checkbox labels the width of their contents no their
 parent

---
 awx/ui/client/legacy/styles/ansible-ui.less | 1 -
 awx/ui/client/legacy/styles/forms.less      | 5 +++++
 awx/ui/client/src/shared/form-generator.js  | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/awx/ui/client/legacy/styles/ansible-ui.less b/awx/ui/client/legacy/styles/ansible-ui.less
index a992d805c1..1963ac4361 100644
--- a/awx/ui/client/legacy/styles/ansible-ui.less
+++ b/awx/ui/client/legacy/styles/ansible-ui.less
@@ -879,7 +879,6 @@ input[type="checkbox"].checkbox-no-label {
 
 .checkbox-options {
   font-weight: normal;
-  padding-right: 20px;
 }
 
 /* Display list actions next to search widget */
diff --git a/awx/ui/client/legacy/styles/forms.less b/awx/ui/client/legacy/styles/forms.less
index e3cfe1e765..60f39d42b6 100644
--- a/awx/ui/client/legacy/styles/forms.less
+++ b/awx/ui/client/legacy/styles/forms.less
@@ -788,3 +788,8 @@ input[type='radio']:checked:before {
     border-color: @b7grey;
     background-color: @ebgrey;
 }
+
+.Form-checkboxRow {
+    float: left;
+    clear: left;
+}
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index eee1106922..106bc3642d 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -599,6 +599,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                         label = (includeLabel !== undefined && includeLabel === false) ? false : true;
 
                     if (label) {
+                        html += "<span class=\"Form-checkboxRow\">";
                         html += "<label class=\"";
                         html += (field.inline === undefined || field.inline === true) ? "checkbox-inline" : "";
                         html += (field.labelClass) ? " " + field.labelClass : "";
@@ -628,6 +629,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                         html += field.label + " ";
                         html += (field.awPopOver) ? Attr(field, 'awPopOver', fld) : "";
                         html += "</label>\n";
+                        html += "</span>";
                     }
 
                     return html;

From 4794fc510db3f8f072bdf746be1ce8934d769c56 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Thu, 19 Apr 2018 10:08:34 -0400
Subject: [PATCH 2/2] Use flex instead of float on form checkboxes

---
 awx/ui/client/legacy/styles/forms.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/ui/client/legacy/styles/forms.less b/awx/ui/client/legacy/styles/forms.less
index 60f39d42b6..e18c92cfb9 100644
--- a/awx/ui/client/legacy/styles/forms.less
+++ b/awx/ui/client/legacy/styles/forms.less
@@ -790,6 +790,6 @@ input[type='radio']:checked:before {
 }
 
 .Form-checkboxRow {
-    float: left;
+    display: flex;
     clear: left;
 }