Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 10 additions & 23 deletions app/assets/stylesheets/components/_form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,6 @@ textarea {
}
}

// error states
.has-error input {
background-position: center right $form-field-padding-x;
background-repeat: no-repeat;
background-size: 1rem 1rem;
border-color: $red;

&.date,
&.select {
background-image: none;
}

&:focus {
border-color: $red;
box-shadow: 0 0 0 2px rgba($red, .5);
}
}

input::-webkit-outer-spin-button,
input::-webkit-inner-spin-button {
-webkit-appearance: none;
Expand All @@ -83,10 +65,6 @@ input::-webkit-inner-spin-button {
}
}

.usa-input--error.field:invalid {
@include u-border($theme-input-state-border-width, 'error');
}

.usa-hint {
font-style: italic;
}
Expand All @@ -105,8 +83,16 @@ input::-webkit-inner-spin-button {
}
}

// Remove/refactor once LGDS v6.3 is released
// Upstream: https://github.com/18F/identity-style-guide/pull/275
.usa-input--error {
&,
// Temporary: Remove after LG-3877 (with BassCSS "color-forms")
&.field:invalid {
border-color: color('error');
}
}

// Upstream: https://github.com/18F/identity-style-guide/pull/265
.usa-error-message,
.usa-success-message {
@include u-padding-y(.5);
Expand All @@ -117,6 +103,7 @@ input::-webkit-inner-spin-button {
padding-left: 1.5rem;
}

// Upstream: https://github.com/18F/identity-style-guide/pull/265
.usa-success-message {
background-image: url(image-path('alert/success.svg'));
color: color('success');
Expand Down
7 changes: 3 additions & 4 deletions config/initializers/simple_form.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@

config.wrappers :vertical_form,
tag: 'div',
class: 'margin-bottom-4',
error_class: 'has-error' do |b|
class: 'margin-bottom-4' do |b|
b.use :html5
b.use :placeholder
b.optional :maxlength
Expand All @@ -24,8 +23,8 @@
b.optional :readonly
b.use :label, class: 'bold'
b.use :hint, wrap_with: { tag: 'div', class: 'italic' }
b.use :input, class: 'block col-12 field'
b.use :error, wrap_with: { tag: 'div', class: 'mt-tiny h6 text-error error-message' }
b.use :input, class: 'block col-12 field', error_class: 'usa-input--error'
b.use :error, wrap_with: { tag: 'div', class: 'usa-error-message' }
end

config.default_wrapper = :vertical_form
Expand Down