Skip to content

Commit

Permalink
feat(button): updated button colors and themes (#500)
Browse files Browse the repository at this point in the history
  • Loading branch information
SiebenSieben committed Feb 9, 2021
1 parent 3a947c2 commit b34f12d
Show file tree
Hide file tree
Showing 10 changed files with 104 additions and 40 deletions.
25 changes: 15 additions & 10 deletions .storybook/addons/theme-switcher/index.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
@import '../../../packages/themes/src/mixins/default-inverted.css';
@import '../../../packages/themes/src/mixins/click.css';
@import '../../../packages/themes/src/mixins/site.css';
@import '../../../packages/themes/src/mixins/site-inverted.css';
@import '../../../packages/themes/src/mixins/corp.css';
@import '../../../packages/themes/src/mixins/mobile.css';
@import '../../../packages/themes/src/mixins/default-inverted.css';
@import '../../../packages/themes/src/mixins/corp-inverted.css';
@import '../../../packages/themes/src/mixins/mobile.css';

.tool {
margin-top: auto;
Expand All @@ -16,6 +17,10 @@
font-size: 13px;
}

body[data-theme='default-inverted'] {
@mixin theme-default-inverted;
}

body[data-theme='click'] {
@mixin theme-click;
}
Expand All @@ -24,18 +29,18 @@ body[data-theme='site'] {
@mixin theme-site;
}

body[data-theme='corp'] {
@mixin theme-corp;
}

body[data-theme='mobile'] {
@mixin theme-mobile;
body[data-theme='site-inverted'] {
@mixin theme-site-inverted;
}

body[data-theme='default-inverted'] {
@mixin theme-default-inverted;
body[data-theme='corp'] {
@mixin theme-corp;
}

body[data-theme='corp-inverted'] {
@mixin theme-corp-inverted;
}

body[data-theme='mobile'] {
@mixin theme-mobile;
}
2 changes: 1 addition & 1 deletion .storybook/public/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ div.github {

body[data-theme$='-inverted'] iframe,
body[data-theme$='-inverted'] .sbdocs-preview {
background: var(--color-light-bg-tertiary-inverted);
background: var(--color-light-bg-primary-inverted);
}

div.lib {
Expand Down
2 changes: 1 addition & 1 deletion packages/button/src/Component.stories.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const SIZES = ['xs', 's', 'm', 'l'];
<Meta
title='Компоненты'
component={Button}
parameters={{ 'theme-switcher': { themes: ['click', 'corp', 'mobile', 'corp-inverted'] } }}
parameters={{ 'theme-switcher': { themes: ['click', 'corp', 'corp-inverted', 'site', 'site-inverted', 'mobile'] } }}
/>


Expand Down
62 changes: 36 additions & 26 deletions packages/button/src/index.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,37 @@

:root {
/* primary */
--button-primary-base-bg-color: var(--color-red-brand-85-flat); /* TODO */
--button-primary-base-bg-color: var(--color-light-bg-accent);
--button-primary-hover-bg-color: color-mod(var(--button-primary-base-bg-color) shade(7%));
--button-primary-active-bg-color: color-mod(var(--button-primary-base-bg-color) shade(15%));
--button-primary-disabled-bg-color: color-mod(var(--button-primary-base-bg-color) alpha(30%));
--button-primary-color: var(--color-light-text-primary-inverted);
--button-primary-disabled-color: var(--color-light-text-primary-inverted);

/* secondary */
--button-secondary-color: var(--color-light-text-primary);
--button-secondary-base-bg-color: var(--color-light-specialbg-component);
--button-secondary-base-border-color: transparent;
--button-secondary-hover-bg-color: color-mod(
var(--button-secondary-base-bg-color) blenda(black 7%)
--button-secondary-base-bg-color: var(--color-light-bg-neutral);
--button-secondary-hover-bg-color: color-mod(var(--button-secondary-base-bg-color) shade(7%));
--button-secondary-active-bg-color: color-mod(var(--button-secondary-base-bg-color) shade(15%));
--button-secondary-disabled-bg-color: color-mod(
var(--button-secondary-base-bg-color) alpha(30%)
);
--button-secondary-active-bg-color: color-mod(
var(--button-secondary-base-bg-color) blenda(black 15%)
);
--button-secondary-disabled-bg-color: var(--color-light-specialbg-component);
--button-secondary-base-border-color: transparent;
--button-secondary-disabled-border-color: transparent;
--button-secondary-color: var(--color-light-text-primary);
--button-secondary-disabled-color: color-mod(var(--color-light-text-primary) alpha(30%));

/* outlined */
--button-outlined-base-bg-color: transparent;
--button-outlined-hover-bg-color: rgba(0, 0, 0, 0.07);
--button-outlined-active-bg-color: rgba(0, 0, 0, 0.15);
--button-outlined-disabled-bg-color: transparent;
--button-outlined-base-border-color: var(--color-light-border-tertiary-inverted);
--button-outlined-disabled-border-color: color-mod(
var(--color-light-border-tertiary-inverted) alpha(30%)
);
--button-outlined-color: var(--color-light-text-primary);
--button-outlined-disabled-color: color-mod(var(--color-light-text-primary) alpha(30%));

/* ghost */
--button-ghost-base-color: var(--color-light-text-primary);
--button-ghost-hover-color: color-mod(var(--button-ghost-base-color) tint(30%));
Expand Down Expand Up @@ -128,7 +138,7 @@ a.loading {
}
}

/* Type */
/* View */

.primary {
color: var(--button-primary-color);
Expand Down Expand Up @@ -158,29 +168,29 @@ a.loading {
}

.outlined {
color: var(--color-light-text-primary);
background-color: transparent;
border: 1px solid var(--color-light-border-tertiary-inverted);
color: var(--button-outlined-color);
background-color: var(--button-outlined-base-bg-color);
border: 1px solid var(--button-outlined-base-border-color);

&:hover {
background-color: var(--color-light-specialbg-component);
background-color: var(--button-outlined-hover-bg-color);
}

&:active {
background-color: color-mod(var(--color-light-specialbg-component) blenda(black 7%));
background-color: var(--button-outlined-active-bg-color);
}
}

.filled {
color: var(--color-light-text-primary);
background-color: var(--color-light-specialbg-component);
background-color: var(--color-light-bg-neutral);

&:hover {
background-color: color-mod(var(--color-light-specialbg-component) blenda(black 7%));
background-color: color-mod(var(--color-light-bg-neutral) shade(7%));
}

&:active {
background-color: color-mod(var(--color-light-specialbg-component) blenda(black 15%));
background-color: color-mod(var(--color-light-bg-neutral) shade(15%));
}
}

Expand Down Expand Up @@ -260,23 +270,23 @@ a.loading {
}

&.outlined {
color: color-mod(var(--color-light-text-primary) alpha(30%));
background-color: transparent;
border-color: color-mod(var(--color-light-border-tertiary-inverted) alpha(30%));
color: var(--button-outlined-disabled-color);
background-color: var(--button-outlined-disabled-bg-color);
border-color: var(--button-outlined-disabled-border-color);

&.loading {
color: var(--color-light-text-primary);
border-color: var(--color-light-border-tertiary-inverted);
color: var(--button-outlined-color);
border-color: var(--button-outlined-border-color);
}
}

&.filled {
color: color-mod(var(--color-light-text-primary) alpha(30%));
background-color: var(--color-light-specialbg-component);
background-color: color-mod(var(--color-light-bg-neutral) alpha(30%));

&.loading {
color: var(--color-light-text-primary);
background-color: var(--color-light-specialbg-component);
background-color: var(--color-light-bg-neutral);
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/themes/src/mixins/button/corp-inverted.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
--color-light-bg-primary: #fff;
--color-static-bg-primary-dark: #000;

/* secondary (выглядит как outline) */
/* secondary */
--button-secondary-color: var(--color-light-text-primary-inverted);
--button-secondary-base-bg-color: transparent;
--button-secondary-base-border-color: var(--color-light-border-key-inverted);
Expand Down
2 changes: 1 addition & 1 deletion packages/themes/src/mixins/button/corp.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@

/* secondary */
--button-secondary-base-bg-color: transparent;
--button-secondary-base-border-color: var(--color-light-border-tertiary-inverted);
--button-secondary-hover-bg-color: var(--color-light-specialbg-component);
--button-secondary-active-bg-color: color-mod(
var(--color-light-specialbg-component) blenda(black 7%)
);
--button-secondary-disabled-bg-color: transparent;
--button-secondary-base-border-color: var(--color-light-border-tertiary-inverted);
--button-secondary-disabled-border-color: color-mod(
var(--color-light-border-tertiary-inverted) alpha(30%)
);
Expand Down
36 changes: 36 additions & 0 deletions packages/themes/src/mixins/button/site-inverted.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
@import '../../../../vars/src/index.css';

@define-mixin button-site-inverted {
/* core vars */
--color-dark-bg-accent: #ef3124;
--color-dark-bg-neutral: #485767;
--color-dark-text-primary: #fff;
--color-dark-border-tertiary: #233549;

/* theme */
--button-border-radius: 8px;

/* primary */
--button-primary-base-bg-color: var(--color-dark-bg-accent);
--button-primary-hover-bg-color: color-mod(var(--color-dark-bg-accent) tint(15%));
--button-primary-active-bg-color: color-mod(var(--color-dark-bg-accent) shade(15%));
--button-primary-disabled-bg-color: color-mod(var(--color-dark-bg-accent) alpha(30%));

/* secondary */
--button-secondary-base-bg-color: var(--color-dark-bg-neutral);
--button-secondary-hover-bg-color: color-mod(var(--color-dark-bg-neutral) tint(15%));
--button-secondary-active-bg-color: color-mod(var(--color-dark-bg-neutral) shade(15%));
--button-secondary-disabled-bg-color: color-mod(var(--color-dark-bg-neutral) alpha(30%));
--button-secondary-color: var(--color-dark-text-primary);
--button-secondary-disabled-color: color-mod(var(--color-dark-text-primary) alpha(30%));

/* outlined */
--button-outlined-hover-bg-color: rgba(255, 255, 255, 0.15);
--button-outlined-active-bg-color: rgba(0, 0, 0, 0.15);
--button-outlined-border-color: var(--color-dark-border-tertiary);
--button-outlined-disabled-border-color: color-mod(
var(--color-dark-border-tertiary) alpha(30%)
);
--button-outlined-color: var(--color-dark-text-primary);
--button-outlined-disabled-color: color-mod(var(--color-dark-text-primary) alpha(30%));
}
6 changes: 6 additions & 0 deletions packages/themes/src/mixins/button/site.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@import '../../../../vars/src/index.css';

@define-mixin button-site {
/* theme */
--button-border-radius: 8px;
}
5 changes: 5 additions & 0 deletions packages/themes/src/mixins/site-inverted.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@import './button/site-inverted.css';

@define-mixin theme-site-inverted {
@mixin button-site-inverted;
}
2 changes: 2 additions & 0 deletions packages/themes/src/mixins/site.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
@import './button/site.css';
@import './tabs/site.css';
@import './form-control/site.css';

@define-mixin theme-site {
@mixin button-site;
@mixin form-control-site;
@mixin tabs-site;
}

0 comments on commit b34f12d

Please sign in to comment.