Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A few more dark mode fixes #1700

Merged
merged 7 commits into from
Mar 8, 2019
Merged
Show file tree
Hide file tree
Changes from 2 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
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## [`master`](https://github.com/elastic/eui/tree/master)

No public interface changes since `9.1.0`.
- Adjusted the dark theme palette a bit more and adjusted a few components ([#1700](https://github.com/elastic/eui/pull/1700))


## [`9.1.0`](https://github.com/elastic/eui/tree/v9.1.0)

Expand All @@ -18,7 +19,6 @@ No public interface changes since `9.1.0`.
**Bug fixes**

- Fixed IE11 rendering issue in `EuiLoadingKibana` ([#1683](https://github.com/elastic/eui/pull/1683))

- Fixed floating point arithmetic bug in `EuiRangeTrack`'s value validation ([#1687](https://github.com/elastic/eui/pull/1687))
- Fixed `EuiComboBox` `activeOptonIndex` error with empty search results ([#1695](https://github.com/elastic/eui/pull/1695))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
display: inline-block;
border-radius: $euiBorderRadius;
background: $euiColorAccent;
color: lightOrDarkTheme($euiColorEmptyShade, $euiColorFullShade);
color: $euiColorEmptyShade;
font-size: $euiFontSizeXS;
font-weight: $euiFontWeightMedium;
line-height: $euiSize;
Expand Down
1 change: 1 addition & 0 deletions src/components/bottom_bar/_bottom_bar.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.euiBottomBar {
@include euiBottomShadowFlat($euiShadowColorLarge);
background: tintOrShade($euiColorFullShade, 25%, 90%);
color: $euiColorEmptyShade;
position: fixed;
Expand Down
2 changes: 1 addition & 1 deletion src/components/call_out/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@if (map-has-key($euiCallOutTypes, $type)) {
$color: map-get($euiCallOutTypes, $type);
$backgroundColor: tintOrShade($color, 90%, 70%);
$foregroundColor: makeHighContrastColor($color, $backgroundColor);
$foregroundColor: shadeOrTint(makeHighContrastColor($color, $backgroundColor), 0, 20%);

@if ($returnBackgroundOrForeground == 'background') {
@return $backgroundColor;
Expand Down
6 changes: 3 additions & 3 deletions src/components/loading/_loading_chart.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@
}

&:nth-child(2) {
background-color: darken($euiColorLightShade, 4%);
background-color: shadeOrTint($euiColorLightShade, 4%, 4%);
}

&:nth-child(3) {
background-color: darken($euiColorLightShade, 8%);
background-color: shadeOrTint($euiColorLightShade, 8%, 8%);
}

&:nth-child(4) {
background-color: darken($euiColorLightShade, 12%);
background-color: shadeOrTint($euiColorLightShade, 12%, 12%);
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions src/components/side_nav/_side_nav_item.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,14 @@
color: $euiColorFullShade; /* 2 */

&.euiSideNavItemButton--isClickable {
&:hover {
&:hover .euiSideNavItemButton__label {
text-decoration: underline;
}

// Focus state background regardless of index/selected state.
&:focus {
// sass-lint:disable-block no-important
background-color: $euiFocusBackgroundColor !important;
color: $euiColorPrimary !important;
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/tool_tip/_mixins.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@mixin euiToolTipStyle($size: null) {
@include euiBottomShadow($color: #000);
border-radius: $euiBorderRadius;
background-color: tintOrShade($euiColorFullShade, 25%, 90%);
background-color: $euiTooltipBackgroundColor;
color: $euiColorGhost;
z-index: $euiZLevel9;
max-width: 256px;
Expand Down
2 changes: 1 addition & 1 deletion src/components/tool_tip/_tool_tip.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
position: absolute;
transform-origin: center;
border-radius: 2px;
background-color: tintOrShade($euiColorFullShade, 25%, 90%);
background-color: $euiTooltipBackgroundColor;
width: $arrowSize;
height: $arrowSize;

Expand Down
2 changes: 2 additions & 0 deletions src/components/tool_tip/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
$euiTooltipBackgroundColor: tintOrShade($euiColorFullShade, 25%, 100%);

$euiTooltipAnimations: (
top: euiToolTipTop,
left: euiToolTipBottom,
Expand Down
4 changes: 2 additions & 2 deletions src/themes/eui/eui_colors_dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ $euiColorEmptyShade: #1D1E24;
$euiColorLightestShade: #25262E;
$euiColorLightShade: #343741;
$euiColorMediumShade: #535966;
$euiColorDarkShade: #D4DAE5;
$euiColorDarkestShade: #F5F7FA;
$euiColorDarkShade: #98A2B3;
$euiColorDarkestShade: #D4DAE5;
$euiColorFullShade: #FFF;

// Variations from core
Expand Down