From bf4e4e6743fe72e2036a3cf8d2753027c14605dc Mon Sep 17 00:00:00 2001 From: NikitaRodyukov Date: Mon, 10 Jul 2023 21:26:49 +0300 Subject: [PATCH 1/4] chore(themes): corp bluetint --- .storybook/addons/theme-switcher/utils.js | 2 +- bin/build-themes.js | 2 +- ...-inverted-views-themes-corp-theme-snap.png | 4 +- ...tabs-tabs-desktop-view-0-size-0-4-snap.png | 4 +- ...tabs-tabs-desktop-view-0-size-1-4-snap.png | 4 +- ...tabs-tabs-desktop-view-0-size-2-4-snap.png | 4 +- ...tabs-tabs-desktop-view-0-size-3-4-snap.png | 4 +- ...tabs-tabs-desktop-view-0-size-4-4-snap.png | 4 +- ...tabs-tabs-desktop-view-0-size-5-4-snap.png | 4 +- ...tabs-tabs-desktop-view-1-size-0-4-snap.png | 4 +- ...tabs-tabs-desktop-view-1-size-1-4-snap.png | 4 +- ...tabs-tabs-desktop-view-1-size-2-4-snap.png | 4 +- ...tabs-tabs-desktop-view-1-size-3-4-snap.png | 4 +- ...tabs-tabs-desktop-view-1-size-4-4-snap.png | 4 +- ...tabs-tabs-desktop-view-1-size-5-4-snap.png | 4 +- .../themes/src/mixins/calendar-input/corp.css | 4 -- packages/themes/src/mixins/corp.css | 10 ----- .../themes/src/mixins/form-control/corp.css | 44 ------------------- packages/themes/src/mixins/input/corp.css | 3 -- packages/themes/src/mixins/select/corp.css | 9 ---- .../themes/src/mixins/slider-input/corp.css | 13 ------ packages/vars/src/bundle/corp.css | 4 +- 22 files changed, 30 insertions(+), 113 deletions(-) delete mode 100644 packages/themes/src/mixins/calendar-input/corp.css delete mode 100644 packages/themes/src/mixins/form-control/corp.css delete mode 100644 packages/themes/src/mixins/input/corp.css delete mode 100644 packages/themes/src/mixins/select/corp.css delete mode 100644 packages/themes/src/mixins/slider-input/corp.css diff --git a/.storybook/addons/theme-switcher/utils.js b/.storybook/addons/theme-switcher/utils.js index 4f94b36979..252fbe04c5 100644 --- a/.storybook/addons/theme-switcher/utils.js +++ b/.storybook/addons/theme-switcher/utils.js @@ -40,7 +40,7 @@ export function setThemeStylesInMobileFrame(theme) { } export function getThemeStyles(selectedTheme) { - const indigoThemes = ['corp', 'site']; + const indigoThemes = ['site']; const indigoVars = [indigoColors, indigoShadows].join('\n'); const css = [ diff --git a/bin/build-themes.js b/bin/build-themes.js index 7415720907..af8a20b7d7 100755 --- a/bin/build-themes.js +++ b/bin/build-themes.js @@ -9,7 +9,7 @@ const postcssMixins = require('postcss-mixins'); const replaceMixinToRoot = (css) => css.replace(/@define-mixin.*$/m, ':root {'); -const bluetintThemes = ['mobile', 'intranet', 'click']; +const bluetintThemes = ['mobile', 'intranet', 'click', 'corp']; const getPalette = (cssFile) => bluetintThemes.some((x) => cssFile.includes(x)) ? 'bluetint' : 'indigo'; diff --git a/packages/button/src/__image_snapshots__/button-inverted-views-themes-corp-theme-snap.png b/packages/button/src/__image_snapshots__/button-inverted-views-themes-corp-theme-snap.png index aa397ee7ae..0a9cdfdb13 100644 --- a/packages/button/src/__image_snapshots__/button-inverted-views-themes-corp-theme-snap.png +++ b/packages/button/src/__image_snapshots__/button-inverted-views-themes-corp-theme-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e071454cb4352747eb28f38adb3cc59526d4c65754524575165c57a7a49f21b2 -size 31788 +oid sha256:2df3acb42599c698c647bb8ec86987896e628b5709f5609f9f6b0e8980d48312 +size 30695 diff --git a/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-0-size-0-4-snap.png b/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-0-size-0-4-snap.png index d0505aa289..bb8c45a9f9 100644 --- a/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-0-size-0-4-snap.png +++ b/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-0-size-0-4-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:edde274caf1ab5c259d4973412a611710ad8e3a2d8ae818399cafa03687a429b -size 9395 +oid sha256:9479bc1190775540e0e3c01215ebb2c67d85e3fa48124167b28729d0bd4771e8 +size 9178 diff --git a/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-0-size-1-4-snap.png b/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-0-size-1-4-snap.png index b476169601..3736e8c7d1 100644 --- a/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-0-size-1-4-snap.png +++ b/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-0-size-1-4-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de265b7b9ac135c5a823ab5aa417e4b766667cab11685d16e7c39a7e893c3215 -size 9435 +oid sha256:89065a21565a65496424447a59613fcae9009af0d89aa2ea7e709017260902f9 +size 9178 diff --git a/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-0-size-2-4-snap.png b/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-0-size-2-4-snap.png index d0505aa289..3736e8c7d1 100644 --- a/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-0-size-2-4-snap.png +++ b/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-0-size-2-4-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:edde274caf1ab5c259d4973412a611710ad8e3a2d8ae818399cafa03687a429b -size 9395 +oid sha256:89065a21565a65496424447a59613fcae9009af0d89aa2ea7e709017260902f9 +size 9178 diff --git a/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-0-size-3-4-snap.png b/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-0-size-3-4-snap.png index e7496cefd0..956258a04b 100644 --- a/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-0-size-3-4-snap.png +++ b/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-0-size-3-4-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d2feb23e10bd6b4e5105dad966609364ef25501eb812d7d0b0f3291c0b1f272 -size 9435 +oid sha256:3e40b504f6ab8140c0c26eb3ae9191cdaf4853ef16be9387c7052b0d69ac479b +size 9178 diff --git a/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-0-size-4-4-snap.png b/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-0-size-4-4-snap.png index aafd5d04ee..0273662507 100644 --- a/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-0-size-4-4-snap.png +++ b/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-0-size-4-4-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:903ac1dfd5fe0cd1fcff8369ee1c5844d9fa4cd4085b308191b9c82280733bbc -size 9435 +oid sha256:25437c730af3e6166257fa7998efdb9392872a4dd2e753504583af68bb7c1b30 +size 9178 diff --git a/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-0-size-5-4-snap.png b/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-0-size-5-4-snap.png index 99c9e448e8..e116829df0 100644 --- a/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-0-size-5-4-snap.png +++ b/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-0-size-5-4-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39eb491476fe09c78eb59707fa7e6f8999227e5722c44b846dd70d79ab308d17 -size 9435 +oid sha256:ba7540ea186bda20a7f4e4f63799904bfad853fce16ed16a62ae165af33fc44c +size 9178 diff --git a/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-1-size-0-4-snap.png b/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-1-size-0-4-snap.png index 90eead3a76..ec0d9fd82d 100644 --- a/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-1-size-0-4-snap.png +++ b/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-1-size-0-4-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:704a7d074e076c047dcb13b09642f284cb5538d3e10955696db68f63144de4dc -size 10850 +oid sha256:9e0adc1ca7009c722f121d90a2370086c29a2732178a6a0e55b763c8171bfb2d +size 10517 diff --git a/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-1-size-1-4-snap.png b/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-1-size-1-4-snap.png index 42f96ba312..6d66db9e03 100644 --- a/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-1-size-1-4-snap.png +++ b/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-1-size-1-4-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5528909b43d4484d80b139faa3f340f4838599f03d929de84e4b3503fe4682df -size 10842 +oid sha256:190a5130f7104ec45a44dfa30dcc128ace59a84a418c57d06e20429a32163198 +size 10888 diff --git a/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-1-size-2-4-snap.png b/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-1-size-2-4-snap.png index fc5c70e25b..09e91aa113 100644 --- a/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-1-size-2-4-snap.png +++ b/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-1-size-2-4-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:adb56f829c13f678577717e30a82bfcc1803340e80df68232c6d569a216e187d -size 11064 +oid sha256:08b7006f982d067bbf3e69c2ce197ae07bca1eb99b082e5e5186d30396b2aca3 +size 11053 diff --git a/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-1-size-3-4-snap.png b/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-1-size-3-4-snap.png index ecfc7c6c51..75db5567b9 100644 --- a/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-1-size-3-4-snap.png +++ b/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-1-size-3-4-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e13ef5ad41dc11c598d542e84cb5cfcd0f526d0bd374b62173b819023c62623a -size 11929 +oid sha256:0e6afa0a15433a521a91bbbbdcf2afd737685fe5f71a2a10d321fa04537f3691 +size 11861 diff --git a/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-1-size-4-4-snap.png b/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-1-size-4-4-snap.png index 247939cff4..47e04a80a0 100644 --- a/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-1-size-4-4-snap.png +++ b/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-1-size-4-4-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28220a7d52adeb74dc525da30c05e536241d89a300b4f67f6fd9f6e92697c5c7 -size 12329 +oid sha256:5f1085210fe89a284709a20212b0a3fbee14c4014c65fe546f1619d1017fe245 +size 12291 diff --git a/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-1-size-5-4-snap.png b/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-1-size-5-4-snap.png index 62ec53aa05..a33bb6baa6 100644 --- a/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-1-size-5-4-snap.png +++ b/packages/tabs/src/__image_snapshots__/corp-tabs-tabs-desktop-view-1-size-5-4-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31559e69035895e055c21658a678e8cbe7e0d4c96286b6bb07ee6308da805872 -size 12812 +oid sha256:cefcd99afd9e47cd63ad2b76928139927e37cc08a68020b9cb6e02bcabd99ac2 +size 12737 diff --git a/packages/themes/src/mixins/calendar-input/corp.css b/packages/themes/src/mixins/calendar-input/corp.css deleted file mode 100644 index 53af7cc7c7..0000000000 --- a/packages/themes/src/mixins/calendar-input/corp.css +++ /dev/null @@ -1,4 +0,0 @@ -@define-mixin calendar-input-corp { - --calendar-input-icon-color: var(--color-light-graphic-secondary); - --calendar-input-popover-border-radius: 0 0 var(--border-radius-m) var(--border-radius-m); -} diff --git a/packages/themes/src/mixins/corp.css b/packages/themes/src/mixins/corp.css index 7043c04f65..ecf8f9e428 100644 --- a/packages/themes/src/mixins/corp.css +++ b/packages/themes/src/mixins/corp.css @@ -1,21 +1,11 @@ @import './button/corp.css'; -@import './input/corp.css'; @import './tabs/corp.css'; -@import './calendar-input/corp.css'; -@import './select/corp.css'; @import './bottom-sheet/corp.css'; @import './modal/corp.css'; -@import './form-control/corp.css'; -@import './slider-input/corp.css'; @define-mixin theme-corp { @mixin button-corp; - @mixin input-corp; @mixin tabs-corp; - @mixin calendar-input-corp; - @mixin select-corp; @mixin bottom-sheet-corp; @mixin modal-corp; - @mixin form-control-corp; - @mixin slider-input-corp; } diff --git a/packages/themes/src/mixins/form-control/corp.css b/packages/themes/src/mixins/form-control/corp.css deleted file mode 100644 index b6ba735a08..0000000000 --- a/packages/themes/src/mixins/form-control/corp.css +++ /dev/null @@ -1,44 +0,0 @@ -@define-mixin form-control-corp { - /* theme */ - --form-control-s-border-radius: 4px 4px 0 0; - --form-control-m-border-radius: 4px 4px 0 0; - --form-control-l-border-radius: 4px 4px 0 0; - --form-control-xl-border-radius: 4px 4px 0 0; - --form-control-bg-backdrop-filter: blur(20px); - --form-control-border-bottom: 1px solid var(--color-light-border-underline); - --form-control-inverted-border-bottom: 1px solid var(--color-light-border-underline-inverted); - --form-control-bg-color: var(--color-light-bg-primary-inverted-alpha-7); - --form-control-inverted-bg-color: var(--color-light-specialbg-component-inverted); - - /* focus */ - --form-control-focus-shadow: none; - --form-control-focus-border-bottom: 1px solid var(--color-light-border-key); - --form-control-focus-bg-color: var(--color-light-bg-primary-inverted-alpha-15); - --form-control-inverted-focus-border-bottom: 1px solid var(--color-light-border-key-inverted); - --form-control-inverted-focus-shadow: none; - --form-control-focus-error-shadow: none; - --form-control-inverted-focus-error-shadow: none; - - /* hover */ - --form-control-hover-bg-color: var(--color-light-bg-primary-inverted-alpha-15); - --form-control-inverted-hover-bg-color: var(--color-light-specialbg-component-inverted-tint-15); - - /* error */ - --form-control-error-color: var(--color-light-text-negative); - --form-control-inverted-error-color: var(--color-light-text-negative); - --form-control-error-border-bottom: 1px solid var(--color-static-border-accent); - --form-control-error-shadow: none; - --form-control-inverted-error-shadow: none; - --form-control-inverted-error-border-bottom: 1px solid var(--color-static-border-accent); - --form-control-error-bg-color: var(--color-light-bg-primary-inverted-alpha-7); - --form-control-inverted-error-bg-color: var(--color-light-specialbg-component-inverted); - - /* disabled */ - --form-control-disabled-border-bottom: 1px dashed var(--color-light-border-underline); - --form-control-inverted-disabled-border-bottom: 1px dashed - var(--color-light-border-underline-inverted); - --form-control-disabled-bg-color: var(--color-light-bg-primary-inverted-alpha-15); - --form-control-inverted-disabled-bg-color: var( - --color-light-specialbg-component-inverted-tint-15 - ); -} diff --git a/packages/themes/src/mixins/input/corp.css b/packages/themes/src/mixins/input/corp.css deleted file mode 100644 index f2786f72c7..0000000000 --- a/packages/themes/src/mixins/input/corp.css +++ /dev/null @@ -1,3 +0,0 @@ -@define-mixin input-corp { - --input-error-icon-display: block; -} diff --git a/packages/themes/src/mixins/select/corp.css b/packages/themes/src/mixins/select/corp.css deleted file mode 100644 index cbfcbfc3bc..0000000000 --- a/packages/themes/src/mixins/select/corp.css +++ /dev/null @@ -1,9 +0,0 @@ -@define-mixin select-corp { - --select-arrow-color: var(--color-light-graphic-secondary); - --select-options-list-border-radius: 0 0 var(--border-radius-m) var(--border-radius-m); - --select-options-list-offset: 0; - - /* select mobile footer */ - - --select-mobile-footer-border-top: 1px solid var(--color-light-border-primary); -} diff --git a/packages/themes/src/mixins/slider-input/corp.css b/packages/themes/src/mixins/slider-input/corp.css deleted file mode 100644 index 4d00d02c8e..0000000000 --- a/packages/themes/src/mixins/slider-input/corp.css +++ /dev/null @@ -1,13 +0,0 @@ -@define-mixin slider-input-corp { - --slider-input-s-border-bottom-radius: 0; - --slider-input-m-border-bottom-radius: 0; - --slider-input-l-border-bottom-radius: 0; - --slider-input-xl-border-bottom-radius: 0; - --slider-input-progress-margin-horizontal: 0; - --slider-input-xl-progress-margin-horizontal: 0; - --slider-input-progress-border-radius: 0; - --slider-input-progress-bg-color: var(--color-light-bg-quaternary); - --slider-input-progress-hover-bg-color: var(--color-light-bg-quaternary); - --slider-input-origin-width: 100%; - --slider-input-origin-right: 0; -} diff --git a/packages/vars/src/bundle/corp.css b/packages/vars/src/bundle/corp.css index 16a3f03f79..48e3b0176f 100644 --- a/packages/vars/src/bundle/corp.css +++ b/packages/vars/src/bundle/corp.css @@ -1,6 +1,6 @@ -@import '../colors-indigo.css'; +@import '../colors-bluetint.css'; @import '../colors-addons.css'; -@import '../shadows-indigo.css'; +@import '../shadows-bluetint.css'; @import '../border-radius.css'; @import '../gaps.css'; @import '../typography.css'; From c2a8ad3816d3a8cf98a97c9c9780b5018358632f Mon Sep 17 00:00:00 2001 From: NikitaRodyukov <104258116+NikitaRodyukov@users.noreply.github.com> Date: Tue, 11 Jul 2023 10:40:33 +0300 Subject: [PATCH 2/4] Create loud-badgers-brush.md --- .changeset/loud-badgers-brush.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .changeset/loud-badgers-brush.md diff --git a/.changeset/loud-badgers-brush.md b/.changeset/loud-badgers-brush.md new file mode 100644 index 0000000000..c19f3d9261 --- /dev/null +++ b/.changeset/loud-badgers-brush.md @@ -0,0 +1,8 @@ +--- +"@alfalab/core-components-button": patch +"@alfalab/core-components-tabs": patch +"@alfalab/core-components-themes": patch +"@alfalab/core-components-vars": patch +--- + +Перевод corp темизации на bluetint цвета, приведение компонентов Input, Select к core тимизации From e2c3f673dd25b26d527ebcf49df600432184ef27 Mon Sep 17 00:00:00 2001 From: NikitaRodyukov <104258116+NikitaRodyukov@users.noreply.github.com> Date: Thu, 20 Jul 2023 10:12:05 +0300 Subject: [PATCH 3/4] Update loud-badgers-brush.md --- .changeset/loud-badgers-brush.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/loud-badgers-brush.md b/.changeset/loud-badgers-brush.md index c19f3d9261..55f9a6e4da 100644 --- a/.changeset/loud-badgers-brush.md +++ b/.changeset/loud-badgers-brush.md @@ -5,4 +5,4 @@ "@alfalab/core-components-vars": patch --- -Перевод corp темизации на bluetint цвета, приведение компонентов Input, Select к core тимизации +Перевод corp темизации на bluetint цвета, приведение компонентов Input, Select к core темизации From 6843fa115ad7bf0222fe0d3f056a611c139f3fdb Mon Sep 17 00:00:00 2001 From: NikitaRodyukov <104258116+NikitaRodyukov@users.noreply.github.com> Date: Thu, 20 Jul 2023 10:41:55 +0300 Subject: [PATCH 4/4] changed change type from patch to minor --- .changeset/loud-badgers-brush.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.changeset/loud-badgers-brush.md b/.changeset/loud-badgers-brush.md index 55f9a6e4da..c8df8b1d20 100644 --- a/.changeset/loud-badgers-brush.md +++ b/.changeset/loud-badgers-brush.md @@ -1,8 +1,8 @@ --- -"@alfalab/core-components-button": patch -"@alfalab/core-components-tabs": patch -"@alfalab/core-components-themes": patch -"@alfalab/core-components-vars": patch +"@alfalab/core-components-button": minor +"@alfalab/core-components-tabs": minor +"@alfalab/core-components-themes": minor +"@alfalab/core-components-vars": minor --- Перевод corp темизации на bluetint цвета, приведение компонентов Input, Select к core темизации