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

Dark mode redux, fix dark mode docs #1691

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

- Adjusted the dark theme palette to have a slight blue titn ([#1691](https://github.com/elastic/eui/pull/1691))
- Added `repositionOnScroll` property to the `EuiPopoverProps` type definition ([#1628](https://github.com/elastic/eui/pull/1628))
- Added support to `findTestSubject` for an optional `matcher` argument, which defaults to `~=`, enabling it to identify an element based on one of multiple space-separated values within its `data-test-subj` attribute ([#1587](https://github.com/elastic/eui/pull/1587))
- Converted `EuiFlexGrid`, `EuiFlexGroup`, `EuiFlexItem`, `EuiDescriptionList`, `EuiDescriptionListTitle`, and `EuiDescriptionListDescription` to TypeScript ([#1365](https://github.com/elastic/eui/pull/1365))
Expand Down
2 changes: 1 addition & 1 deletion src-docs/src/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import ColorGuidelines
import ModalGuidelines
from './views/guidelines/modals';

import SassGuidelines
import { SassGuidelines }
from './views/guidelines/sass';

import TextScales
Expand Down
2 changes: 1 addition & 1 deletion src-docs/src/views/app_view.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export class AppView extends Component {

<div className="guidePageContent">
<EuiContext i18n={i18n}>
{children}
{React.cloneElement(children, { selectedTheme: theme })}
</EuiContext>
</div>
</EuiPageBody>
Expand Down
22 changes: 12 additions & 10 deletions src-docs/src/views/guidelines/colors.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
} from 'react-router';

import lightColors from '!!sass-vars-to-js-loader!../../../../src/global_styling/variables/_colors.scss';
import darkColors from '!!sass-vars-to-js-loader!../../../../src/themes/eui/eui_colors_dark.scss';
import { calculateContrast, rgbToHex } from '../../../../src/services';

import {
Expand Down Expand Up @@ -60,14 +61,14 @@ const ratingAA = <EuiBadge color="#333">AA</EuiBadge>;

const ratingAA18 = <EuiBadge color="#666">AA18</EuiBadge>;

function renderPaletteColor(color, index) {
function renderPaletteColor(palette, color, index) {
return (
<EuiFlexItem key={index}>
<EuiFlexGroup responsive={false} alignItems="center">
<EuiFlexItem grow={false}>
<EuiCopy beforeMessage="Click to copy color name" textToCopy={color}>
{(copy) => (
<EuiIcon onClick={copy} size="xl" type="stopFilled" color={rgbToHex(lightColors[color].rgba)} />
<EuiIcon onClick={copy} size="xl" type="stopFilled" color={rgbToHex(palette[color].rgba)} />
)}
</EuiCopy>
</EuiFlexItem>
Expand All @@ -78,13 +79,13 @@ function renderPaletteColor(color, index) {
</EuiFlexItem>
<EuiFlexItem>
<EuiText size="s" color="subdued">
<p><code>{rgbToHex(lightColors[color].rgba).toUpperCase()}</code></p>
<p><code>{rgbToHex(palette[color].rgba).toUpperCase()}</code></p>
</EuiText>
</EuiFlexItem>
<EuiFlexItem>
<EuiText size="s" color="subdued">
<p>
<code>rgb({lightColors[color].r}, {lightColors[color].g}, {lightColors[color].b})</code>
<code>rgb({palette[color].r}, {palette[color].g}, {palette[color].b})</code>
</p>
</EuiText>
</EuiFlexItem>
Expand Down Expand Up @@ -146,6 +147,7 @@ export default class extends Component {
};

render() {
const palette = (this.props.selectedTheme === 'light') ? lightColors : darkColors;
const { value } = this.state;

return (
Expand All @@ -167,7 +169,7 @@ export default class extends Component {

<EuiFlexGroup direction="column" gutterSize="s">
{allowedColors.map(function (color, index) {
return renderPaletteColor(color, index);
return renderPaletteColor(palette, color, index);
})}
</EuiFlexGroup>

Expand Down Expand Up @@ -230,8 +232,8 @@ export default class extends Component {
{allowedColors.map(function (color2, index) {
const contrast = (
calculateContrast(
[lightColors[color].r, lightColors[color].g, lightColors[color].b],
[lightColors[color2].r, lightColors[color2].g, lightColors[color2].b],
[palette[color].r, palette[color].g, palette[color].b],
[palette[color2].r, palette[color2].g, palette[color2].b],
)
);

Expand Down Expand Up @@ -275,8 +277,8 @@ color: $${color2};`
<p
onClick={copy}
style={{
backgroundColor: lightColors[color].rgba,
color: lightColors[color2].rgba,
backgroundColor: palette[color].rgba,
color: palette[color2].rgba,
padding: 6,
marginBottom: 2,
borderRadius: 4
Expand Down Expand Up @@ -312,7 +314,7 @@ color: $${color2};`

<EuiFlexGroup direction="column" gutterSize="s">
{visColors.map(function (color, index) {
return renderPaletteColor(color, index);
return renderPaletteColor(palette, color, index);
})}
</EuiFlexGroup>
</GuidePage>
Expand Down
Loading