shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 01:21:21 +03:00
Code Releases Activity

Merge pull request #1362 from mabashian/933-form-checkboxes-too-wide

Browse Source 
Make checkbox labels the width of their contents not their parent
This commit is contained in:
Michael Abashian 2018-04-19 10:34:04 -04:00 committed by GitHub
commit 1fc6a34e62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/legacy/styles/ansible-ui.less
View File

@ -879,7 +879,6 @@ input[type="checkbox"].checkbox-no-label {
.checkbox-options { .checkbox-options {
font-weight: normal; font-weight: normal;
padding-right: 20px;
} }
/* Display list actions next to search widget */ /* Display list actions next to search widget */

5
awx/ui/client/legacy/styles/forms.less
View File

@ -788,3 +788,8 @@ input[type='radio']:checked:before {
border-color: @b7grey; border-color: @b7grey;
background-color: @ebgrey; background-color: @ebgrey;
} }
.Form-checkboxRow {
display: flex;
clear: left;
}

2
awx/ui/client/src/shared/form-generator.js
View File

@ -599,6 +599,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
label = (includeLabel !== undefined && includeLabel === false) ? false : true; label = (includeLabel !== undefined && includeLabel === false) ? false : true;
if (label) { if (label) {
html += "<span class=\"Form-checkboxRow\">";
html += "<label class=\""; html += "<label class=\"";
html += (field.inline === undefined || field.inline === true) ? "checkbox-inline" : ""; html += (field.inline === undefined || field.inline === true) ? "checkbox-inline" : "";
html += (field.labelClass) ? " " + field.labelClass : ""; html += (field.labelClass) ? " " + field.labelClass : "";
@ -628,6 +629,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += field.label + " "; html += field.label + " ";
html += (field.awPopOver) ? Attr(field, 'awPopOver', fld) : ""; html += (field.awPopOver) ? Attr(field, 'awPopOver', fld) : "";
html += "</label>\n"; html += "</label>\n";
html += "</span>";
} }
return html; return html;