diff --git a/src/__snapshots__/storybook.test.js.snap b/src/__snapshots__/storybook.test.js.snap index d3c0a8c96..ff720e754 100644 --- a/src/__snapshots__/storybook.test.js.snap +++ b/src/__snapshots__/storybook.test.js.snap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf4bd1a96b1d4645eba4b906d25a5264ffb75d072f0ce4cfad7381547c50719a -size 140792 +oid sha256:f4fc39921cdb89723b3f18785df5e4f8260e358204269bffcabc551fbe136195 +size 1892239 diff --git a/src/components/Inputs/input.module.scss b/src/components/Inputs/input.module.scss index 2273ede32..d8c5ec49e 100644 --- a/src/components/Inputs/input.module.scss +++ b/src/components/Inputs/input.module.scss @@ -103,10 +103,8 @@ } &.pill-shape { - border-color: transparent; + border-color: var(--border-color); border-radius: $corner-radius-xl; - box-shadow: 0 1px 2px rgba(15, 20, 31, 0.12), - 0 2px 8px rgba(15, 20, 31, 0.16); padding: $space-xs $space-s; } @@ -192,7 +190,7 @@ } .icon-button { - background-color: var(--background-color); + background-color: transparent; bottom: 1px; color: var(--grey-color-60); height: 34px; @@ -214,7 +212,7 @@ &:active, &:focus { - background-color: var(--background-color); + background-color: transparent; padding: $button-padding-vertical-small $space-xxs; svg { @@ -223,7 +221,7 @@ } &:hover { - background-color: var(--background-color); + background-color: transparent; padding: $button-padding-vertical-small $space-xxs; outline-color: transparent; diff --git a/src/components/Menu/MenuItem/menuItem.module.scss b/src/components/Menu/MenuItem/menuItem.module.scss index 47a0bfc04..40966dc0c 100644 --- a/src/components/Menu/MenuItem/menuItem.module.scss +++ b/src/components/Menu/MenuItem/menuItem.module.scss @@ -5,38 +5,44 @@ display: flex; align-items: center; gap: $space-xs; - border-radius: $space-xxs; + border-radius: $corner-radius-xl; cursor: pointer; font-weight: $text-font-weight-semibold; transition: all $motion-duration-extra-fast $motion-easing-easeinout 0s; &.large { - height: 48px; + height: 44px; + font-size: $text-font-size-4; + line-height: $text-line-height-3; padding: $button-padding-vertical-medium $button-padding-horizontal-medium; } &.medium { - height: 44px; + height: 36px; + font-size: $text-font-size-3; + line-height: $text-line-height-2; padding: $button-padding-vertical-medium $button-padding-horizontal-medium; } &.small { - height: 40px; + height: 28px; + font-size: $text-font-size-2; + line-height: $text-line-height-1; padding: $button-padding-vertical-small $button-padding-horizontal-small; } &.primary { - --label: var(--primary-color); + --label: var(--primary-color-70); &:hover { - --background: var(--primary-color-20); + --background: var(--accent-color-10); } &.active, &:active { - --background: var(--primary-color-10); + --background: var(--accent-color-20); } } @@ -44,12 +50,12 @@ --label: var(--disruptive-color); &:hover { - --background: var(--disruptive-color-20); + --background: var(--disruptive-color-10); } &.active, &:active { - --background: var(--disruptive-color-10); + --background: var(--disruptive-color-20); } } @@ -58,12 +64,12 @@ --label: var(--grey-color-70); &:hover { - --background: var(--grey-color-20); + --background: var(--grey-color-10); } &.active, &:active { - --background: var(--grey-color-10); + --background: var(--grey-color-20); } } @@ -83,26 +89,26 @@ :global(.focus-visible) { .menu-item { &:focus-visible { - outline-offset: 1px; + outline-offset: -1px; outline-width: $space-xxxs; outline-style: solid; } &.primary { &:focus-visible { - outline-color: var(--primary-color-50); + outline-color: var(--blueviolet-color-50); } } &.disruptive { &:focus-visible { - outline-color: var(--disruptive-color-50); + outline-color: var(--blueviolet-color-50); } } &.neutral { &:focus-visible { - outline-color: var(--grey-color-50); + outline-color: var(--blueviolet-color-50); } } } diff --git a/src/components/Pagination/Pager.tsx b/src/components/Pagination/Pager.tsx index cb718a17a..7e4028e8c 100644 --- a/src/components/Pagination/Pager.tsx +++ b/src/components/Pagination/Pager.tsx @@ -1,6 +1,11 @@ import React, { FC, useEffect, useCallback, useState, Ref } from 'react'; import { PagerProps } from './Pagination.types'; -import { ButtonSize, DefaultButton } from '../Button'; +import { + ButtonShape, + ButtonSize, + DefaultButton, + NeutralButton, +} from '../Button'; import { IconName } from '../Icon'; import { mergeClasses } from '../../shared/utilities'; @@ -123,14 +128,15 @@ export const Pager: FC = React.forwardRef(