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

feat: new color palette #359

Merged
merged 37 commits into from
Apr 6, 2023
Merged
Show file tree
Hide file tree
Changes from 36 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
0218231
refactor: color palette
muratcorlu Jan 6, 2023
160e66d
docs: color palette wip
muratcorlu Jan 9, 2023
de1def9
Merge branch 'next' into new-color-palette
muratcorlu Jan 12, 2023
43f6335
refactor: renaming colors
muratcorlu Jan 17, 2023
d3aed75
Merge branch 'next' into new-color-palette
muratcorlu Jan 20, 2023
a7592a0
Merge branch 'new-color-palette' of github.com:Trendyol/baklava into …
muratcorlu Jan 30, 2023
12d09fe
Merge branch 'next' into new-color-palette
muratcorlu Jan 30, 2023
db76d0f
refactor: some color adjustments with passive color
muratcorlu Jan 30, 2023
36ae044
docs: colors wip
muratcorlu Feb 7, 2023
8236788
Merge branch 'next' into new-color-palette
muratcorlu Mar 1, 2023
f6eaa84
Merge branch 'next' into new-color-palette
muratcorlu Mar 15, 2023
57a7c1f
Merge branch 'new-color-palette' of github.com:Trendyol/baklava into …
muratcorlu Mar 15, 2023
046771f
Merge branch 'next' into new-color-palette
muratcorlu Mar 16, 2023
c20b250
chore(deps-dev): storybook version update
muratcorlu Mar 16, 2023
eb2cc26
feat: new neutral color set
muratcorlu Mar 16, 2023
27029a6
docs: color palette playground file
muratcorlu Mar 24, 2023
ceeb8b9
feat: color palette playground
muratcorlu Mar 27, 2023
3b01b39
Merge branch 'next' into new-color-palette
muratcorlu Mar 27, 2023
260122e
feat: new color palette
muratcorlu Mar 28, 2023
7401736
refactor: fine tuning some color values
muratcorlu Mar 29, 2023
e735ae2
Merge branch 'next' into new-color-palette
muratcorlu Mar 29, 2023
f1d8c9e
fix(button): tertiary hover background fix
muratcorlu Mar 29, 2023
cb5a3ae
Merge branch 'next' into new-color-palette
muratcorlu Mar 30, 2023
6e0722c
fix: fix color references
muratcorlu Mar 30, 2023
50a3422
Merge branch 'next' into new-color-palette
muratcorlu Apr 3, 2023
e97d360
feat: colors reverted back
muratcorlu Apr 5, 2023
d45e951
Merge branch 'new-color-palette' of github.com:Trendyol/baklava into …
muratcorlu Apr 5, 2023
2a19f99
refactor: color palette playground removed
muratcorlu Apr 5, 2023
6bf1fcb
fix: color fixes in components
muratcorlu Apr 5, 2023
6f4968c
fix: color fixes in components
muratcorlu Apr 5, 2023
35ac617
fix(dialog): backdrop color fix
muratcorlu Apr 5, 2023
74d5cc1
fix: color fixes
muratcorlu Apr 5, 2023
bb880e7
Merge branch 'next' into new-color-palette
muratcorlu Apr 6, 2023
c99d431
fix: color fixes
muratcorlu Apr 6, 2023
c16b822
docs(dialog): fix dialog opener
muratcorlu Apr 6, 2023
266c962
docs(dialog): dialog opener id fix
muratcorlu Apr 6, 2023
4544007
Merge branch 'next' into new-color-palette
muratcorlu Apr 6, 2023
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 .storybook/manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const theme = create({
fontBase: 'RubikVariable, sans-serif',
fontCode:
'"Operator Mono","Fira Code Retina","Fira Code","FiraCode-Retina","Andale Mono","Lucida Console",Consolas,Monaco,monospace',
textColor: '#273142',
});

addons.setConfig({ theme });
47 changes: 15 additions & 32 deletions docs/design-system/colors.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meta, ColorPalette, ColorItem } from '@storybook/addon-docs';
import { html } from 'lit';

<Meta title="Design System/Colors" />

Expand All @@ -10,53 +11,35 @@ Baklava uses a list of defined color with some default values.
<ColorItem
title="--bl-color-primary"
subtitle="Primary Color"
colors={{ '': '#F27A1A', '--hover': '#EF6114', '--background': '#FEF2E8' }}
/>
<ColorItem
title="--bl-color-secondary"
subtitle="Secondary Color"
colors={{ '': '#273142', '--hover': '#0F131A', '--background': '#F1F2F7' }}
/>
<ColorItem
title="--bl-color-tertiary"
subtitle="Tertiary Color"
colors={{ '': '#f1f2f7', '--hover': '#d5d9e1', '--background': '#F7F7FA' }}
colors={{ '': 'var(--bl-color-primary)', '--highlight': 'var(--bl-color-primary-highlight)', '--contrast': 'var(--bl-color-primary-contrast)' }}
/>
<ColorItem
title="--bl-color-success"
subtitle="Success Color"
colors={{ '': '#0bc15c', '--hover': '#09a44e', '--background': '#E7F9EF' }}
colors={{ '': 'var(--bl-color-success)', '--highlight': 'var(--bl-color-success-highlight)', '--contrast': 'var(--bl-color-success-contrast)' }}
/>
<ColorItem
title="--bl-color-danger"
subtitle="Danger Color"
colors={{ '': '#ff5043', '--hover': '#ff3028', '--background': '#FFEEEC' }}
colors={{ '': 'var(--bl-color-danger)', '--highlight': 'var(--bl-color-danger-highlight)', '--contrast': 'var(--bl-color-danger-contrast)' }}
/>
<ColorItem
title="--bl-color-warning"
subtitle="Warning Color"
colors={{ '': '#FFB600', '--hover': '#FF9800', '--background': '#FFF8E6' }}
/>
<ColorItem
title="--bl-color-alternative"
subtitle="Alternative Color"
colors={{ '': '#5794FF', '--hover': '#3469FF', '--background': '#EEF4FF' }}
/>
<ColorItem
title="--bl-color-featured"
subtitle="Featured Color"
colors={{ '': '#8C4EFF', '--hover': '#5E2EFF', '--background': '#F4EDFF' }}
colors={{ '': 'var(--bl-color-warning)', '--highlight': 'var(--bl-color-warning-highlight)', '--contrast': 'var(--bl-color-warning-contrast)' }}
/>
<ColorItem
title="--bl-color-content"
subtitle="Content Colors"
title="--bl-color-neutral"
subtitle="Neutral Colors"
colors={{
'--primary': '#273142',
'--secondary': '#6E7787',
'--tertiary': '#95A1B5',
'--passive': '#AFBBCA',
'--primary-contrast' : '#FFF',
'--hover' : '#F27A1A'
'--none': 'var(--bl-color-neutral-none)',
'--darkest': 'var(--bl-color-neutral-darkest)',
'--darker': 'var(--bl-color-neutral-darker)',
'--dark': 'var(--bl-color-neutral-dark)',
'--light' : 'var(--bl-color-neutral-light)',
'--lighter' : 'var(--bl-color-neutral-lighter)',
'--lightest' : 'var(--bl-color-neutral-lightest)',
'--full' : 'var(--bl-color-neutral-full)',
}}
/>
</ColorPalette>
4 changes: 2 additions & 2 deletions docs/how-to-customize-a-components-style.stories.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Let's take a badge component as an example:

.badge {
/* Variable definition start */
--bg-color: var(--bl-badge-bg-color, var(--bl-color-accent-primary-background));
--bg-color: var(--bl-badge-bg-color, var(--bl-color-primary-contrast));
--color: var(--bl-badge-color, var(--bl-color-primary));
--font: var(--bl-font-title-4-medium);
--padding-vertical: var(--bl-size-3xs);
Expand All @@ -68,7 +68,7 @@ By the __nature__ of this component, we let users to change background color and
we define a default variables `--bl-badge-bg-color` and `--bl-badge-color` and fill it with our default definitions like this:

```css
--bg-color: var(--bl-badge-bg-color, var(--bl-color-accent-primary-background));
--bg-color: var(--bl-badge-bg-color, var(--bl-color-primary-contrast));
--color: var(--bl-badge-color, var(--bl-color-primary));
```

Expand Down
2 changes: 1 addition & 1 deletion docs/using-baklava-in-react.stories.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ import { BlButton } from "@trendyol/baklava/dist/baklava-react";
function MyComponent() {
const buttonStyle = {
"--bl-color-primary": "purple",
"--bl-color-primary-hover": "rebeccapurple",
"--bl-color-primary-highlight": "rebeccapurple",
}

return (
Expand Down
Loading