diff --git a/js/components/text_input.js b/js/components/text_input.js index ea210cb0..962fcabf 100644 --- a/js/components/text_input.js +++ b/js/components/text_input.js @@ -31,7 +31,6 @@ export default { type: Boolean, default: false, }, - insetForm: Boolean, }, data: function() { @@ -61,7 +60,7 @@ export default { this._checkIfValid({ value: this.value, invalidate: true, - showValidationIcon: !this.insetForm, + showValidationIcon: false, }) if (this.mask && this.validation !== 'email') { diff --git a/templates/components/phone_input.html b/templates/components/phone_input.html index f63e0c39..62a1c18a 100644 --- a/templates/components/phone_input.html +++ b/templates/components/phone_input.html @@ -3,10 +3,10 @@ {% macro PhoneInput(phone_number, phone_ext, placeholder_phone="") %}
- {{ TextInput(phone_number, placeholder=placeholder_phone, validation='usPhone', inset_form=True) }} + {{ TextInput(phone_number, placeholder=placeholder_phone, validation='usPhone') }}
- {{ TextInput(phone_ext, validation='phoneExt', inset_form=True)}} + {{ TextInput(phone_ext, validation='phoneExt')}}
{%- endmacro %} diff --git a/templates/components/text_input.html b/templates/components/text_input.html index 51528970..1b7e5aa7 100644 --- a/templates/components/text_input.html +++ b/templates/components/text_input.html @@ -17,8 +17,7 @@ optional=True, showLabel=True, watch=False, - show_validation=True, - inset_form=False) -%} + show_validation=True) -%} diff --git a/templates/fragments/edit_user_form.html b/templates/fragments/edit_user_form.html index 3822271d..f13f5753 100644 --- a/templates/fragments/edit_user_form.html +++ b/templates/fragments/edit_user_form.html @@ -11,15 +11,15 @@
- {{ TextInput(form.first_name, validation='requiredField', inset_form=True) }} + {{ TextInput(form.first_name, validation='requiredField') }}
- {{ TextInput(form.last_name, validation='requiredField', inset_form=True) }} + {{ TextInput(form.last_name, validation='requiredField') }}
- {{ TextInput(form.email, validation='email', inset_form=True) }} + {{ TextInput(form.email, validation='email') }} {{ PhoneInput(form.phone_number, form.phone_ext) }} {{ OptionsInput(form.service_branch, inset_form=True) }} diff --git a/templates/portfolios/admin.html b/templates/portfolios/admin.html index d451c9df..a4268f44 100644 --- a/templates/portfolios/admin.html +++ b/templates/portfolios/admin.html @@ -17,7 +17,7 @@ {{ portfolio_form.csrf_token }}
- {{ TextInput(portfolio_form.name, validation="portfolioName", inset_form=True) }} + {{ TextInput(portfolio_form.name, validation="portfolioName") }}
{{ SaveButton(text='Save', additional_classes='usa-button-big') }} diff --git a/templates/portfolios/applications/settings.html b/templates/portfolios/applications/settings.html index 4e7f0047..4fe5f75a 100644 --- a/templates/portfolios/applications/settings.html +++ b/templates/portfolios/applications/settings.html @@ -25,8 +25,8 @@

- {{ TextInput(application_form.name, inset_form=True) }} - {{ TextInput(application_form.description, paragraph=True, inset_form=True) }} + {{ TextInput(application_form.name) }} + {{ TextInput(application_form.description, paragraph=True) }}
{% if user_can(permissions.DELETE_APPLICATION) %}