Skip to content

Commit

Permalink
Make placeholder error color more consistent, fix input placeholder c…
Browse files Browse the repository at this point in the history
…olor #2786
  • Loading branch information
jlukic committed Aug 10, 2015
1 parent 0d23f97 commit b42aac8
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 12 deletions.
1 change: 1 addition & 0 deletions RELEASE-NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
- **Icon** - Fixed typo in cube icon alias caused by bad grep #2765
- **Embed** - Remove accidental `console.log` statements in js #2760
- **Transition** - Transition callbacks now all have the correct `this` set. #2758
- **Form / Input** - Fixes `::placeholder` text color for `ui error input`, modifies form error placeholder color to distinguish from form value error color #2786

**Additional Bugs**
- **Build Tools** - Fixes issue on `win` platform where packaged theme would not correctly update when using watch due to regExp not matching windows path separators.
Expand Down
12 changes: 6 additions & 6 deletions src/definitions/elements/input.less
Original file line number Diff line number Diff line change
Expand Up @@ -168,24 +168,24 @@
}

/* Error Placeholder */
.ui.input.error input ::-webkit-input-placeholder {
.ui.input.error input::-webkit-input-placeholder {
color: @placeholderErrorColor;
}
.ui.input.error input ::-moz-placeholder {
.ui.input.error input::-moz-placeholder {
color: @placeholderErrorColor;
}
.ui.input.error input ::-ms-input-placeholder {
.ui.input.error input::-ms-input-placeholder {
color: @placeholderErrorColor;
}

/* Focused Error Placeholder */
.ui.input.error input :focus::-webkit-input-placeholder {
.ui.input.error input:focus::-webkit-input-placeholder {
color: @placeholderErrorFocusColor;
}
.ui.input.error input :focus::-moz-placeholder {
.ui.input.error input:focus::-moz-placeholder {
color: @placeholderErrorFocusColor;
}
.ui.input.error input :focus::-ms-input-placeholder {
.ui.input.error input:focus::-ms-input-placeholder {
color: @placeholderErrorFocusColor;
}

Expand Down
5 changes: 3 additions & 2 deletions src/themes/default/collections/form.variables
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,10 @@
/* Placeholder */
@inputPlaceholderColor: lighten(@inputColor, 55);
@inputPlaceholderFocusColor: lighten(@inputColor, 35);
@inputErrorPlaceholderColor: lighten(@formErrorColor, 10);
@inputErrorPlaceholderFocusColor: lighten(@formErrorColor, 5);

/* Placeholder Error */
@inputErrorPlaceholderColor: lighten(@formErrorColor, 40);
@inputErrorPlaceholderFocusColor: lighten(@formErrorColor, 30);

/* Loading Dimmer */
@loaderDimmerColor: rgba(255, 255, 255, 0.8);
Expand Down
8 changes: 4 additions & 4 deletions src/themes/default/elements/input.variables
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,6 @@
@placeholderColor: @unselectedTextColor;
@placeholderFocusColor: @textColor;

@placeholderErrorColor: rgba(255, 80, 80, 0.4);
@placeholderErrorFocusColor: rgba(255, 80, 80, 0.7);

/* Down */
@downBorderColor: rgba(0, 0, 0, 0.3);
@downBackground: #FAFAFA;
Expand All @@ -87,10 +84,13 @@

/* Error */
@errorBackground: @negativeBackgroundColor;
@errorColor: @negativeTextColor;
@errorBorder: @negativeBorderColor;
@errorColor: @negativeColor;
@errorBoxShadow: none;

@placeholderErrorColor: lighten(@errorColor, 40);
@placeholderErrorFocusColor: lighten(@errorColor, 30);

/* Loader */
@invertedLoaderFillColor: rgba(0, 0, 0, 0.15);

Expand Down

0 comments on commit b42aac8

Please sign in to comment.