Skip to content

Commit

Permalink
[EuiComboBox] Matching placeholder color to other form elements (#4744)
Browse files Browse the repository at this point in the history
Co-authored-by: Caroline Horn <549577+cchaos@users.noreply.github.com>
  • Loading branch information
Michail Yasonik and cchaos committed Apr 27, 2021
1 parent e6fd955 commit 64dd576
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
**Bug fixes**

- Fixed missing i18n tokens for `EuiFilePicker` ([#4750](https://github.com/elastic/eui/pull/4750))
- Fixed `EuiComoboBox` to use correct placeholder text color ([#4744](https://github.com/elastic/eui/pull/4744))

## [`32.2.0`](https://github.com/elastic/eui/tree/v32.2.0)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
pointer-events: none;
padding-left: $euiSizeXS;
line-height: $euiSizeXL;
color: $euiColorMediumShade;
color: $euiFormControlPlaceholderText;
margin-bottom: 0 !important; // sass-lint:disable-line no-important
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
@include euiTextBreakWord; /* 2 */
padding: $euiSizeS;
text-align: center;
color: $euiColorDarkShade;
word-wrap: break-word;
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/date_picker/_date_picker.scss
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
&.react-datepicker__time-list-item--selected {
color: $euiColorGhost;
}

&.react-datepicker__time-list-item--disabled{
color: $euiColorDisabledText
}
Expand Down
12 changes: 6 additions & 6 deletions src/global_styling/mixins/_form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@
@mixin euiPlaceholderPerBrowser {
// sass-lint:disable-block no-vendor-prefixes
// Each prefix must be its own content block
&::-webkit-input-placeholder { @content; }
&::-moz-placeholder { @content; }
&:-ms-input-placeholder { @content; }
&:-moz-placeholder { @content; }
&::placeholder { @content; }
&::-webkit-input-placeholder { @content; opacity: 1; }
&::-moz-placeholder { @content; opacity: 1; }
&:-ms-input-placeholder { @content; opacity: 1; }
&:-moz-placeholder { @content; opacity: 1; }
&::placeholder { @content; opacity: 1; }
}

@function euiFormControlGradient($color: $euiColorPrimary) {
Expand All @@ -83,7 +83,7 @@

// sass-lint:disable-block mixins-before-declarations
@include euiPlaceholderPerBrowser {
color: $euiColorDarkShade;
color: $euiFormControlPlaceholderText;
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/global_styling/variables/_form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ $euiFormCustomControlDisabledIconColor: shadeOrTint($euiColorMediumShade, 38%, 4
$euiFormCustomControlBorderColor: shadeOrTint($euiColorLightestShade, 18%, 30%) !default;
$euiFormControlDisabledColor: $euiColorMediumShade !default;
$euiFormControlBoxShadow: 0 1px 1px -1px transparentize($euiShadowColor, .8), 0 3px 2px -2px transparentize($euiShadowColor, .8) !default;
$euiFormControlPlaceholderText: makeHighContrastColor($euiTextSubduedColor, $euiFormBackgroundColor) !default;
$euiFormInputGroupLabelBackground: tintOrShade($euiColorLightShade, 50%, 40%) !default;
$euiFormInputGroupBorder: 1px solid shadeOrTint($euiFormInputGroupLabelBackground, 2%, 4%) !default;
$euiSwitchOffColor: lightOrDarkTheme(transparentize($euiColorMediumShade, .8), transparentize($euiColorMediumShade, .3)) !default;
Expand All @@ -62,4 +63,3 @@ $euiRangeTrackRadius: $euiBorderRadius !default;
$euiRangeDisabledOpacity: .25 !default;

$euiRangeHighlightHeight: $euiSizeXS !default;

0 comments on commit 64dd576

Please sign in to comment.