[Tokens page]: fixed copied token,[ ColumnsConfigurationModal]: fixed…

… counter.
epam · Mar 21, 2024 · 825b6c0 · 825b6c0
1 parent 15fd874
commit 825b6c0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/app/src/docs/themes/implementation/TokenGroups.tsx b/app/src/docs/themes/implementation/TokenGroups.tsx
@@ -303,7 +303,7 @@ function TokenGroupItems(props: { items: ITokensDocItem[] }) {
             <FlexRow cx={ css.tokenCard } borderBottom={ true } alignItems="center" key={ item.value + item.cssVar }>
                 <FlexCell width="auto">
                     <Tooltip renderContent={ renderTooltipContent } placement="top" openDelay={ 200 }>
-                        <Text cx={ css.var } onClick={ () => copyTextToClipboard(item.cssVar, () => showNotification(item.cssVar, uuiNotifications)) }>
+                        <Text cx={ css.var } onClick={ () => copyTextToClipboard(`var(${item.cssVar})`, () => showNotification(item.cssVar, uuiNotifications)) }>
                             { item.cssVar.replace(/^--uui-/, '') }
                         </Text>
                     </Tooltip>

diff --git a/uui/components/tables/columnsConfigurationModal/ColumnsConfigurationModal.module.scss b/uui/components/tables/columnsConfigurationModal/ColumnsConfigurationModal.module.scss
@@ -5,23 +5,16 @@
     padding-top: 6px;
 
     .group-title {
-        margin-bottom: -6px;
+        margin-bottom: 6px;
 
         > .group-title-text {
             padding-top: 0;
+            padding-bottom: 0;
         }
 
 
         > .group-title-badge {
             top: -3px;
-
-            > :global(.uui-caption) {
-                font-family: var(--uui-font); //TODO: rework component
-                font-weight: 600;
-                padding-left: 0;
-                padding-right: 0;
-                color: var(--uui-neutral-70);
-            }
         }
 
         &:not(:first-child) {

diff --git a/uui/components/tables/columnsConfigurationModal/ColumnsConfigurationModal.tsx b/uui/components/tables/columnsConfigurationModal/ColumnsConfigurationModal.tsx
@@ -13,7 +13,7 @@ import { FlexRow, FlexSpacer, Panel, ScrollBars } from '../../layout';
 import { Button, LinkButton } from '../../buttons';
 import { Dropdown, DropdownMenuButton, ModalBlocker, ModalFooter, ModalHeader, ModalWindow, Tooltip } from '../../overlays';
 import { Text } from '../../typography';
-import { Badge } from '../../widgets';
+import { CountIndicator } from '../../widgets';
 import { SearchInput } from '../../inputs';
 
 import { i18n as uuiI18n } from '../../../i18n';
@@ -32,7 +32,8 @@ const renderGroupTitle = (title: string, amount: number) => (
         <Text cx={ styles.groupTitleText } fontWeight="600" lineHeight="24" fontSize="14">
             {title}
         </Text>
-        <Badge cx={ styles.groupTitleBadge } caption={ amount } color="neutral" size="18" />
+        <CountIndicator caption={ amount } color="neutral" size="18" />
+        <FlexSpacer />
     </FlexRow>
 );