From 8a1d06789bcc803444a58279feee4e4311804ebe Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Mon, 9 May 2016 11:30:24 -0400 Subject: [PATCH] Fixing width of textarea fields like extra vars/inv script --- awx/ui/client/legacy-styles/forms.less | 9 +++++---- awx/ui/client/src/forms/Credentials.js | 2 +- awx/ui/client/src/forms/Groups.js | 8 ++++---- awx/ui/client/src/forms/Inventories.js | 1 + awx/ui/client/src/forms/JobTemplates.js | 2 +- .../src/inventory-scripts/inventory-scripts.form.js | 1 + awx/ui/client/src/scheduler/schedulerForm.partial.html | 2 +- 7 files changed, 14 insertions(+), 11 deletions(-) diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less index a5dfd000c9..41fd02897e 100644 --- a/awx/ui/client/legacy-styles/forms.less +++ b/awx/ui/client/legacy-styles/forms.less @@ -156,9 +156,14 @@ flex: 1 0 auto; margin-bottom: 20px; width: 33%; + max-width: 33%; padding-right: 30px; } +.Form-formGroup--fullWidth { + max-width: none; +} + .Form-subForm { width: 100%; margin-bottom: 15px; @@ -481,10 +486,6 @@ input[type='radio']:checked:before { color: @default-interface-txt; } -.Form-formGroup { - max-width: 33%; -} - @media only screen and (max-width: 650px) { .Form-formGroup { flex: 1 0 auto; diff --git a/awx/ui/client/src/forms/Credentials.js b/awx/ui/client/src/forms/Credentials.js index 15ad2f03dc..237993e213 100644 --- a/awx/ui/client/src/forms/Credentials.js +++ b/awx/ui/client/src/forms/Credentials.js @@ -254,7 +254,7 @@ export default reqExpression: 'key_required', init: true }, - class: 'Form-textAreaLabel', + class: 'Form-textAreaLabel Form-formGroup--fullWidth', hintText: "{{ key_hint }}", addRequired: false, editRequired: false, diff --git a/awx/ui/client/src/forms/Groups.js b/awx/ui/client/src/forms/Groups.js index b43783ce0f..561dc558b2 100644 --- a/awx/ui/client/src/forms/Groups.js +++ b/awx/ui/client/src/forms/Groups.js @@ -38,7 +38,7 @@ export default variables: { label: 'Variables', type: 'textarea', - class: 'Form-textAreaLabel', + class: 'Form-textAreaLabel Form-formGroup--fullWidth', addRequired: false, editRequird: false, rows: 12, @@ -161,7 +161,7 @@ export default label: 'Environment Variables', //"{{vars_label}}" , ngShow: "source && source.value=='custom' ", type: 'textarea', - class: 'Form-textAreaLabel', + class: 'Form-textAreaLabel Form-formGroup--fullWidth', addRequired: false, editRequired: false, rows: 6, @@ -180,7 +180,7 @@ export default label: 'Source Variables', //"{{vars_label}}" , ngShow: "source && (source.value == 'file' || source.value == 'ec2')", type: 'textarea', - class: 'Form-textAreaLabel', + class: 'Form-textAreaLabel Form-formGroup--fullWidth', addRequired: false, editRequird: false, rows: 6, @@ -207,7 +207,7 @@ export default "source.value == 'openstack')", type: 'textarea', addRequired: false, - class: 'Form-textAreaLabel', + class: 'Form-textAreaLabel Form-formGroup--fullWidth', editRequird: false, rows: 6, 'default': '---', diff --git a/awx/ui/client/src/forms/Inventories.js b/awx/ui/client/src/forms/Inventories.js index e1ee63a3d3..2c649af601 100644 --- a/awx/ui/client/src/forms/Inventories.js +++ b/awx/ui/client/src/forms/Inventories.js @@ -49,6 +49,7 @@ export default variables: { label: 'Variables', type: 'textarea', + class: 'Form-formGroup--fullWidth', addRequired: false, editRequird: false, rows: 6, diff --git a/awx/ui/client/src/forms/JobTemplates.js b/awx/ui/client/src/forms/JobTemplates.js index 9ae3bea98f..b5e5c52e7d 100644 --- a/awx/ui/client/src/forms/JobTemplates.js +++ b/awx/ui/client/src/forms/JobTemplates.js @@ -239,7 +239,7 @@ export default variables: { label: 'Extra Variables', type: 'textarea', - class: 'Form-textAreaLabel', + class: 'Form-textAreaLabel Form-formGroup--fullWidth', rows: 6, addRequired: false, editRequired: false, diff --git a/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js b/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js index eb56f6df96..243292c47c 100644 --- a/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js +++ b/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js @@ -47,6 +47,7 @@ export default function() { label: 'Custom Script', type: 'textarea', hintText: "Drag and drop an inventory script on the field below", + class: 'Form-formGroup--fullWidth', addRequired: true, editRequired: true, awDropFile: true, diff --git a/awx/ui/client/src/scheduler/schedulerForm.partial.html b/awx/ui/client/src/scheduler/schedulerForm.partial.html index 52d6610292..c991a3d28d 100644 --- a/awx/ui/client/src/scheduler/schedulerForm.partial.html +++ b/awx/ui/client/src/scheduler/schedulerForm.partial.html @@ -593,7 +593,7 @@ -
+