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

Jump to bottom

fix(border-subtle): bump value in dark themes #15415

Merged
merged 3 commits into from
Jan 4, 2024
Merged

fix(border-subtle): bump value in dark themes #15415

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88bd3a1
fix(border-subtle): bump value in dark themes
tw15egan Dec 18, 2023
faf3686
chore(storybook): remove test story
tw15egan Jan 4, 2024
e9362a0
Merge branch 'main' into border-subtle-fix
tw15egan Jan 4, 2024
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
63 changes: 63 additions & 0 deletions packages/react/src/components/Layer/Layer.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import './Layer-story.scss';
import React from 'react';
import { Layer, useLayer } from '../Layer';
import mdx from './Layer.mdx';
import { Theme } from '../Theme';

export default {
title: 'Components/Layer',
Expand Down Expand Up @@ -110,3 +111,65 @@ const PlaygroundStory = (args) => {
};

export const Playground = PlaygroundStory.bind({});

function Demo({ children }) {
return (
<div
style={{
background: 'var(--cds-layer)',
border: '0.0625rem solid var(--cds-border-subtle)',
blockSize: '4rem',
padding: '1rem',
}}>
Element on {children}
</div>
);
}

const themes = ['white', 'g10', 'g90', 'g100'];

const Test = () => {
return (
<div
style={{
display: 'grid',
gridTemplateColumns: '1fr '.repeat(themes.length),
}}>
{themes.map((theme) => (
<Theme theme={theme} key={theme}>
<div
style={{
backgroundColor: 'var(--cds-background)',
padding: '1rem',
}}>
<Demo>{`${theme} layer 1`}</Demo>
</div>

<div
style={{
backgroundColor: 'var(--cds-layer)',
padding: '1rem',
}}>
<Layer>
<Demo>{`${theme} layer 2`}</Demo>
</Layer>
</div>

<Layer>
<div
style={{
backgroundColor: 'var(--cds-layer)',
padding: '1rem',
}}>
<Layer>
<Demo>{`${theme} layer 3`}</Demo>
</Layer>
</div>
</Layer>
</Theme>
))}
</div>
);
};

export const TestStory = Test.bind({});
8 changes: 4 additions & 4 deletions packages/themes/src/g100.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,12 @@ export const fieldHover03 = gray70Hover;
export const borderSubtle00 = gray80;

// border-subtle-01
export const borderSubtle01 = gray80;
export const borderSubtleSelected01 = gray70;
export const borderSubtle01 = gray70;
export const borderSubtleSelected01 = gray60;

// border-subtle-02
export const borderSubtle02 = gray70;
export const borderSubtleSelected02 = gray60;
export const borderSubtle02 = gray60;
export const borderSubtleSelected02 = gray50;

// border-subtle-03
export const borderSubtle03 = gray60;
Expand Down
8 changes: 4 additions & 4 deletions packages/themes/src/g90.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,12 @@ export const fieldHover03 = gray60Hover;
export const borderSubtle00 = gray70;

// border-subtle-01
export const borderSubtle01 = gray70;
export const borderSubtleSelected01 = gray60;
export const borderSubtle01 = gray60;
export const borderSubtleSelected01 = gray50;

// border-subtle-02
export const borderSubtle02 = gray60;
export const borderSubtleSelected02 = gray50;
export const borderSubtle02 = gray50;
export const borderSubtleSelected02 = gray40;

// border-subtle-03
export const borderSubtle03 = gray50;
Expand Down