From 3bd4256b9abaf9ba31d09e9e59c4ecd4975b20c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Kry=C5=A1p=C3=ADn?= Date: Fri, 30 Aug 2024 17:24:23 +0200 Subject: [PATCH] Feat(web): Switch Dropdown component to v3 design tokens #DS-1450 --- .../components/Dropdown/_DropdownPopover.scss | 2 +- .../web/src/scss/components/Dropdown/_theme.scss | 15 ++++++++------- packages/web/src/scss/components/index.scss | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/packages/web/src/scss/components/Dropdown/_DropdownPopover.scss b/packages/web/src/scss/components/Dropdown/_DropdownPopover.scss index bbb2099599..82d7bcd7b5 100644 --- a/packages/web/src/scss/components/Dropdown/_DropdownPopover.scss +++ b/packages/web/src/scss/components/Dropdown/_DropdownPopover.scss @@ -2,7 +2,7 @@ @use '../../tools/breakpoint'; @use '../../tools/dictionaries'; @use '../../tools/placement'; -@use 'theme' as theme; +@use 'theme'; .DropdownPopover { @include placement.child(); diff --git a/packages/web/src/scss/components/Dropdown/_theme.scss b/packages/web/src/scss/components/Dropdown/_theme.scss index 47b56b3276..cc4f284e60 100644 --- a/packages/web/src/scss/components/Dropdown/_theme.scss +++ b/packages/web/src/scss/components/Dropdown/_theme.scss @@ -1,10 +1,11 @@ -@use '@tokens' as tokens; +@use '@global' as global-tokens; @use '../../settings/dictionaries'; +@use '../../settings/globals'; -$breakpoints: tokens.$breakpoints; -$offset: tokens.$space-400; -$padding: tokens.$space-600; -$border-radius: tokens.$radius-200; -$background: tokens.$background-basic; -$shadow: tokens.$shadow-200; +$breakpoints: global-tokens.$breakpoints; +$offset: global-tokens.$space-500; +$padding: global-tokens.$space-700; +$border-radius: global-tokens.$radius-300; +$background: var(--#{globals.$prefix}color-background-primary); +$shadow: global-tokens.$shadow-200; $placement-dictionary: dictionaries.$placement; diff --git a/packages/web/src/scss/components/index.scss b/packages/web/src/scss/components/index.scss index 704879760b..95ef93705c 100644 --- a/packages/web/src/scss/components/index.scss +++ b/packages/web/src/scss/components/index.scss @@ -8,8 +8,8 @@ @forward 'Collapse'; @forward 'Container'; @forward 'Divider'; +@forward 'Dropdown'; -// @forward 'Dropdown'; // @forward 'FieldGroup'; // @forward 'FileUploader'; // @forward 'Flex';