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.

Sign up for GitHub

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

Adding support for Dark Mode #29133

Merged
merged 3 commits into from
Jan 29, 2019
Merged

Adding support for Dark Mode #29133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87b4161
Adding support for Dark Mode
simianhacker Jan 22, 2019
cc0b947
Merge branch 'master' of github.com:elastic/kibana into dark-theme-su…
simianhacker Jan 28, 2019
dc57839
Use transparentize for suggestion icon bg color
weltenwort Jan 29, 2019
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
10 changes: 8 additions & 2 deletions x-pack/plugins/infra/public/apps/start_app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ import { ThemeProvider } from 'styled-components';

// TODO use theme provided from parentApp when kibana supports it
import { EuiErrorBoundary } from '@elastic/eui';
import euiVars from '@elastic/eui/dist/eui_theme_k6_light.json';
import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
import { I18nProvider } from '@kbn/i18n/react';
import { InfraFrontendLibs } from '../lib/lib';
import { PageRouter } from '../routes';
Expand All @@ -36,7 +37,12 @@ export async function startApp(libs: InfraFrontendLibs) {
<ConstateProvider devtools>
<ReduxStoreProvider store={store}>
<ApolloProvider client={libs.apolloClient}>
<ThemeProvider theme={{ eui: euiVars }}>
<ThemeProvider
theme={() => ({
eui: libs.framework.darkMode ? euiDarkVars : euiLightVars,
darkMode: libs.framework.darkMode,
})}
>
<PageRouter history={history} />
</ThemeProvider>
</ApolloProvider>
Expand Down
5 changes: 3 additions & 2 deletions x-pack/plugins/infra/public/components/autocomplete_field/suggestion_item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import { EuiIcon } from '@elastic/eui';
import { tint } from 'polished';
import { transparentize } from 'polished';
import React from 'react';
import styled from 'styled-components';

Expand Down Expand Up @@ -66,7 +66,8 @@ const SuggestionItemField = styled.div`
`;

const SuggestionItemIconField = SuggestionItemField.extend<{ suggestionType: string }>`
background-color: ${props => tint(0.1, getEuiIconColor(props.theme, props.suggestionType))};
background-color: ${props =>
transparentize(0.9, getEuiIconColor(props.theme, props.suggestionType))};
color: ${props => getEuiIconColor(props.theme, props.suggestionType)};
flex: 0 0 auto;
justify-content: center;
Expand Down
10 changes: 8 additions & 2 deletions x-pack/plugins/infra/public/components/logging/log_minimap/density_chart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,15 @@ export const DensityChart: React.SFC<DensityChartProps> = ({
};

const PositiveAreaPath = styled.path`
fill: ${props => props.theme.eui.euiColorLightShade};
fill: ${props =>
props.theme.darkMode
? props.theme.eui.euiColorMediumShade
: props.theme.eui.euiColorLightShade};
`;

const NegativeAreaPath = styled.path`
fill: ${props => props.theme.eui.euiColorLightestShade};
fill: ${props =>
props.theme.darkMode
? props.theme.eui.euiColorLightShade
: props.theme.eui.euiColorLightestShade};
`;
5 changes: 3 additions & 2 deletions x-pack/plugins/infra/public/components/logging/log_minimap/time_ruler.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,12 @@ TimeRuler.displayName = 'TimeRuler';
const TimeRulerTickLabel = styled.text`
font-size: ${props => props.theme.eui.euiFontSizeXs};
line-height: ${props => props.theme.eui.euiLineHeight};
color: ${props => props.theme.eui.euiTextColor};
fill: ${props => props.theme.eui.textColors.subdued};
`;

const TimeRulerGridLine = styled.line`
stroke: ${props => props.theme.eui.euiColorMediumShade};
stroke: ${props =>
props.theme.darkMode ? props.theme.eui.euiColorDarkShade : props.theme.eui.euiColorMediumShade};
stroke-dasharray: 2, 2;
stroke-opacity: 0.5;
stroke-width: 1px;
Expand Down
12 changes: 9 additions & 3 deletions x-pack/plugins/infra/public/components/logging/log_text_stream/item_date_field.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { darken } from 'polished';
import { darken, transparentize } from 'polished';
import * as React from 'react';
import { css } from 'styled-components';

Expand Down Expand Up @@ -45,8 +45,14 @@ const highlightedFieldStyle = css`
`;

const hoveredFieldStyle = css`
background-color: ${props => darken(0.05, props.theme.eui.euiColorHighlight)};
border-color: ${props => darken(0.2, props.theme.eui.euiColorHighlight)};
background-color: ${props =>
props.theme.darkMode
? transparentize(0.9, darken(0.05, props.theme.eui.euiColorHighlight))
: darken(0.05, props.theme.eui.euiColorHighlight)};
border-color: ${props =>
props.theme.darkMode
? transparentize(0.7, darken(0.2, props.theme.eui.euiColorHighlight))
: darken(0.2, props.theme.eui.euiColorHighlight)};
color: ${props => props.theme.eui.euiColorFullShade};
`;

Expand Down
7 changes: 5 additions & 2 deletions x-pack/plugins/infra/public/components/logging/log_text_stream/item_message_field.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { darken } from 'polished';
import { darken, transparentize } from 'polished';
import * as React from 'react';
import styled, { css } from 'styled-components';

Expand Down Expand Up @@ -73,7 +73,10 @@ const highlightedFieldStyle = css`
`;

const hoveredFieldStyle = css`
background-color: ${props => darken(0.05, props.theme.eui.euiColorHighlight)};
background-color: ${props =>
props.theme.darkMode
? transparentize(0.9, darken(0.05, props.theme.eui.euiColorHighlight))
: darken(0.05, props.theme.eui.euiColorHighlight)};
`;

const wrappedFieldStyle = css`
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/infra/public/components/metrics/side_nav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ const SideNavContainer = styled.div`
position: fixed;
z-index: 1;
height: 88vh;
background-color: #f5f5f5;
padding-left: 16px;
margin-left: -16px;
overflow-y: auto;
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/infra/public/components/waffle/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ const calculateBoundsFromMap = (map: InfraWaffleData): InfraWaffleMapBounds => {
if (values.length === 1) {
values.unshift(0);
}
return { min: min(values), max: max(values) };
return { min: min(values) || 0, max: max(values) || 0 };
};

export const Waffle = injectI18n(
Expand Down
6 changes: 6 additions & 0 deletions x-pack/plugins/infra/public/lib/adapters/framework/kibana_framework_adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export class InfraKibanaFrameworkAdapter implements InfraFrameworkAdapter {
public appState: object;
public dateFormat?: string;
public kbnVersion?: string;
public darkMode?: boolean;
public scaledDateFormat?: string;
public timezone?: string;

Expand Down Expand Up @@ -132,6 +133,11 @@ export class InfraKibanaFrameworkAdapter implements InfraFrameworkAdapter {
this.timezone = Private(this.timezoneProvider)();
this.kbnVersion = kbnVersion;
this.dateFormat = config.get('dateFormat');
try {
this.darkMode = config.get('theme:darkMode');
} catch (e) {
this.darkMode = false;
}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be removed once the global dark theme PR is merged. For now, it's necessary to work with master.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI, you can always specify a default as the second argument

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh... nice! I didn't know that would suppress the exception when the key doesn't exist.

this.scaledDateFormat = config.get('dateFormat:scaled');
});

Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/infra/public/lib/lib.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export interface InfraFrameworkAdapter {
kbnVersion?: string;
scaledDateFormat?: string;
timezone?: string;
darkMode?: boolean;

// Methods
setUISettings(key: string, value: any): void;
Expand Down