diff --git a/.github/actions/build-and-push/action.yml b/.github/actions/build-and-push/action.yml index 477b8ef..75cdd4f 100644 --- a/.github/actions/build-and-push/action.yml +++ b/.github/actions/build-and-push/action.yml @@ -64,12 +64,6 @@ runs: with: node-version: ${{ inputs.node-version }} - - name: Set NPM_TOKEN - env: - NPM_TOKEN: ${{ inputs.npm-token }} - shell: bash - run: npm config set '//registry.npmjs.org/:_authToken' "${{ env.NPM_TOKEN }}" - - name: Clean install shell: bash run: npm ci diff --git a/.github/actions/setup-project/action.yml b/.github/actions/setup-project/action.yml index 860bdba..519038a 100644 --- a/.github/actions/setup-project/action.yml +++ b/.github/actions/setup-project/action.yml @@ -1,11 +1,6 @@ name: Setup project description: Setup npm project in Node.js -inputs: - NPM_TOKEN: - required: true - description: NPM_TOKEN - outputs: node-version: description: The resolved and installed Node.js version. @@ -32,12 +27,8 @@ runs: key: os-${{ runner.os }}/node-${{ steps.node.outputs.version }}/node_modules-${{ hashFiles('package-lock.json') }} - name: Install dependencies if: ${{ steps.cache-node-modules.outputs.cache-hit != 'true' }} - run: | - echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" > .npmrc - npm ci + run: npm ci shell: bash - env: - NPM_TOKEN: ${{ inputs.NPM_TOKEN }} - name: Cache node_modules if: ${{ steps.cache-node-modules.outputs.cache-hit != 'true' }} uses: actions/cache@v4 diff --git a/.github/workflows/build-and-push-prod.yml b/.github/workflows/build-and-push-prod.yml index c79f558..1407ae6 100644 --- a/.github/workflows/build-and-push-prod.yml +++ b/.github/workflows/build-and-push-prod.yml @@ -29,5 +29,4 @@ jobs: aws-access-key-id: ${{ secrets.AWS_S3_PROD_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_S3_PROD_SECRET_ACCESS_KEY }} s3-bucket-name: ${{ secrets.AWS_S3_PROD_BUCKET_NAME }} - amplify-app-id: ${{ secrets.AWS_AMPLIFY_PROD_APP_ID }} - npm-token: ${{ secrets.NPM_TOKEN }} \ No newline at end of file + amplify-app-id: ${{ secrets.AWS_AMPLIFY_PROD_APP_ID }} \ No newline at end of file diff --git a/.github/workflows/build-and-push-stage.yml b/.github/workflows/build-and-push-stage.yml index a9fad1c..048f0a3 100644 --- a/.github/workflows/build-and-push-stage.yml +++ b/.github/workflows/build-and-push-stage.yml @@ -29,5 +29,4 @@ jobs: aws-access-key-id: ${{ secrets.AWS_S3_STAGE_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_S3_STAGE_SECRET_ACCESS_KEY }} s3-bucket-name: ${{ secrets.AWS_S3_STAGE_BUCKET_NAME }} - amplify-app-id: ${{ secrets.AWS_AMPLIFY_STAGE_APP_ID }} - npm-token: ${{ secrets.NPM_TOKEN }} \ No newline at end of file + amplify-app-id: ${{ secrets.AWS_AMPLIFY_STAGE_APP_ID }} \ No newline at end of file diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml index 17bfa86..11f1cc9 100644 --- a/.github/workflows/chromatic.yml +++ b/.github/workflows/chromatic.yml @@ -16,8 +16,6 @@ jobs: steps: - uses: actions/checkout@v4 - uses: ./.github/actions/setup-project - with: - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} storybook: name: Chromatic toolset initialization diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index c9d9047..e0a9cdd 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -11,8 +11,6 @@ jobs: steps: - uses: actions/checkout@v4 - uses: ./.github/actions/setup-project - with: - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} lint-commits: name: Lint commits @@ -23,8 +21,6 @@ jobs: with: fetch-depth: 0 - uses: ./.github/actions/setup-project - with: - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - run: npx commitlint --from ${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }} --to ${{ github.event.pull_request.head.sha }} --verbose type-check: @@ -34,8 +30,6 @@ jobs: steps: - uses: actions/checkout@v4 - uses: ./.github/actions/setup-project - with: - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - run: npm run type-check lint: @@ -45,8 +39,6 @@ jobs: steps: - uses: actions/checkout@v4 - uses: ./.github/actions/setup-project - with: - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - run: npm run lint test: @@ -57,8 +49,6 @@ jobs: steps: - uses: actions/checkout@v4 - uses: ./.github/actions/setup-project - with: - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - name: Export variables shell: bash env: diff --git a/README.md b/README.md index 40d6e1e..be1c2ed 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -# Shielding dApp +# BlankSquare WebApp diff --git a/index.html b/index.html index 2fff698..862d096 100644 --- a/index.html +++ b/index.html @@ -5,13 +5,13 @@ - Common Web App + Blanksquare Web App - + - + diff --git a/package-lock.json b/package-lock.json index 3a6b9c1..e27b55c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "shielding-dapp", + "name": "blanksquare-webapp", "version": "0.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "shielding-dapp", + "name": "blanksquare-webapp", "version": "0.0.0", "dependencies": { "@cardinal-cryptography/shielder-sdk": "^0.2.0-beta.8", diff --git a/package.json b/package.json index 174737a..506456e 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "shielding-dapp", + "name": "blanksquare-webapp", "private": true, "version": "0.0.0", "type": "module", diff --git a/public/favicon.svg b/public/favicon.svg index fc81d3d..e90bd16 100644 --- a/public/favicon.svg +++ b/public/favicon.svg @@ -1,3 +1,11 @@ - - + + + + + + + + + + diff --git a/public/fonts/Innovator Grotesk/InnovatorGrotesk-Bold.otf b/public/fonts/Innovator Grotesk/InnovatorGrotesk-Bold.otf new file mode 100644 index 0000000..9f8bf2d Binary files /dev/null and b/public/fonts/Innovator Grotesk/InnovatorGrotesk-Bold.otf differ diff --git a/public/fonts/Innovator Grotesk/InnovatorGrotesk-Bold.woff2 b/public/fonts/Innovator Grotesk/InnovatorGrotesk-Bold.woff2 new file mode 100644 index 0000000..d02d3a4 Binary files /dev/null and b/public/fonts/Innovator Grotesk/InnovatorGrotesk-Bold.woff2 differ diff --git a/public/fonts/Innovator Grotesk/InnovatorGrotesk-Light.otf b/public/fonts/Innovator Grotesk/InnovatorGrotesk-Light.otf new file mode 100644 index 0000000..1e2af57 Binary files /dev/null and b/public/fonts/Innovator Grotesk/InnovatorGrotesk-Light.otf differ diff --git a/public/fonts/Innovator Grotesk/InnovatorGrotesk-Light.woff2 b/public/fonts/Innovator Grotesk/InnovatorGrotesk-Light.woff2 new file mode 100644 index 0000000..6903a23 Binary files /dev/null and b/public/fonts/Innovator Grotesk/InnovatorGrotesk-Light.woff2 differ diff --git a/public/fonts/Innovator Grotesk/InnovatorGrotesk-Medium.otf b/public/fonts/Innovator Grotesk/InnovatorGrotesk-Medium.otf new file mode 100644 index 0000000..497f2d0 Binary files /dev/null and b/public/fonts/Innovator Grotesk/InnovatorGrotesk-Medium.otf differ diff --git a/public/fonts/Innovator Grotesk/InnovatorGrotesk-Medium.woff2 b/public/fonts/Innovator Grotesk/InnovatorGrotesk-Medium.woff2 new file mode 100644 index 0000000..8fe5957 Binary files /dev/null and b/public/fonts/Innovator Grotesk/InnovatorGrotesk-Medium.woff2 differ diff --git a/public/fonts/Innovator Grotesk/InnovatorGrotesk-Regular.otf b/public/fonts/Innovator Grotesk/InnovatorGrotesk-Regular.otf new file mode 100644 index 0000000..c14c2f5 Binary files /dev/null and b/public/fonts/Innovator Grotesk/InnovatorGrotesk-Regular.otf differ diff --git a/public/fonts/Innovator Grotesk/InnovatorGrotesk-Regular.woff2 b/public/fonts/Innovator Grotesk/InnovatorGrotesk-Regular.woff2 new file mode 100644 index 0000000..5c68918 Binary files /dev/null and b/public/fonts/Innovator Grotesk/InnovatorGrotesk-Regular.woff2 differ diff --git a/public/fonts/Innovator Grotesk/InnovatorGrotesk-SemiBold.otf b/public/fonts/Innovator Grotesk/InnovatorGrotesk-SemiBold.otf new file mode 100644 index 0000000..e0e7547 Binary files /dev/null and b/public/fonts/Innovator Grotesk/InnovatorGrotesk-SemiBold.otf differ diff --git a/public/fonts/Innovator Grotesk/InnovatorGrotesk-SemiBold.woff2 b/public/fonts/Innovator Grotesk/InnovatorGrotesk-SemiBold.woff2 new file mode 100644 index 0000000..4b3da62 Binary files /dev/null and b/public/fonts/Innovator Grotesk/InnovatorGrotesk-SemiBold.woff2 differ diff --git a/scripts/generateIcons.ts b/scripts/generateIcons.ts index 9226180..d53e71f 100644 --- a/scripts/generateIcons.ts +++ b/scripts/generateIcons.ts @@ -5,7 +5,7 @@ import { fileURLToPath } from 'url'; const __filename = fileURLToPath(import.meta.url); const __dirname = path.dirname(__filename); const rootDir = path.resolve(__dirname, '..'); -const iconsDir = path.join(rootDir, 'src/domains/misc/components/CIcon/icons'); +const iconsDir = path.join(rootDir, 'src/domains/misc/components/BIcon/icons'); if (!fs.existsSync(iconsDir)) { console.error(`Icons directory not found: ${iconsDir}`); @@ -40,7 +40,7 @@ export type IconName = keyof typeof icons; `; fs.writeFileSync( - path.join(rootDir, 'src/domains/misc/components/CIcon/icons.ts'), + path.join(rootDir, 'src/domains/misc/components/BIcon/icons.ts'), content ); diff --git a/src/domains/chains/components/ChainSelector.tsx b/src/domains/chains/components/ChainSelector.tsx index 573a304..83e3704 100644 --- a/src/domains/chains/components/ChainSelector.tsx +++ b/src/domains/chains/components/ChainSelector.tsx @@ -6,8 +6,8 @@ import ChainIcon from 'src/domains/chains/components/ChainIcon'; import { Definition } from 'src/domains/chains/utils/definitions'; import supportedChains from 'src/domains/chains/utils/supportedChains'; import useChain from 'src/domains/chains/utils/useChain'; +import BIcon from 'src/domains/misc/components/BIcon'; import Button from 'src/domains/misc/components/Button'; -import CIcon from 'src/domains/misc/components/CIcon'; import SelectBox from 'src/domains/misc/components/SelectBox'; import { BOTTOM_MENU_BREAKPOINT, BREAKPOINTS } from 'src/domains/misc/consts/consts'; import { typography } from 'src/domains/styling/utils/tokens'; @@ -29,7 +29,7 @@ const ChainSelector = () => {

{chain.name}

- {chainConfig?.id === chain.id && } + {chainConfig?.id === chain.id && } ), }); @@ -51,7 +51,7 @@ const ChainSelector = () => { ) : ( 'Select Network' )} - + @@ -82,11 +82,12 @@ const StyledButton = styled(Button)` padding-inline: ${vars('--spacing-s')}; width: ${CHAIN_SELECTOR_WIDTH}px; + border-radius: ${vars('--spacing-s')}; background: ${vars('--color-neutral-background-1-rest')}; border-color: ${vars('--color-neutral-stroke-2-rest')}; overflow: hidden; - ${typography.web.body1}; + ${typography.body1}; @media (width <= ${BOTTOM_MENU_BREAKPOINT}) { /* stylelint-disable-line media-query-no-invalid */ width: fit-content; @@ -99,9 +100,9 @@ const Option = styled.div` gap: ${vars('--spacing-s')}; width: 100%; - ${typography.web.body1Strong}; + ${typography.body1Strong}; - & > ${CIcon} { + & > ${BIcon} { margin-left: auto; } `; diff --git a/src/domains/chains/components/ConnectModal.tsx b/src/domains/chains/components/ConnectModal.tsx index 26c155b..fa5f2b9 100644 --- a/src/domains/chains/components/ConnectModal.tsx +++ b/src/domains/chains/components/ConnectModal.tsx @@ -1,8 +1,8 @@ import styled from 'styled-components'; import { useWallet } from 'src/domains/chains/components/WalletProvider'; +import BIcon from 'src/domains/misc/components/BIcon'; import Button from 'src/domains/misc/components/Button'; -import CIcon from 'src/domains/misc/components/CIcon'; import Modal, { useModalControls } from 'src/domains/misc/components/Modal'; import CheckedContainer from 'src/domains/misc/components/PatternContainer'; import { PRIVACY_POLICY_LINK, TERMS_OF_CONDITIONS_LINK, TERMS_OF_SERVICE_LINK } from 'src/domains/misc/consts/consts'; @@ -28,9 +28,9 @@ const ConnectModal = () => { - + -

Common Web App

+

Blanksquare Web App

@@ -42,15 +42,15 @@ const ConnectModal = () => { </Text> <LinksWrapper> <Link href={TERMS_OF_SERVICE_LINK} target="_blank" rel="noopener noreferrer"> - <CIcon icon="DocumentText" size={20} /> + <BIcon icon="DocumentText" size={20} /> <p>Terms of service</p> </Link> <Link href={TERMS_OF_CONDITIONS_LINK} target="_blank" rel="noopener noreferrer"> - <CIcon icon="DocumentText" size={20} /> + <BIcon icon="DocumentText" size={20} /> <p>Terms and Conditions</p> </Link> <Link href={PRIVACY_POLICY_LINK} target="_blank" rel="noopener noreferrer"> - <CIcon icon="DocumentText" size={20} /> + <BIcon icon="DocumentText" size={20} /> <p>Privacy policy</p> </Link> </LinksWrapper> @@ -81,7 +81,7 @@ const Content = styled.div` `; const Title = styled.h3` - ${typography.decorative.subtitle1}; + ${typography.subtitle1}; `; const Text = styled.p` @@ -92,7 +92,7 @@ const Text = styled.p` text-wrap: pretty; - ${typography.decorative.body1}; + ${typography.body1}; `; const Buttons = styled.div` @@ -115,7 +115,7 @@ const Link = styled.a` display: flex; gap: ${vars('--spacing-xs')}; color: ${vars('--color-brand-foreground-link-rest')}; - ${typography.web.body1}; + ${typography.body1}; & > a { color: ${vars('--color-brand-foreground-link-rest')}; @@ -128,14 +128,11 @@ const Branding = styled.div` position: relative; gap: ${vars('--spacing-s')}; align-items: center; - color: ${vars('--color-neutral-foreground-2-rest')}; - ${typography.web.subtitle1}; + ${typography.subtitle1}; `; const LogoContainer = styled.div` display: grid; place-items: center; padding: ${vars('--spacing-xxs')}; - border-radius: ${vars('--spacing-s-nudge')}; - background: #E5EFFF; `; diff --git a/src/domains/misc/components/AccountTypeIcon.tsx b/src/domains/misc/components/AccountTypeIcon.tsx index c699d46..5f1d536 100644 --- a/src/domains/misc/components/AccountTypeIcon.tsx +++ b/src/domains/misc/components/AccountTypeIcon.tsx @@ -1,7 +1,7 @@ import styled, { css } from 'styled-components'; import ChainIcon from 'src/domains/chains/components/ChainIcon'; -import CIcon from 'src/domains/misc/components/CIcon'; +import BIcon from 'src/domains/misc/components/BIcon'; import vars from 'src/domains/styling/utils/vars'; type Props = { @@ -15,7 +15,7 @@ type Props = { const AccountTypeIcon = ({ type, size, className, withBorder, chainId }: Props) => ( <Wrapper> <IconWrapper className={className} $size={size} $withBorder={withBorder}> - <CIcon + <BIcon icon={type === 'public' ? 'PersonFilled' : 'ShieldedFilled'} size={size / 1.6} /> diff --git a/src/domains/misc/components/CIcon/CIcon.tsx b/src/domains/misc/components/BIcon/BIcon.tsx similarity index 90% rename from src/domains/misc/components/CIcon/CIcon.tsx rename to src/domains/misc/components/BIcon/BIcon.tsx index f60d2c6..4fef362 100644 --- a/src/domains/misc/components/CIcon/CIcon.tsx +++ b/src/domains/misc/components/BIcon/BIcon.tsx @@ -13,7 +13,7 @@ type Props = { className?: string, } & ComponentProps<'svg'>; -const CIcon = forwardRef<SVGSVGElement, Props>(({ +const BIcon = forwardRef<SVGSVGElement, Props>(({ icon, size = 24, color, @@ -36,9 +36,9 @@ const CIcon = forwardRef<SVGSVGElement, Props>(({ ); }); -CIcon.displayName = 'CIcon'; +BIcon.displayName = 'BIcon'; -export default styled(CIcon)``; +export default styled(BIcon)``; const Icon = styled.div<{ $size: Size, diff --git a/src/domains/misc/components/CIcon/icons.ts b/src/domains/misc/components/BIcon/icons.ts similarity index 98% rename from src/domains/misc/components/CIcon/icons.ts rename to src/domains/misc/components/BIcon/icons.ts index 37c21b5..264f4f5 100644 --- a/src/domains/misc/components/CIcon/icons.ts +++ b/src/domains/misc/components/BIcon/icons.ts @@ -4,6 +4,7 @@ * @warning Do not modify this file directly. Add or update SVG files in the icons directory and run the generator */ +import Blanksquare from './icons/Blanksquare.svg?react'; import Add from './icons/add.svg?react'; import AddCircle from './icons/addCircle.svg?react'; import AddSquare from './icons/addSquare.svg?react'; @@ -27,7 +28,6 @@ import Chevron from './icons/chevron.svg?react'; import ChevronDoubleDownRegular from './icons/chevronDoubleDownRegular.svg?react'; import ChevronLeft from './icons/chevronLeft.svg?react'; import ClipboardPaste from './icons/clipboardPaste.svg?react'; -import Common from './icons/common.svg?react'; import CompassNorthWest from './icons/compassNorthWest.svg?react'; import Copied from './icons/copied.svg?react'; import Copy from './icons/copy.svg?react'; @@ -76,6 +76,7 @@ import WarningRegular from './icons/warningRegular.svg?react'; import XSM from './icons/xSM.svg?react'; export const icons = { + Blanksquare, Add, AddCircle, AddSquare, @@ -99,7 +100,6 @@ export const icons = { ChevronDoubleDownRegular, ChevronLeft, ClipboardPaste, - Common, CompassNorthWest, Copied, Copy, diff --git a/src/domains/misc/components/BIcon/icons/Blanksquare.svg b/src/domains/misc/components/BIcon/icons/Blanksquare.svg new file mode 100644 index 0000000..99f5fa2 --- /dev/null +++ b/src/domains/misc/components/BIcon/icons/Blanksquare.svg @@ -0,0 +1,3 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" viewBox="0 0 128 128" fill="none"> + <path d="M89.7489 25.6768H54.1567C50.7687 25.6768 47.5194 27.0227 45.1236 29.4185L29.618 44.9247C27.2225 47.3204 25.8766 50.5696 25.8766 53.9575V89.549C25.8766 96.6041 31.596 102.323 38.6511 102.323H74.4196C77.8076 102.323 81.0568 100.978 83.4524 98.5819L98.7818 83.2526C101.177 80.8569 102.523 77.6077 102.523 74.2197V38.4512C102.523 31.396 96.804 25.6768 89.7489 25.6768ZM89.7399 83.1618C89.7399 86.6894 86.8802 89.549 83.3526 89.549H45.0293C41.5017 89.549 38.6421 86.6894 38.6421 83.1618V44.8384C38.6421 41.3109 41.5017 38.4512 45.0293 38.4512H83.3526C86.8802 38.4512 89.7399 41.3109 89.7399 44.8384V83.1618Z" fill="currentcolor"/> +</svg> diff --git a/src/domains/misc/components/CIcon/icons/add.svg b/src/domains/misc/components/BIcon/icons/add.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/add.svg rename to src/domains/misc/components/BIcon/icons/add.svg diff --git a/src/domains/misc/components/CIcon/icons/addCircle.svg b/src/domains/misc/components/BIcon/icons/addCircle.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/addCircle.svg rename to src/domains/misc/components/BIcon/icons/addCircle.svg diff --git a/src/domains/misc/components/CIcon/icons/addSquare.svg b/src/domains/misc/components/BIcon/icons/addSquare.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/addSquare.svg rename to src/domains/misc/components/BIcon/icons/addSquare.svg diff --git a/src/domains/misc/components/CIcon/icons/arrowDown.svg b/src/domains/misc/components/BIcon/icons/arrowDown.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/arrowDown.svg rename to src/domains/misc/components/BIcon/icons/arrowDown.svg diff --git a/src/domains/misc/components/CIcon/icons/arrowDownLeft.svg b/src/domains/misc/components/BIcon/icons/arrowDownLeft.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/arrowDownLeft.svg rename to src/domains/misc/components/BIcon/icons/arrowDownLeft.svg diff --git a/src/domains/misc/components/CIcon/icons/arrowDownLeftRegular.svg b/src/domains/misc/components/BIcon/icons/arrowDownLeftRegular.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/arrowDownLeftRegular.svg rename to src/domains/misc/components/BIcon/icons/arrowDownLeftRegular.svg diff --git a/src/domains/misc/components/CIcon/icons/arrowDownload.svg b/src/domains/misc/components/BIcon/icons/arrowDownload.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/arrowDownload.svg rename to src/domains/misc/components/BIcon/icons/arrowDownload.svg diff --git a/src/domains/misc/components/CIcon/icons/arrowImport.svg b/src/domains/misc/components/BIcon/icons/arrowImport.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/arrowImport.svg rename to src/domains/misc/components/BIcon/icons/arrowImport.svg diff --git a/src/domains/misc/components/CIcon/icons/arrowRight.svg b/src/domains/misc/components/BIcon/icons/arrowRight.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/arrowRight.svg rename to src/domains/misc/components/BIcon/icons/arrowRight.svg diff --git a/src/domains/misc/components/CIcon/icons/arrowSort.svg b/src/domains/misc/components/BIcon/icons/arrowSort.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/arrowSort.svg rename to src/domains/misc/components/BIcon/icons/arrowSort.svg diff --git a/src/domains/misc/components/CIcon/icons/arrowTurnDownLeft.svg b/src/domains/misc/components/BIcon/icons/arrowTurnDownLeft.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/arrowTurnDownLeft.svg rename to src/domains/misc/components/BIcon/icons/arrowTurnDownLeft.svg diff --git a/src/domains/misc/components/CIcon/icons/arrowUpRight.svg b/src/domains/misc/components/BIcon/icons/arrowUpRight.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/arrowUpRight.svg rename to src/domains/misc/components/BIcon/icons/arrowUpRight.svg diff --git a/src/domains/misc/components/CIcon/icons/arrowUpRightRegular.svg b/src/domains/misc/components/BIcon/icons/arrowUpRightRegular.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/arrowUpRightRegular.svg rename to src/domains/misc/components/BIcon/icons/arrowUpRightRegular.svg diff --git a/src/domains/misc/components/CIcon/icons/azero.svg b/src/domains/misc/components/BIcon/icons/azero.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/azero.svg rename to src/domains/misc/components/BIcon/icons/azero.svg diff --git a/src/domains/misc/components/CIcon/icons/calendar.svg b/src/domains/misc/components/BIcon/icons/calendar.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/calendar.svg rename to src/domains/misc/components/BIcon/icons/calendar.svg diff --git a/src/domains/misc/components/CIcon/icons/chatHelp.svg b/src/domains/misc/components/BIcon/icons/chatHelp.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/chatHelp.svg rename to src/domains/misc/components/BIcon/icons/chatHelp.svg diff --git a/src/domains/misc/components/CIcon/icons/checkmarkCircle.svg b/src/domains/misc/components/BIcon/icons/checkmarkCircle.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/checkmarkCircle.svg rename to src/domains/misc/components/BIcon/icons/checkmarkCircle.svg diff --git a/src/domains/misc/components/CIcon/icons/checkmarkRegular.svg b/src/domains/misc/components/BIcon/icons/checkmarkRegular.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/checkmarkRegular.svg rename to src/domains/misc/components/BIcon/icons/checkmarkRegular.svg diff --git a/src/domains/misc/components/CIcon/icons/checkmarkStarburst.svg b/src/domains/misc/components/BIcon/icons/checkmarkStarburst.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/checkmarkStarburst.svg rename to src/domains/misc/components/BIcon/icons/checkmarkStarburst.svg diff --git a/src/domains/misc/components/CIcon/icons/chevron.svg b/src/domains/misc/components/BIcon/icons/chevron.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/chevron.svg rename to src/domains/misc/components/BIcon/icons/chevron.svg diff --git a/src/domains/misc/components/CIcon/icons/chevronDoubleDownRegular.svg b/src/domains/misc/components/BIcon/icons/chevronDoubleDownRegular.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/chevronDoubleDownRegular.svg rename to src/domains/misc/components/BIcon/icons/chevronDoubleDownRegular.svg diff --git a/src/domains/misc/components/CIcon/icons/chevronLeft.svg b/src/domains/misc/components/BIcon/icons/chevronLeft.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/chevronLeft.svg rename to src/domains/misc/components/BIcon/icons/chevronLeft.svg diff --git a/src/domains/misc/components/CIcon/icons/clipboardPaste.svg b/src/domains/misc/components/BIcon/icons/clipboardPaste.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/clipboardPaste.svg rename to src/domains/misc/components/BIcon/icons/clipboardPaste.svg diff --git a/src/domains/misc/components/CIcon/icons/compassNorthWest.svg b/src/domains/misc/components/BIcon/icons/compassNorthWest.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/compassNorthWest.svg rename to src/domains/misc/components/BIcon/icons/compassNorthWest.svg diff --git a/src/domains/misc/components/CIcon/icons/copied.svg b/src/domains/misc/components/BIcon/icons/copied.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/copied.svg rename to src/domains/misc/components/BIcon/icons/copied.svg diff --git a/src/domains/misc/components/CIcon/icons/copy.svg b/src/domains/misc/components/BIcon/icons/copy.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/copy.svg rename to src/domains/misc/components/BIcon/icons/copy.svg diff --git a/src/domains/misc/components/CIcon/icons/dismiss.svg b/src/domains/misc/components/BIcon/icons/dismiss.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/dismiss.svg rename to src/domains/misc/components/BIcon/icons/dismiss.svg diff --git a/src/domains/misc/components/CIcon/icons/dismissCircle.svg b/src/domains/misc/components/BIcon/icons/dismissCircle.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/dismissCircle.svg rename to src/domains/misc/components/BIcon/icons/dismissCircle.svg diff --git a/src/domains/misc/components/CIcon/icons/documentRegular.svg b/src/domains/misc/components/BIcon/icons/documentRegular.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/documentRegular.svg rename to src/domains/misc/components/BIcon/icons/documentRegular.svg diff --git a/src/domains/misc/components/CIcon/icons/documentText.svg b/src/domains/misc/components/BIcon/icons/documentText.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/documentText.svg rename to src/domains/misc/components/BIcon/icons/documentText.svg diff --git a/src/domains/misc/components/CIcon/icons/edit.svg b/src/domains/misc/components/BIcon/icons/edit.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/edit.svg rename to src/domains/misc/components/BIcon/icons/edit.svg diff --git a/src/domains/misc/components/CIcon/icons/errorCircleFilled.svg b/src/domains/misc/components/BIcon/icons/errorCircleFilled.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/errorCircleFilled.svg rename to src/domains/misc/components/BIcon/icons/errorCircleFilled.svg diff --git a/src/domains/misc/components/CIcon/icons/errorCircleRegular.svg b/src/domains/misc/components/BIcon/icons/errorCircleRegular.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/errorCircleRegular.svg rename to src/domains/misc/components/BIcon/icons/errorCircleRegular.svg diff --git a/src/domains/misc/components/CIcon/icons/eth.svg b/src/domains/misc/components/BIcon/icons/eth.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/eth.svg rename to src/domains/misc/components/BIcon/icons/eth.svg diff --git a/src/domains/misc/components/CIcon/icons/eye.svg b/src/domains/misc/components/BIcon/icons/eye.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/eye.svg rename to src/domains/misc/components/BIcon/icons/eye.svg diff --git a/src/domains/misc/components/CIcon/icons/eyeOff.svg b/src/domains/misc/components/BIcon/icons/eyeOff.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/eyeOff.svg rename to src/domains/misc/components/BIcon/icons/eyeOff.svg diff --git a/src/domains/misc/components/CIcon/icons/globe.svg b/src/domains/misc/components/BIcon/icons/globe.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/globe.svg rename to src/domains/misc/components/BIcon/icons/globe.svg diff --git a/src/domains/misc/components/CIcon/icons/history.svg b/src/domains/misc/components/BIcon/icons/history.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/history.svg rename to src/domains/misc/components/BIcon/icons/history.svg diff --git a/src/domains/misc/components/CIcon/icons/info.svg b/src/domains/misc/components/BIcon/icons/info.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/info.svg rename to src/domains/misc/components/BIcon/icons/info.svg diff --git a/src/domains/misc/components/CIcon/icons/infoRegular.svg b/src/domains/misc/components/BIcon/icons/infoRegular.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/infoRegular.svg rename to src/domains/misc/components/BIcon/icons/infoRegular.svg diff --git a/src/domains/misc/components/CIcon/icons/iosArrowLeft.svg b/src/domains/misc/components/BIcon/icons/iosArrowLeft.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/iosArrowLeft.svg rename to src/domains/misc/components/BIcon/icons/iosArrowLeft.svg diff --git a/src/domains/misc/components/CIcon/icons/lock.svg b/src/domains/misc/components/BIcon/icons/lock.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/lock.svg rename to src/domains/misc/components/BIcon/icons/lock.svg diff --git a/src/domains/misc/components/CIcon/icons/moreVertical.svg b/src/domains/misc/components/BIcon/icons/moreVertical.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/moreVertical.svg rename to src/domains/misc/components/BIcon/icons/moreVertical.svg diff --git a/src/domains/misc/components/CIcon/icons/network.svg b/src/domains/misc/components/BIcon/icons/network.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/network.svg rename to src/domains/misc/components/BIcon/icons/network.svg diff --git a/src/domains/misc/components/CIcon/icons/open.svg b/src/domains/misc/components/BIcon/icons/open.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/open.svg rename to src/domains/misc/components/BIcon/icons/open.svg diff --git a/src/domains/misc/components/CIcon/icons/pencil.svg b/src/domains/misc/components/BIcon/icons/pencil.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/pencil.svg rename to src/domains/misc/components/BIcon/icons/pencil.svg diff --git a/src/domains/misc/components/CIcon/icons/personFeedback.svg b/src/domains/misc/components/BIcon/icons/personFeedback.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/personFeedback.svg rename to src/domains/misc/components/BIcon/icons/personFeedback.svg diff --git a/src/domains/misc/components/CIcon/icons/personFilled.svg b/src/domains/misc/components/BIcon/icons/personFilled.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/personFilled.svg rename to src/domains/misc/components/BIcon/icons/personFilled.svg diff --git a/src/domains/misc/components/CIcon/icons/power.svg b/src/domains/misc/components/BIcon/icons/power.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/power.svg rename to src/domains/misc/components/BIcon/icons/power.svg diff --git a/src/domains/misc/components/CIcon/icons/questionCircle.svg b/src/domains/misc/components/BIcon/icons/questionCircle.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/questionCircle.svg rename to src/domains/misc/components/BIcon/icons/questionCircle.svg diff --git a/src/domains/misc/components/CIcon/icons/radioButton.svg b/src/domains/misc/components/BIcon/icons/radioButton.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/radioButton.svg rename to src/domains/misc/components/BIcon/icons/radioButton.svg diff --git a/src/domains/misc/components/CIcon/icons/settings.svg b/src/domains/misc/components/BIcon/icons/settings.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/settings.svg rename to src/domains/misc/components/BIcon/icons/settings.svg diff --git a/src/domains/misc/components/CIcon/icons/shieldError.svg b/src/domains/misc/components/BIcon/icons/shieldError.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/shieldError.svg rename to src/domains/misc/components/BIcon/icons/shieldError.svg diff --git a/src/domains/misc/components/CIcon/icons/shieldRegular.svg b/src/domains/misc/components/BIcon/icons/shieldRegular.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/shieldRegular.svg rename to src/domains/misc/components/BIcon/icons/shieldRegular.svg diff --git a/src/domains/misc/components/CIcon/icons/shieldTask.svg b/src/domains/misc/components/BIcon/icons/shieldTask.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/shieldTask.svg rename to src/domains/misc/components/BIcon/icons/shieldTask.svg diff --git a/src/domains/misc/components/CIcon/icons/shielded.svg b/src/domains/misc/components/BIcon/icons/shielded.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/shielded.svg rename to src/domains/misc/components/BIcon/icons/shielded.svg diff --git a/src/domains/misc/components/CIcon/icons/shieldedFilled.svg b/src/domains/misc/components/BIcon/icons/shieldedFilled.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/shieldedFilled.svg rename to src/domains/misc/components/BIcon/icons/shieldedFilled.svg diff --git a/src/domains/misc/components/CIcon/icons/signature.svg b/src/domains/misc/components/BIcon/icons/signature.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/signature.svg rename to src/domains/misc/components/BIcon/icons/signature.svg diff --git a/src/domains/misc/components/CIcon/icons/smartContractRegular.svg b/src/domains/misc/components/BIcon/icons/smartContractRegular.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/smartContractRegular.svg rename to src/domains/misc/components/BIcon/icons/smartContractRegular.svg diff --git a/src/domains/misc/components/CIcon/icons/spinner.svg b/src/domains/misc/components/BIcon/icons/spinner.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/spinner.svg rename to src/domains/misc/components/BIcon/icons/spinner.svg diff --git a/src/domains/misc/components/CIcon/icons/telegramSM.svg b/src/domains/misc/components/BIcon/icons/telegramSM.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/telegramSM.svg rename to src/domains/misc/components/BIcon/icons/telegramSM.svg diff --git a/src/domains/misc/components/CIcon/icons/usdc.svg b/src/domains/misc/components/BIcon/icons/usdc.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/usdc.svg rename to src/domains/misc/components/BIcon/icons/usdc.svg diff --git a/src/domains/misc/components/CIcon/icons/usdt.svg b/src/domains/misc/components/BIcon/icons/usdt.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/usdt.svg rename to src/domains/misc/components/BIcon/icons/usdt.svg diff --git a/src/domains/misc/components/CIcon/icons/wAzero.svg b/src/domains/misc/components/BIcon/icons/wAzero.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/wAzero.svg rename to src/domains/misc/components/BIcon/icons/wAzero.svg diff --git a/src/domains/misc/components/CIcon/icons/wBtc.svg b/src/domains/misc/components/BIcon/icons/wBtc.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/wBtc.svg rename to src/domains/misc/components/BIcon/icons/wBtc.svg diff --git a/src/domains/misc/components/CIcon/icons/wEth.svg b/src/domains/misc/components/BIcon/icons/wEth.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/wEth.svg rename to src/domains/misc/components/BIcon/icons/wEth.svg diff --git a/src/domains/misc/components/CIcon/icons/wallet.svg b/src/domains/misc/components/BIcon/icons/wallet.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/wallet.svg rename to src/domains/misc/components/BIcon/icons/wallet.svg diff --git a/src/domains/misc/components/CIcon/icons/warningRegular.svg b/src/domains/misc/components/BIcon/icons/warningRegular.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/warningRegular.svg rename to src/domains/misc/components/BIcon/icons/warningRegular.svg diff --git a/src/domains/misc/components/CIcon/icons/xSM.svg b/src/domains/misc/components/BIcon/icons/xSM.svg similarity index 100% rename from src/domains/misc/components/CIcon/icons/xSM.svg rename to src/domains/misc/components/BIcon/icons/xSM.svg diff --git a/src/domains/misc/components/CIcon/index.ts b/src/domains/misc/components/BIcon/index.ts similarity index 53% rename from src/domains/misc/components/CIcon/index.ts rename to src/domains/misc/components/BIcon/index.ts index 4fb6a09..48a310c 100644 --- a/src/domains/misc/components/CIcon/index.ts +++ b/src/domains/misc/components/BIcon/index.ts @@ -1,2 +1,2 @@ -export { default } from './CIcon'; +export { default } from './BIcon'; export { type IconName } from './icons'; diff --git a/src/domains/misc/components/Badge.tsx b/src/domains/misc/components/Badge.tsx index a008969..aaaa716 100644 --- a/src/domains/misc/components/Badge.tsx +++ b/src/domains/misc/components/Badge.tsx @@ -1,7 +1,7 @@ import { ComponentProps, forwardRef, type ReactElement } from 'react'; import styled, { RuleSet } from 'styled-components'; -import CIcon, { IconName } from 'src/domains/misc/components/CIcon'; +import BIcon, { IconName } from 'src/domains/misc/components/BIcon'; import { typography } from 'src/domains/styling/utils/tokens'; import vars from 'src/domains/styling/utils/vars'; @@ -45,7 +45,7 @@ const Badge = forwardRef<HTMLButtonElement, Props>(({ {...props} > {typeof leftIcon === 'string' ? ( - <StyledCIcon variant={variant} design={design} size={size} icon={leftIcon} color={iconColor} /> + <StyledBIcon variant={variant} design={design} size={size} icon={leftIcon} color={iconColor} /> ) : leftIcon} {text && ( <BadgeText @@ -58,7 +58,7 @@ const Badge = forwardRef<HTMLButtonElement, Props>(({ </BadgeText> )} {typeof rightIcon ==='string' ? ( - <StyledCIcon variant={variant} design={design} size={size} icon={rightIcon} color={iconColor} /> + <StyledBIcon variant={variant} design={design} size={size} icon={rightIcon} color={iconColor} /> ): rightIcon} </StyledBadge> ); @@ -201,7 +201,7 @@ const StyledBadge = styled.div.withConfig({ })}; `; -const StyledCIcon = styled(CIcon).withConfig({ +const StyledBIcon = styled(BIcon).withConfig({ shouldForwardProp: prop => !['size', 'variant', 'design'].includes(prop), })<Props>` display: flex; @@ -229,8 +229,8 @@ const BadgeText = styled.span.withConfig({ })}; text-align: center; ${perSize({ - medium: typography.web.caption2, - large: typography.web.caption1, + medium: typography.caption2, + large: typography.caption1, })}; line-height: 100%; `; diff --git a/src/domains/misc/components/Button/Button.tsx b/src/domains/misc/components/Button/Button.tsx index 3b6a1ce..f50a817 100644 --- a/src/domains/misc/components/Button/Button.tsx +++ b/src/domains/misc/components/Button/Button.tsx @@ -1,7 +1,7 @@ import { ComponentProps, forwardRef, ReactNode } from 'react'; import styled, { css, RuleSet } from 'styled-components'; -import CIcon, { type IconName } from 'src/domains/misc/components/CIcon'; +import BIcon, { type IconName } from 'src/domains/misc/components/BIcon'; import { transitionTime, typography } from 'src/domains/styling/utils/tokens'; import vars from 'src/domains/styling/utils/vars'; @@ -46,9 +46,9 @@ const Button = forwardRef<HTMLButtonElement, Props>(({ selected={selected} $iconOnly={!children} > - {isLoading ? <LoadingIcon icon="Spinner" size={ICON_SIZE_MAP[size] * 0.75} /> : leftIcon && <CIcon icon={leftIcon} size={ICON_SIZE_MAP[size]} />} + {isLoading ? <LoadingIcon icon="Spinner" size={ICON_SIZE_MAP[size] * 0.75} /> : leftIcon && <BIcon icon={leftIcon} size={ICON_SIZE_MAP[size]} />} {children} - {rightIcon && <CIcon icon={rightIcon} size={ICON_SIZE_MAP[size]} />} + {rightIcon && <BIcon icon={rightIcon} size={ICON_SIZE_MAP[size]} />} </DomButton> )); @@ -102,19 +102,13 @@ const DomButton = styled.button.withConfig({ white-space: nowrap; ${perSize({ - large: typography.decorative.subtitle1, - medium: typography.decorative.subtitle2, - small: typography.decorative.body1Strong, - 'extra-small': typography.decorative.caption1Strong, - tiny: typography.decorative.caption2Strong, - })}; - border-radius: ${perSize({ - large: vars('--border-radius-s'), - medium: vars('--border-radius-s'), - small: vars('--border-radius-s'), - 'extra-small': vars('--border-radius-s'), - tiny: vars('--border-radius-xs'), + large: typography.subtitle1, + medium: typography.subtitle2, + small: typography.body1Strong, + 'extra-small': typography.caption1Strong, + tiny: typography.caption2Strong, })}; + border-radius: ${vars('--border-radius-circular')}; transition: background-color ${transitionTime}, color ${transitionTime}; outline-offset: -${BORDER_WIDTH}px; @@ -308,7 +302,7 @@ const DomButton = styled.button.withConfig({ } `; -const LoadingIcon = styled(CIcon)` +const LoadingIcon = styled(BIcon)` animation: spin 1.4s linear infinite; & *:first-of-type { diff --git a/src/domains/misc/components/CIcon/icons/common.svg b/src/domains/misc/components/CIcon/icons/common.svg deleted file mode 100644 index 5b8dc90..0000000 --- a/src/domains/misc/components/CIcon/icons/common.svg +++ /dev/null @@ -1,3 +0,0 @@ -<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg"> - <path d="M25.8562 11.9467C24.6303 7.89908 20.3585 5.6099 16.3105 6.8285L9.49005 8.89419L7.34972 6.49988C3.30581 7.7321 1.02198 12.0068 2.24788 16.0544C3.47377 20.102 7.7456 22.3911 11.7937 21.1726L18.6182 19.1056L20.7585 21.4999C24.7998 20.266 27.0817 15.9929 25.8562 11.9467ZM19.9084 18.7082L18.6135 19.1004L16.4732 16.706L10.9477 18.3795C8.44219 19.131 5.79952 17.7136 5.0408 15.2085C4.28208 12.7034 5.69422 10.0579 8.19566 9.29288L9.49473 8.89943L11.6351 11.2937L17.1564 9.6215C19.6619 8.87008 22.3046 10.2875 23.0633 12.7926C23.822 15.2977 22.4099 17.9431 19.9084 18.7082Z" fill="#406EB2"/> -</svg> diff --git a/src/domains/misc/components/ContentBox.tsx b/src/domains/misc/components/ContentBox.tsx new file mode 100644 index 0000000..63b5f7e --- /dev/null +++ b/src/domains/misc/components/ContentBox.tsx @@ -0,0 +1,13 @@ +import styled from 'styled-components'; + +import vars from 'src/domains/styling/utils/vars'; + +const ContentBox = styled.div<{ $disableMargin?: boolean }>` + padding: ${vars('--spacing-xxl')}; + margin: ${({ $disableMargin }) => $disableMargin ? 'none' : vars('--spacing-s')}; + background-color: ${vars('--color-neutral-background-3a-rest')}; + border-radius: ${vars('--border-radius-l')}; + overflow: hidden; +`; + +export default ContentBox; diff --git a/src/domains/misc/components/CopyButton.tsx b/src/domains/misc/components/CopyButton.tsx index 691f9cd..a265cd8 100644 --- a/src/domains/misc/components/CopyButton.tsx +++ b/src/domains/misc/components/CopyButton.tsx @@ -4,7 +4,7 @@ import { MouseEvent, type ReactNode, useState } from 'react'; import styled from 'styled-components'; import { isNullish } from 'utility-types'; -import CIcon from 'src/domains/misc/components/CIcon'; +import BIcon from 'src/domains/misc/components/BIcon'; import { typography } from 'src/domains/styling/utils/tokens'; import vars from 'src/domains/styling/utils/vars'; @@ -51,7 +51,7 @@ const CopyButton = ({ initial={{ opacity: 0, y: isSuccess ? -5 : 0 }} animate={{ opacity: 1, y: 0 }} > - <CIcon + <BIcon icon={isSuccess ? 'CheckmarkCircle' : 'Copy'} color={isSuccess ? vars('--color-status-success-foreground-1-rest') : undefined} size={size} @@ -73,7 +73,7 @@ const StyledButton = styled.button` color: ${vars('--color-brand-foreground-1-rest')}; border-radius: ${vars('--border-radius-m')}; - ${typography.decorative.body2}; + ${typography.body2}; transition: color 0.2s; `; diff --git a/src/domains/misc/components/DoubleBorderBox.tsx b/src/domains/misc/components/DoubleBorderBox.tsx deleted file mode 100644 index 9d007cb..0000000 --- a/src/domains/misc/components/DoubleBorderBox.tsx +++ /dev/null @@ -1,42 +0,0 @@ -import styled from 'styled-components'; - -import { backgroundFilters } from 'src/domains/styling/utils/tokens'; -import vars from 'src/domains/styling/utils/vars'; - -const borderSize = 1; - -const Wrapper = styled.div` - position: relative; - padding: ${borderSize}px; - background-color: ${vars('--color-neutral-background-alpha-4-rest')}; - border-radius: ${vars('--border-radius-xxl')}; - - &::after { - content: ""; - - position: absolute; - inset: 0; - - border: ${borderSize}px solid ${vars('--color-neutral-stroke-gradient-color-a')}; - - border-radius: inherit; - pointer-events: none; - - mask-image: linear-gradient(to bottom right, black, transparent 60%); - } -`; - -const Content = styled(Wrapper)<{ $disableMargin?: boolean }>` - padding: ${vars('--spacing-xxl')}; - margin: ${({ $disableMargin }) => $disableMargin ? 'none' : vars('--spacing-s')}; - background-color: ${vars('--color-neutral-background-3a-rest')}; - border-radius: calc(${vars('--border-radius-l')} - ${borderSize}px); - overflow: hidden; - ${backgroundFilters.backgroundBlur1}; - - &::after { - border-radius: inherit; - } -`; - -export default { Wrapper, Content }; diff --git a/src/domains/misc/components/InfoPair.tsx b/src/domains/misc/components/InfoPair.tsx index 4927d2c..08b56a8 100644 --- a/src/domains/misc/components/InfoPair.tsx +++ b/src/domains/misc/components/InfoPair.tsx @@ -3,7 +3,7 @@ import { } from 'react'; import { styled } from 'styled-components'; -import CIcon from 'src/domains/misc/components/CIcon'; +import BIcon from 'src/domains/misc/components/BIcon'; import Tooltip from 'src/domains/misc/components/Tooltip'; import { typography } from 'src/domains/styling/utils/tokens'; import vars from 'src/domains/styling/utils/vars'; @@ -23,7 +23,7 @@ const InfoPair = ({ label, className, tooltipText, ...props }: Props) => ( {label} {tooltipText && ( <Tooltip text={tooltipText}> - <CIcon icon="Info" color={vars('--color-neutral-foreground-4-rest')} size={16} /> + <BIcon icon="Info" color={vars('--color-neutral-foreground-4-rest')} size={16} /> </Tooltip> )} </Label> @@ -57,7 +57,7 @@ const Label = styled.div` height: 24px; flex-shrink: 0; - ${typography.web.body1}; + ${typography.body1}; `; const Value = styled.div<{ $allowShrinking?: boolean }>` @@ -66,7 +66,7 @@ const Value = styled.div<{ $allowShrinking?: boolean }>` overflow: hidden; flex-shrink: ${({ $allowShrinking }) => ($allowShrinking ? 1 : 0)}; - ${typography.web.body1Strong}; + ${typography.body1Strong}; `; const Separator = styled.div` diff --git a/src/domains/misc/components/InteractiveSlider/Axis.tsx b/src/domains/misc/components/InteractiveSlider/Axis.tsx index 6eece85..07bec92 100644 --- a/src/domains/misc/components/InteractiveSlider/Axis.tsx +++ b/src/domains/misc/components/InteractiveSlider/Axis.tsx @@ -41,7 +41,7 @@ const Container = styled.div` position: relative; height: 16px; - ${typography.web.caption2} + ${typography.caption2} `; const Label = styled.div<{ $highlighted: boolean }>` diff --git a/src/domains/misc/components/Layout/AnimatingBackground.tsx b/src/domains/misc/components/Layout/AnimatingBackground.tsx deleted file mode 100644 index acf3b11..0000000 --- a/src/domains/misc/components/Layout/AnimatingBackground.tsx +++ /dev/null @@ -1,63 +0,0 @@ -import styled from 'styled-components'; - -import vars from 'src/domains/styling/utils/vars'; - -import AnimatingBgSvg from './bgAnimation.svg?react'; - -const AnimatingBackground = () => ( - <Container> - <AnimatingBgSvg /> - <AnimatingBgSvg /> - </Container> -); - -export default AnimatingBackground; - -const Container = styled.div` - position: fixed; - inset: 0; - - z-index: -1; - - & > * { - /* - The below values are a result of calculations aimed to achieve fluid responsiveness - based on extrapolation of states defined by the designs. Those states are positions - and sizes of the two animating elements on both desktop (1792x1084) and mobile (360x640): - +----------------------+---------------+----------+----------+---------+ - | element | x | y | width | height | - +----------------------+---------------+----------+----------+---------+ - | 1st element desktop | -350px | 250px | 1450 | 896 | - | 1st element mobile | -460px | 140px | 950opx | 587px | - | 2nd element desktop | 100vw - 700 | -300px | 1450 | 896 | - | 2nd element mobile | 100vw | -590 | 950opx | 587px | - +----------------------+---------------+----------+----------+---------+ - - Those states form points from which coefficients of the function "y = a * x + b" - where found and used in the "calc()" function as follows: "calc(<a>vw + <b>px)". - - This made the designs fluid in respect to the width of the window. In order - to make it better laid out in taller screens, some "calc(<a>vh + <b>px)" functions - (calculated with the exact same method as described above, but with respect to the - window height) were added using "max()" or "min()" (selected based on visual appeal) - which make the browser choose between the width-based and height-based fluid dimensions. - */ - position: fixed; - width: calc(35vw + 824px); - height: calc(22vw + 510px); - - & * { - stroke: ${vars('--color-neutral-stroke-3-rest')}; - } - - &:nth-child(1) { - top: max(calc(8vw + 110px), calc(25vh - 18px)); - left: calc(8vw - 490px); - } - - &:nth-child(2) { - top: min(calc(20vw - 650px), calc(60vh - 1000px)); - left: calc(100vw - (50vw - 175px)); - } - } -`; diff --git a/src/domains/misc/components/Layout/Footer.tsx b/src/domains/misc/components/Layout/Footer.tsx index 79ffe8c..d966b9e 100644 --- a/src/domains/misc/components/Layout/Footer.tsx +++ b/src/domains/misc/components/Layout/Footer.tsx @@ -1,6 +1,5 @@ import styled from 'styled-components'; -import Button from 'src/domains/misc/components/Button'; import { BREAKPOINTS, CHANGELOG_LINK, @@ -25,32 +24,22 @@ const Footer = () => ( <Link href={FAUCET_LINK} target="_blank" rel="noopener noreferrer"> Get Testnet Tokens </Link> - <Link href={LANDING_PAGE_LINK} target="_blank" rel="noopener noreferrer">common.fi</Link> + <Link href={LANDING_PAGE_LINK} target="_blank" rel="noopener noreferrer">blanksquare.io</Link> + </InnerContainer> + <InnerContainer data-chromatic="ignore"> + <Copyright> + Copyright © {new Date().getFullYear()} Blanksquare, ver. {import.meta.env.APP_VERSION} + </Copyright> + <Link href={TERMS_OF_SERVICE_LINK} target="_blank" rel="noopener noreferrer"> + Terms of service + </Link> + <Link href={PRIVACY_POLICY_LINK} target="_blank" rel="noopener noreferrer"> + Privacy policy + </Link> + <Link href={FRAUD_PROTECTION_LINK} target="_blank" rel="noopener noreferrer"> + Fraud Protection Policy + </Link> </InnerContainer> - <CopyrightContainer data-chromatic="ignore"> - <InnerContainer> - <Copyright> - Copyright © {new Date().getFullYear()} Common, ver. {import.meta.env.APP_VERSION} - </Copyright> - <Link href={TERMS_OF_SERVICE_LINK} target="_blank" rel="noopener noreferrer"> - Terms of service - </Link> - <Link href={PRIVACY_POLICY_LINK} target="_blank" rel="noopener noreferrer"> - Privacy policy - </Link> - <Link href={FRAUD_PROTECTION_LINK} target="_blank" rel="noopener noreferrer"> - Fraud Protection Policy - </Link> - </InnerContainer> - <Button - variant="outline" - size="extra-small" - rightIcon="Open" - onClick={() => window.open('https://dex.common.fi/', '_blank', 'noopener')} - > - DEX and Bridge (WASM) - </Button> - </CopyrightContainer> </Container> ); @@ -79,14 +68,10 @@ const InnerContainer = styled.div` flex-wrap: wrap; `; -const CopyrightContainer = styled(InnerContainer)` - justify-content: space-between; -`; - const Copyright = styled.div` width: 100%; color: ${vars('--color-neutral-foreground-4-rest')}; - ${typography.web.caption2} + ${typography.caption2} @media (width >= ${BREAKPOINTS.sm}) { /* stylelint-disable-line media-query-no-invalid */ width: auto; @@ -97,5 +82,5 @@ const Link = styled.a` color: ${vars('--color-neutral-foreground-4-rest')}; text-decoration: underline; - ${typography.web.caption2} + ${typography.caption2} `; diff --git a/src/domains/misc/components/Layout/Layout.tsx b/src/domains/misc/components/Layout/Layout.tsx index 508fe8f..e5a570a 100644 --- a/src/domains/misc/components/Layout/Layout.tsx +++ b/src/domains/misc/components/Layout/Layout.tsx @@ -6,7 +6,6 @@ import styled from 'styled-components'; import { BREAKPOINTS, BOTTOM_NAVIGATION_HEIGHT, BOTTOM_MENU_BREAKPOINT } from 'src/domains/misc/consts/consts'; import vars from 'src/domains/styling/utils/vars'; -import AnimatingBackground from './AnimatingBackground'; import Footer from './Footer'; import Navigation from './Navigation'; import TopBar from './TopBar'; @@ -38,7 +37,6 @@ const Layout = ({ children }: Props) => { <BottomNavigationContent position="ceiling" /> </BottomNavigationContainer> )} - <AnimatingBackground /> </Wrapper> ); }; @@ -94,6 +92,7 @@ const BottomNavigationContainer = styled.div` width: 100%; background: ${vars('--color-neutral-background-2-rest')}; + overflow: hidden; border-top: 1px solid ${vars('--color-neutral-stroke-2-rest')}; `; diff --git a/src/domains/misc/components/Layout/ThemeSelector.tsx b/src/domains/misc/components/Layout/ThemeSelector.tsx index bec0f29..fdab5ba 100644 --- a/src/domains/misc/components/Layout/ThemeSelector.tsx +++ b/src/domains/misc/components/Layout/ThemeSelector.tsx @@ -50,5 +50,5 @@ const CapitalizedButton = styled(Button)` const Title = styled.span` color: ${vars('--color-neutral-foreground-1-rest')}; - ${typography.web.body1} + ${typography.body1} `; diff --git a/src/domains/misc/components/Layout/TopBar/Brand.tsx b/src/domains/misc/components/Layout/TopBar/Brand.tsx index 481d9a3..7b16f7b 100644 --- a/src/domains/misc/components/Layout/TopBar/Brand.tsx +++ b/src/domains/misc/components/Layout/TopBar/Brand.tsx @@ -2,7 +2,7 @@ import styled from 'styled-components'; import vars from 'src/domains/styling/utils/vars'; -import { BRAND_CONTAINER_TITLE, BRAND_LOGO_WIDTH_DESKTOP } from './consts'; +import { BRAND_CONTAINER_TITLE, BRAND_LOGO_WIDTH_MOBILE } from './consts'; import LogoSvg from './logo.svg?react'; import LogoTypeSvg from './logoType.svg?react'; @@ -32,13 +32,13 @@ const Container = styled.div` const MobileLogo = styled(LogoSvg)` display: none; - @container ${BRAND_CONTAINER_TITLE} (max-width: ${BRAND_LOGO_WIDTH_DESKTOP}) { /* stylelint-disable-line at-rule-prelude-no-invalid */ + @container ${BRAND_CONTAINER_TITLE} (max-width: ${BRAND_LOGO_WIDTH_MOBILE}) { /* stylelint-disable-line at-rule-prelude-no-invalid */ display: block; } `; const DesktopLogo = styled(LogoTypeSvg)` - @container ${BRAND_CONTAINER_TITLE} (max-width: ${BRAND_LOGO_WIDTH_DESKTOP}) { /* stylelint-disable-line at-rule-prelude-no-invalid */ + @container ${BRAND_CONTAINER_TITLE} (max-width: ${BRAND_LOGO_WIDTH_MOBILE}) { /* stylelint-disable-line at-rule-prelude-no-invalid */ display: none; } `; diff --git a/src/domains/misc/components/Layout/TopBar/NavBox.tsx b/src/domains/misc/components/Layout/TopBar/NavBox.tsx index b51c6c5..6e3e9c2 100644 --- a/src/domains/misc/components/Layout/TopBar/NavBox.tsx +++ b/src/domains/misc/components/Layout/TopBar/NavBox.tsx @@ -14,16 +14,16 @@ type Props = { }; export const Container = ({ children, wrapperClassName, contentContainerClassName }: Props) => ( - <BorderWrapper className={wrapperClassName}> + <Wrapper className={wrapperClassName}> <ContentWrapper className={contentContainerClassName}> {children} </ContentWrapper> - </BorderWrapper> + </Wrapper> ); const borderSize = 1; -const BorderWrapper = styled.div.withConfig({ +const Wrapper = styled.div.withConfig({ shouldForwardProp: prop => !['withGradientBorder'].includes(prop), })` min-width: 0; @@ -32,20 +32,6 @@ const BorderWrapper = styled.div.withConfig({ position: relative; margin: ${vars('--spacing-xxxl')}; padding: ${borderSize}px; - - &::after { - content: ""; - - position: absolute; - inset: 0; - - border: ${borderSize}px solid ${vars('--color-neutral-stroke-3-rest')}; - - border-radius: ${vars('--border-radius-xxl')}; - pointer-events: none; /* necessary because of the z-index, which makes this element cover other children */ - - mask-image: linear-gradient(to bottom right, black 10%, transparent 90%); - } } `; @@ -53,6 +39,7 @@ const ContentWrapper = styled.section` display: flex; justify-content: space-between; + align-items: center; gap: ${vars('--spacing-xs')}; width: 100%; diff --git a/src/domains/misc/components/Layout/TopBar/TopBar.tsx b/src/domains/misc/components/Layout/TopBar/TopBar.tsx index d5f63d0..cfd0c38 100644 --- a/src/domains/misc/components/Layout/TopBar/TopBar.tsx +++ b/src/domains/misc/components/Layout/TopBar/TopBar.tsx @@ -6,7 +6,7 @@ import ConnectModal from 'src/domains/chains/components/ConnectModal'; import { useWallet } from 'src/domains/chains/components/WalletProvider'; import Button from 'src/domains/misc/components/Button'; import { useModal } from 'src/domains/misc/components/Modal'; -import { BOTTOM_MENU_BREAKPOINT } from 'src/domains/misc/consts/consts'; +import { BOTTOM_MENU_BREAKPOINT, BREAKPOINTS } from 'src/domains/misc/consts/consts'; import formatAddress from 'src/domains/misc/utils/formatAddress'; import { typography } from 'src/domains/styling/utils/tokens'; import vars from 'src/domains/styling/utils/vars'; @@ -15,11 +15,13 @@ import Navigation from '../Navigation'; import Brand from './Brand'; import * as NavBox from './NavBox'; -import { BRAND_CONTAINER_TITLE, BRAND_LOGO_HEIGHT } from './consts'; +import { BRAND_CONTAINER_TITLE, BRAND_LOGO_HEIGHT_DESKTOP, BRAND_LOGO_HEIGHT_MOBILE } from './consts'; import UserIcon from './userIcon.svg?react'; const TopBar = () => { const isSmallScreen = useMediaQuery(`(max-width: ${BOTTOM_MENU_BREAKPOINT})`); + const isLargeScreen = useMediaQuery(`(width > ${BREAKPOINTS.lg}`); + const { disconnect, isConnected , address } = useWallet(); const { open } = useModal(); @@ -31,8 +33,8 @@ const TopBar = () => { </BrandContainer> {!isSmallScreen && <Navigation position="floor" />} </NavBox.BrandCanvas> - <NavBox.UserCanvas> - {isConnected ? ( + {isConnected ? ( + <NavBox.UserCanvas> <AccountManager> <ChainSelector /> <Divider /> @@ -48,15 +50,18 @@ const TopBar = () => { </PowerButton> </AccountDetails> </AccountManager> - ) : ( + </NavBox.UserCanvas> + ) : ( + <ConnectButtonWrapper> <Button onClick={() => void open(<ConnectModal />)} variant="primary" + size={isLargeScreen ? 'medium' : 'small'} > Connect </Button> - )} - </NavBox.UserCanvas> + </ConnectButtonWrapper> + )} </NavBox.Container> ); }; @@ -65,9 +70,13 @@ export default TopBar; const StyledBrand = styled(Brand)` margin-left: 8px; - height: ${BRAND_LOGO_HEIGHT}; + height: ${BRAND_LOGO_HEIGHT_DESKTOP}; flex-shrink: 0; + + @media (width <= ${BOTTOM_MENU_BREAKPOINT}) { /* stylelint-disable-line media-query-no-invalid */ + height: ${BRAND_LOGO_HEIGHT_MOBILE}; + } `; const BrandContainer = styled.div` @@ -82,7 +91,7 @@ const BrandContainer = styled.div` const AccountDetails = styled.div` display: flex; align-items: center; - ${typography.web.caption1}; + ${typography.caption1}; `; const AccountManager = styled.div` @@ -104,3 +113,13 @@ const Divider = styled.div` const PowerButton = styled(Button)` color: ${vars('--color-neutral-foreground-2-rest')}; `; + +const ConnectButtonWrapper = styled.div` + display: flex; + padding-left: ${vars('--spacing-m-nudge')}; + padding-right: ${vars('--spacing-l')}; + + @media (width > ${BREAKPOINTS.lg}) { /* stylelint-disable-line media-query-no-invalid */ + padding-inline: ${vars('--spacing-s')}; + } +`; diff --git a/src/domains/misc/components/Layout/TopBar/consts.ts b/src/domains/misc/components/Layout/TopBar/consts.ts index 1740d59..5e590a3 100644 --- a/src/domains/misc/components/Layout/TopBar/consts.ts +++ b/src/domains/misc/components/Layout/TopBar/consts.ts @@ -1,3 +1,4 @@ export const BRAND_CONTAINER_TITLE = 'brandcontainer'; -export const BRAND_LOGO_WIDTH_DESKTOP = '150px'; -export const BRAND_LOGO_HEIGHT = '18px'; +export const BRAND_LOGO_WIDTH_MOBILE = '175px'; +export const BRAND_LOGO_HEIGHT_DESKTOP = '39px'; +export const BRAND_LOGO_HEIGHT_MOBILE = '32px'; diff --git a/src/domains/misc/components/Layout/TopBar/logo.svg b/src/domains/misc/components/Layout/TopBar/logo.svg index d65d29b..4557ad7 100644 --- a/src/domains/misc/components/Layout/TopBar/logo.svg +++ b/src/domains/misc/components/Layout/TopBar/logo.svg @@ -1,5 +1,3 @@ -<svg viewBox="0 0 30 18" fill="none" xmlns="http://www.w3.org/2000/svg"> - <path - d="M29.2274 6.53615C27.7563 1.67905 22.6301 -1.06798 17.7724 0.394347L9.58797 2.87317L7.01957 0C2.16687 1.47867 -0.57372 6.60831 0.897353 11.4654C2.36843 16.3225 7.49462 19.0695 12.3523 17.6072L20.5418 15.1269L23.1101 18C27.9597 16.5193 30.6979 11.3916 29.2274 6.53615ZM22.09 14.6499L20.5361 15.1206L17.9678 12.2474L11.3372 14.2556C8.33053 15.1573 5.15933 13.4564 4.24887 10.4503C3.3384 7.44423 5.03297 4.26966 8.03469 3.3516L9.59358 2.87946L12.162 5.75263L18.7875 3.74595C21.7942 2.84425 24.9654 4.54512 25.8759 7.55122C26.7863 10.5573 25.0917 13.7319 22.09 14.6499Z" - fill="#1E232B"/> +<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28" fill="none"> + <path d="M19.3643 6.01587H11.9493C11.2435 6.01587 10.5665 6.29627 10.0674 6.7954L6.83706 10.0259C6.338 10.525 6.05762 11.2019 6.05762 11.9077V19.3226C6.05762 20.7924 7.24915 21.9839 8.71896 21.9839H16.1707C16.8766 21.9839 17.5535 21.7035 18.0526 21.2044L21.2462 18.0108C21.7453 17.5117 22.0257 16.8348 22.0257 16.129V8.67721C22.0257 7.20738 20.8342 6.01587 19.3643 6.01587ZM19.3625 17.9919C19.3625 18.7268 18.7667 19.3226 18.0318 19.3226H10.0477C9.31283 19.3226 8.71708 18.7268 8.71708 17.9919V10.0079C8.71708 9.27298 9.31283 8.67721 10.0477 8.67721H18.0318C18.7667 8.67721 19.3625 9.27298 19.3625 10.0079V17.9919Z" fill="white"/> </svg> diff --git a/src/domains/misc/components/Layout/TopBar/logoType.svg b/src/domains/misc/components/Layout/TopBar/logoType.svg index 9aaf90d..8ea3e3f 100644 --- a/src/domains/misc/components/Layout/TopBar/logoType.svg +++ b/src/domains/misc/components/Layout/TopBar/logoType.svg @@ -1,30 +1,21 @@ -<svg width="140" height="18" viewBox="0 0 140 18" fill="none" xmlns="http://www.w3.org/2000/svg"> - <g clip-path="url(#clip0_4002_74426)"> - <path - d="M44.7093 13.6226C43.8416 14.197 42.8726 14.4825 41.7983 14.4825C40.3748 14.4825 39.1916 13.9905 38.2452 13.0067C37.2986 12.0229 36.8253 10.7012 36.8253 9.15417C36.8253 7.60711 37.2986 6.33048 38.2339 5.33162C39.1691 4.33287 40.3598 3.8297 41.7983 3.8297C42.8726 3.8297 43.8228 4.13011 44.6416 4.73081C45.4604 5.33162 46.005 6.05259 46.2793 6.88999L48.1085 5.93243C47.5826 4.5844 46.7412 3.56687 45.5956 2.87214C44.4501 2.17749 43.1806 1.83203 41.7983 1.83203C39.7401 1.83203 38.0273 2.53045 36.6601 3.92351C35.2929 5.31657 34.6094 7.04014 34.6094 9.15417C34.6094 11.2682 35.2892 13.0143 36.6451 14.3999C38.001 15.7854 39.7175 16.4764 41.7945 16.4764H41.8021C43.297 16.4764 44.6228 16.1121 45.7909 15.3836C46.9591 14.6552 47.8155 13.5287 48.3601 11.9967L46.6098 11.1218C46.2079 12.2145 45.5731 13.048 44.7093 13.6226Z" - fill="#1E232B"/> - <path - d="M56.4134 1.83203C54.2988 1.83203 52.5635 2.51544 51.2076 3.88221C49.8516 5.24902 49.1719 7.00631 49.1719 9.15417C49.1719 11.302 49.8516 13.0593 51.2076 14.4261C52.5635 15.793 54.2988 16.4764 56.4134 16.4764C58.528 16.4764 60.2634 15.793 61.6193 14.4261C62.9752 13.0593 63.655 11.302 63.655 9.15417C63.655 7.0063 62.9752 5.24902 61.6193 3.88221C60.2596 2.51544 58.5281 1.83203 56.4134 1.83203ZM60.038 13.048C59.099 14.0394 57.8933 14.535 56.4172 14.535C54.941 14.535 53.7353 14.0394 52.7964 13.048C51.8574 12.053 51.3879 10.7576 51.3879 9.15417H51.3954C51.3954 7.58834 51.8687 6.30038 52.8151 5.29033C53.7617 4.28026 54.9636 3.77336 56.421 3.77336C57.8783 3.77336 59.0802 4.28026 60.0267 5.29033C60.9732 6.30039 61.4465 7.55077 61.4465 9.15417C61.4465 10.7576 60.977 12.0567 60.038 13.048Z" - fill="#1E232B"/> - <path - d="M81.0781 1.83594C79.0573 1.83594 77.6902 2.73717 76.9803 4.53949H76.3793C76.03 3.75844 75.4779 3.1126 74.7116 2.60196C73.9491 2.09126 73.0215 1.83594 71.981 1.83594C70.9406 1.83594 70.073 2.09502 69.3706 2.61317C68.6682 3.13138 68.1988 3.77349 67.9621 4.53949H67.4137V2.1889H65.2578V16.1197H67.4175V7.92643C67.4175 6.72492 67.7593 5.74111 68.4428 4.97511C69.1265 4.21283 69.9903 3.82983 71.027 3.82983C72.0637 3.82983 72.9313 4.16022 73.6224 4.82484C74.3135 5.48947 74.659 6.37564 74.659 7.48708V16.1197H76.8188V7.92643C76.8188 6.63474 77.1681 5.62842 77.8592 4.90745C78.5503 4.19031 79.3803 3.82983 80.4546 3.82983C81.5288 3.82983 82.389 4.16022 83.0349 4.81364C83.681 5.46695 84.004 6.3719 84.004 7.51717V16.1235H86.16V7.08156C86.16 5.6059 85.7018 4.36299 84.7815 3.35292C83.8613 2.34284 82.6256 1.83594 81.0781 1.83594Z" - fill="#1E232B"/> - <path - d="M104.164 1.83594C102.143 1.83594 100.776 2.73717 100.066 4.53949H99.4654C99.1165 3.75844 98.5637 3.1126 97.7975 2.60196C97.0351 2.09126 96.1074 1.83594 95.0669 1.83594C94.0266 1.83594 93.1589 2.09502 92.4566 2.61317C91.7542 3.13138 91.2846 3.77349 91.048 4.53949H90.4997V2.1889H88.3438V16.1197H90.5035V7.92643C90.5035 6.72492 90.8453 5.73727 91.5288 4.97511C92.2124 4.21283 93.0763 3.82983 94.113 3.82983C95.1496 3.82983 96.0172 4.16022 96.7083 4.82484C97.3994 5.48947 97.7452 6.37564 97.7452 7.48708V16.1197H99.9051V7.92643C99.9051 6.63474 100.254 5.62842 100.946 4.90745C101.636 4.19031 102.466 3.82983 103.541 3.82983C104.614 3.82983 105.475 4.16022 106.121 4.81364C106.767 5.46695 107.09 6.3719 107.09 7.51717V16.1235H109.246V7.08156C109.246 5.6059 108.788 4.36299 107.867 3.35292C106.947 2.34284 105.712 1.83594 104.164 1.83594Z" - fill="#1E232B"/> - <path - d="M118.273 1.83203C116.158 1.83203 114.423 2.51544 113.067 3.88221C111.711 5.24902 111.031 7.00631 111.031 9.15417C111.031 11.302 111.711 13.0593 113.067 14.4261C114.423 15.793 116.158 16.4764 118.273 16.4764C120.387 16.4764 122.122 15.793 123.479 14.4261C124.835 13.0593 125.515 11.302 125.515 9.15417C125.515 7.0063 124.835 5.24902 123.479 3.88221C122.119 2.51544 120.387 1.83203 118.273 1.83203ZM121.897 13.048C120.958 14.0394 119.753 14.535 118.276 14.535C116.8 14.535 115.594 14.0431 114.655 13.048C113.716 12.053 113.248 10.7576 113.248 9.15417H113.255C113.255 7.58834 113.728 6.30038 114.675 5.29033C115.621 4.28026 116.823 3.77336 118.28 3.77336C119.737 3.77336 120.94 4.28026 121.886 5.29033C122.833 6.30039 123.306 7.55077 123.306 9.15417C123.306 10.7576 122.836 12.0567 121.897 13.048Z" - fill="#1E232B"/> - <path - d="M137.995 3.36797C137.067 2.3466 135.801 1.83594 134.197 1.83594C133.139 1.83594 132.256 2.09502 131.545 2.61317C130.836 3.13138 130.363 3.77349 130.126 4.53949H129.578V2.1889H127.422V16.1197H129.578V7.92643C129.578 6.7436 129.949 5.76363 130.697 4.99004C131.444 4.21657 132.402 3.82983 133.567 3.82983C134.585 3.82983 135.452 4.17527 136.162 4.86614C136.876 5.56087 137.229 6.4433 137.229 7.51717V16.1235H139.388V7.08156C139.388 5.62468 138.923 4.38934 137.995 3.36797Z" - fill="#1E232B"/> - <path - d="M28.7274 6.53615C27.2563 1.67905 22.1301 -1.06798 17.2724 0.394347L9.08797 2.87317L6.51957 0C1.66687 1.47867 -1.07372 6.60831 0.397353 11.4654C1.86843 16.3225 6.99462 19.0695 11.8523 17.6072L20.0418 15.1269L22.6101 18C27.4597 16.5193 30.1979 11.3916 28.7274 6.53615ZM21.59 14.6499L20.0361 15.1206L17.4678 12.2474L10.8372 14.2556C7.83053 15.1573 4.65933 13.4564 3.74887 10.4503C2.8384 7.44423 4.53297 4.26966 7.53469 3.3516L9.09358 2.87946L11.662 5.75263L18.2875 3.74595C21.2942 2.84425 24.4654 4.54512 25.3759 7.55122C26.2863 10.5573 24.5917 13.7319 21.59 14.6499Z" - fill="#1E232B"/> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 214 40" fill="none"> + <g clip-path="url(#clip0_7068_25629)"> + <path d="M40.849 8.82246H49.6862C53.5435 8.82246 55.8751 10.78 55.8751 14.0328C55.8751 16.1342 54.7813 17.8038 52.9678 18.4082V18.5521C55.2131 19.2142 56.5661 21.0853 56.5661 23.5032C56.5661 27.0153 54.0616 29.1454 49.974 29.1454H40.849L40.849 8.82246ZM52.8527 14.4934C52.8527 12.6511 51.4997 11.5571 49.312 11.5571H44.0154V17.4582H49.312C51.4997 17.4582 52.8527 16.3644 52.8527 14.4934ZM53.3996 23.2442C53.3996 21.2581 51.989 20.0778 49.6574 20.0778H44.0154V26.4105H49.6574C51.989 26.4105 53.3996 25.2591 53.3996 23.2442Z" fill="white"/> + <path d="M59.9909 7.95893L63.0421 7.69978V29.1453H59.9909V7.95893Z" fill="white"/> + <path d="M66.191 24.5683C66.191 22.208 67.8318 20.5959 70.6529 20.2505L74.9995 19.7324C75.8918 19.6173 76.2948 19.1566 76.2948 18.2931C76.2948 16.8538 75.1433 15.9327 73.3587 15.9327C71.574 15.9327 70.3075 16.8538 70.0771 18.2931H66.8818C67.1698 15.3281 69.6741 13.457 73.3299 13.457C77.0721 13.457 79.3174 15.3858 79.3174 18.6961V29.1454H76.2948V26.8712H76.1509C75.4313 28.2817 73.3299 29.3467 71.286 29.3467C68.1772 29.3467 66.191 27.4756 66.191 24.5683ZM76.2948 22.3807V21.6323C76.0645 21.7762 75.7479 21.8913 75.3737 21.9489L71.5164 22.3807C70.1922 22.5246 69.4149 23.3307 69.4149 24.5683C69.4149 25.9499 70.3937 26.8424 71.9194 26.8424C74.3375 26.8424 76.2948 24.8849 76.2948 22.3807Z" fill="white"/> + <path d="M83.0875 13.745H86.1388V16.1054H86.2828C87.0887 14.5221 89.0463 13.457 91.0901 13.457C94.4005 13.457 96.5594 15.6159 96.5594 18.9839V29.1454H93.5368V19.387C93.5368 17.4582 92.299 16.2205 90.4279 16.2205C87.9524 16.2205 86.1388 18.1492 86.1388 20.8262V29.1454H83.0875V13.745Z" fill="white"/> + <path d="M100.318 7.95893L103.369 7.69978V20.8262H103.513L110.22 13.745H113.531L107.572 20.3657L113.819 29.1453H110.48L105.538 22.4641L103.369 24.5428V29.1453H100.318V7.95893Z" fill="white"/> + <path d="M114.837 24.5106H118.004C118.061 26.0363 119.212 26.9577 121.084 26.9577C123.07 26.9577 124.308 26.1516 124.308 24.856C124.308 23.8486 123.674 23.2154 122.465 23.0138L119.241 22.467C116.679 22.0353 115.269 20.5096 115.269 18.178C115.269 15.3281 117.572 13.457 121.112 13.457C124.567 13.457 126.841 15.2993 127.013 18.2931H123.962C123.905 16.8538 122.753 15.9327 121.026 15.9327C119.385 15.9327 118.32 16.7386 118.32 17.9765C118.32 18.9263 118.953 19.5597 120.162 19.7612L123.387 20.3081C125.92 20.74 127.359 22.2655 127.359 24.5683C127.359 27.562 124.912 29.462 121.026 29.462C117.255 29.462 114.952 27.6197 114.837 24.5106Z" fill="white"/> + <path d="M129.661 21.4595C129.661 16.7097 132.425 13.4858 136.57 13.4858C138.815 13.4858 140.427 14.3493 141.406 16.1053H141.521V13.7449H144.572V34.2115H141.521V26.7847H141.406C140.427 28.5406 138.815 29.4043 136.57 29.4043C132.425 29.4043 129.661 26.1803 129.661 21.4595ZM141.521 22.1503V20.7685C141.291 17.89 139.564 16.0477 137.146 16.0477C134.497 16.0477 132.741 18.2066 132.741 21.4595C132.741 24.6835 134.497 26.8424 137.146 26.8424C139.564 26.8424 141.291 25.0001 141.521 22.1503Z" fill="white"/> + <path d="M161.803 29.1453H158.751V26.7847H158.607C157.801 28.368 155.844 29.4331 153.8 29.4331C150.49 29.4331 148.331 27.2742 148.331 23.9062V13.7449H151.353V23.5031C151.353 25.4319 152.591 26.6694 154.462 26.6694C156.938 26.6694 158.751 24.7411 158.751 22.0639V13.7449H161.803V29.1453Z" fill="white"/> + <path d="M164.949 24.5683C164.949 22.208 166.589 20.5959 169.41 20.2505L173.757 19.7324C174.649 19.6173 175.052 19.1566 175.052 18.2931C175.052 16.8538 173.901 15.9327 172.116 15.9327C170.332 15.9327 169.065 16.8538 168.835 18.2931H165.639C165.927 15.3281 168.432 13.457 172.087 13.457C175.83 13.457 178.075 15.3858 178.075 18.6961V29.1454H175.052V26.8712H174.908C174.189 28.2817 172.087 29.3467 170.044 29.3467C166.935 29.3467 164.949 27.4756 164.949 24.5683ZM175.052 22.3807V21.6323C174.822 21.7762 174.505 21.8913 174.131 21.9489L170.274 22.3807C168.95 22.5246 168.172 23.3307 168.172 24.5683C168.172 25.9499 169.151 26.8424 170.677 26.8424C173.095 26.8424 175.052 24.8849 175.052 22.3807Z" fill="white"/> + <path d="M181.845 13.745H184.867V15.8174H185.011C185.529 14.3206 186.882 13.457 188.667 13.457H190.797L190.668 16.5659H188.264C186.191 16.5659 184.867 17.6886 184.867 19.502V29.1454H181.845V13.745Z" fill="white"/> + <path d="M191.363 21.4596C191.363 16.6811 194.27 13.457 198.588 13.457C203.395 13.457 206.101 16.7962 205.784 22.3231H194.414C194.673 25.173 196.227 26.9289 198.645 26.9289C200.603 26.9289 201.984 26.094 202.589 24.5106H205.755C204.806 27.7061 202.301 29.462 198.588 29.462C194.27 29.462 191.363 26.2092 191.363 21.4596ZM202.848 20.0778C202.474 17.4008 201.006 15.9615 198.645 15.9615C196.371 15.9615 194.874 17.5158 194.471 20.0778H202.848Z" fill="white"/> + <path d="M28.6552 6.7901H17.3305C16.2525 6.7901 15.2186 7.21834 14.4563 7.98065L9.52276 12.9144C8.76055 13.6767 8.33234 14.7105 8.33234 15.7885V27.113C8.33234 29.3578 10.1521 31.1776 12.3969 31.1776H23.7777C24.8557 31.1776 25.8896 30.7493 26.6518 29.9871L31.5293 25.1096C32.2916 24.3473 32.7198 23.3135 32.7198 22.2355V10.8547C32.7198 8.60988 30.9 6.7901 28.6552 6.7901ZM28.6523 25.0807C28.6523 26.2031 27.7425 27.113 26.6201 27.113H14.4263C13.3039 27.113 12.394 26.2031 12.394 25.0807V12.887C12.394 11.7646 13.3039 10.8547 14.4263 10.8547H26.6201C27.7425 10.8547 28.6523 11.7646 28.6523 12.887V25.0807Z" fill="white"/> </g> <defs> - <clipPath id="clip0_4002_74426"> - <rect width="139.5" height="18" fill="white"/> + <clipPath id="clip0_7068_25629"> + <rect width="214" height="39.0199" fill="white" transform="translate(0 0.490051)"/> </clipPath> </defs> </svg> diff --git a/src/domains/misc/components/Layout/bgAnimation.svg b/src/domains/misc/components/Layout/bgAnimation.svg deleted file mode 100644 index 01a3c89..0000000 --- a/src/domains/misc/components/Layout/bgAnimation.svg +++ /dev/null @@ -1,36 +0,0 @@ -<svg width="1359" height="840" viewBox="0 0 1359 840" fill="none" xmlns="http://www.w3.org/2000/svg"> - <path - d="M805.469 18.9326C1031.86 -49.219 1270.77 78.8062 1339.33 305.172C1407.86 531.46 1280.25 770.439 1054.23 839.446L814.572 571.345L505.553 664.938C365.427 706.962 217.633 627.693 175.201 487.593C132.769 347.493 211.744 199.542 351.639 156.756L805.469 18.9326Z" - stroke="white" - stroke-width="1px" - stroke-miterlimit="10" - stroke-dasharray="0,0,2245.816528896391,1088.964721103609" - vector-effect="non-scaling-stroke" - > - <animate - attributeType="XML" - attributeName="stroke-dasharray" - repeatCount="indefinite" - dur="40.7758743745656s" - values="0,0,2449.435582518411,885.3456674815891;0,885.3456674815891,2449.435582518411,0;2449.435582518411,885.3456674815891,0,0" - keyTimes="0; 0.2654883787299659; 1" - /> - </path> - <path - d="M304.331 0.553955C78.1694 69.4673 -49.5559 308.535 19.0035 534.9C87.5629 761.266 326.47 889.291 552.862 821.14L1006.69 683.316C1146.59 640.53 1225.56 492.579 1183.13 352.479C1140.7 212.38 992.904 133.11 852.778 175.134L543.992 268.656L304.331 0.553955Z" - stroke="white" - stroke-width="1px" - stroke-miterlimit="10" - stroke-dasharray="0,0,2354.8534867855233,979.9292280582265" - vector-effect="non-scaling-stroke" - > - <animate - attributeType="XML" - attributeName="stroke-dasharray" - repeatCount="indefinite" - dur="45.29227817749632s" - values="0,0,2525.6908543383333,809.0918605054164; 0,809.0918605054164,2525.6908543383333,0; 2525.6908543383333,809.0918605054164,0,0" - keyTimes="0; 0.24262206257217156; 1" - /> - </path> -</svg> \ No newline at end of file diff --git a/src/domains/misc/components/Modal/Modal.stories.tsx b/src/domains/misc/components/Modal/Modal.stories.tsx index 8f7ae8a..f8c099c 100644 --- a/src/domains/misc/components/Modal/Modal.stories.tsx +++ b/src/domains/misc/components/Modal/Modal.stories.tsx @@ -124,7 +124,7 @@ const Wrapper = styled.div` display: flex; flex-direction: column; gap: 20px; - ${typography.web.body1}; + ${typography.body1}; `; const ButtonWrapper = styled.div` diff --git a/src/domains/misc/components/Modal/Modal.tsx b/src/domains/misc/components/Modal/Modal.tsx index b30c7bf..b64e334 100644 --- a/src/domains/misc/components/Modal/Modal.tsx +++ b/src/domains/misc/components/Modal/Modal.tsx @@ -3,7 +3,7 @@ import { MouseEvent, ReactElement, useCallback, useEffect, useRef, useState } fr import styled from 'styled-components'; import Button from 'src/domains/misc/components/Button'; -import DoubleBorderBox from 'src/domains/misc/components/DoubleBorderBox'; +import ContentBox from 'src/domains/misc/components/ContentBox'; import Pager from 'src/domains/misc/components/Pager'; import * as Title from 'src/domains/misc/components/Title'; import { useToast } from 'src/domains/misc/components/Toast'; @@ -129,7 +129,7 @@ const ModalWrapper = styled.div` } `; -const ModalContent = styled(motion.create(DoubleBorderBox.Content))` +const ModalContent = styled(motion.create(ContentBox))` width: min(${SLIDE_IN_CARD_BREAKPOINT}px, 100dvw); max-height: 90vh; margin: 0; diff --git a/src/domains/misc/components/PasteButton.tsx b/src/domains/misc/components/PasteButton.tsx index fd3b019..afc4140 100644 --- a/src/domains/misc/components/PasteButton.tsx +++ b/src/domains/misc/components/PasteButton.tsx @@ -2,7 +2,7 @@ import { motion } from 'framer-motion'; import { type ReactNode, useState } from 'react'; import styled from 'styled-components'; -import CIcon from 'src/domains/misc/components/CIcon'; +import BIcon from 'src/domains/misc/components/BIcon'; import { typography } from 'src/domains/styling/utils/tokens'; import vars from 'src/domains/styling/utils/vars'; @@ -48,7 +48,7 @@ const PasteButton = ({ initial={{ opacity: 0, y: isSuccess ? -5 : 0 }} animate={{ opacity: 1, y: 0 }} > - <CIcon + <BIcon icon={isSuccess ? 'CheckmarkCircle' : 'ClipboardPaste'} color={isSuccess ? vars('--color-status-success-foreground-1-rest') : undefined} size={size} @@ -69,7 +69,7 @@ const StyledButton = styled.button` gap: ${vars('--spacing-xs')}; border-radius: ${vars('--border-radius-m')}; - ${typography.decorative.caption1Strong}; + ${typography.caption1Strong}; transition: color 0.2s; `; diff --git a/src/domains/misc/components/SelectBox.tsx b/src/domains/misc/components/SelectBox.tsx index 93c5a2f..cb9bd7b 100644 --- a/src/domains/misc/components/SelectBox.tsx +++ b/src/domains/misc/components/SelectBox.tsx @@ -3,7 +3,7 @@ import { motion } from 'framer-motion'; import { Fragment, ReactElement, ReactNode, useState } from 'react'; import styled, { ThemeProvider } from 'styled-components'; -import CIcon, { IconName } from 'src/domains/misc/components/CIcon'; +import BIcon, { IconName } from 'src/domains/misc/components/BIcon'; import { boxShadows, typography } from 'src/domains/styling/utils/tokens'; import vars from 'src/domains/styling/utils/vars'; @@ -109,7 +109,7 @@ const SelectBox = ({ > {checkMarkPosition === 'left' && selectedIndex !== undefined && <Checkmark icon="CheckmarkRegular" $active={selectedIndex === optionIndex} />} - {option.icon && <CIcon icon={option.icon} />} + {option.icon && <BIcon icon={option.icon} />} {option.text} { option.rightSideEl ?? (checkMarkPosition === 'right' && selectedIndex !== undefined && @@ -153,7 +153,7 @@ const Section = styled.div` } `; -const Checkmark = styled(CIcon)<{ $active: boolean }>` +const Checkmark = styled(BIcon)<{ $active: boolean }>` opacity: ${({ $active }) => $active ? 1 : 0}; `; @@ -168,7 +168,7 @@ const StyledButton = styled(Button)` border-radius: ${vars('--border-radius-xs')}; outline: none; - ${typography.web.body1Strong}; + ${typography.body1Strong}; &:hover, &:active, &:focus, &:focus-visible, &:disabled { border: none; @@ -184,6 +184,6 @@ const Title = styled.div` margin-top: ${vars('--spacing-s')}; padding-block: ${vars('--spacing-s')}; padding-inline: 8px; - ${typography.web.caption1Strong}; + ${typography.caption1Strong}; color: ${vars('--color-neutral-foreground-3-rest')}; `; diff --git a/src/domains/misc/components/Tabs/Tab.tsx b/src/domains/misc/components/Tabs/Tab.tsx index 5161421..2f136f9 100644 --- a/src/domains/misc/components/Tabs/Tab.tsx +++ b/src/domains/misc/components/Tabs/Tab.tsx @@ -148,10 +148,10 @@ const Container = styled(motion.button)<{ selected: boolean, $size: Size }>` /* Note: When changing fonts here, make sure to supply the widest one to the hack below! */ ${perSize({ small: ({ selected }: { selected: boolean }) => ( - selected ? typography.decorative.body1Strong : typography.decorative.body1 + selected ? typography.body1Strong : typography.body1 ), medium: ({ selected }: { selected: boolean }) => ( - selected ? typography.decorative.subtitle2 : typography.decorative.body2 + selected ? typography.subtitle2 : typography.body2 ), })} diff --git a/src/domains/misc/components/TextInput.tsx b/src/domains/misc/components/TextInput.tsx index 96bf483..6534fc9 100644 --- a/src/domains/misc/components/TextInput.tsx +++ b/src/domains/misc/components/TextInput.tsx @@ -2,7 +2,7 @@ import { AnimatePresence, motion } from 'framer-motion'; import { ComponentProps, useRef, MouseEvent } from 'react'; import styled, { css, RuleSet } from 'styled-components'; -import CIcon, { IconName } from 'src/domains/misc/components/CIcon'; +import BIcon, { IconName } from 'src/domains/misc/components/BIcon'; import { transitionTime, typography } from 'src/domains/styling/utils/tokens'; import vars from 'src/domains/styling/utils/vars'; @@ -42,7 +42,7 @@ const TextInput = ({ onClick={() => inputRef.current?.focus()} className={className} > - {leftIcon && <CIcon icon={leftIcon} size={24} />} + {leftIcon && <BIcon icon={leftIcon} size={24} />} <Input ref={inputRef} {...props} /> <AnimatePresence> {onClear && !!props.value?.toString().length && ( @@ -58,7 +58,7 @@ const TextInput = ({ /> )} </AnimatePresence> - {rightIcon && <CIcon icon={rightIcon} size={24} />} + {rightIcon && <BIcon icon={rightIcon} size={24} />} </Container> ); }; @@ -110,7 +110,7 @@ const Container = styled.div<ContainerProps>` outline: css`border: ${BORDER_SIZE}px solid ${vars('--color-neutral-stroke-1-rest')}`, })}; - ${typography.web.body1} + ${typography.body1} & * { fill: ${vars('--color-neutral-foreground-3-rest')}; @@ -182,7 +182,7 @@ const Input = styled.input` outline: none; transition: color ${transitionTime}; - ${typography.web.body2} + ${typography.body2} &::placeholder { color: ${vars('--color-neutral-foreground-4-rest')}; diff --git a/src/domains/misc/components/Title.tsx b/src/domains/misc/components/Title.tsx index e1e127b..86a2496 100644 --- a/src/domains/misc/components/Title.tsx +++ b/src/domains/misc/components/Title.tsx @@ -50,9 +50,9 @@ const TitleBar = styled.header<{ $size: Size }>` large: '60px', })}; ${perSize({ - small: typography.decorative.body1Strong, - medium: typography.decorative.subtitle2, - large: typography.decorative.subtitle1, + small: typography.body1Strong, + medium: typography.subtitle2, + large: typography.subtitle1, })} `; diff --git a/src/domains/misc/components/Toast/Toast.stories.tsx b/src/domains/misc/components/Toast/Toast.stories.tsx index 0fdf49f..3811199 100644 --- a/src/domains/misc/components/Toast/Toast.stories.tsx +++ b/src/domains/misc/components/Toast/Toast.stories.tsx @@ -14,12 +14,6 @@ import { STATUS_ICONS_DATA } from './consts'; const meta = { component: Toast, - parameters: { - design: { - type: 'figma', - url: 'https://www.figma.com/file/Hxk6JqTHnWwLaxsxvEZPtN/Common-Design-System?type=design&node-id=8557-227520', - }, - }, } satisfies Meta<typeof Toast>; export default meta; diff --git a/src/domains/misc/components/Toast/Toast.tsx b/src/domains/misc/components/Toast/Toast.tsx index 0ae561c..699fa73 100644 --- a/src/domains/misc/components/Toast/Toast.tsx +++ b/src/domains/misc/components/Toast/Toast.tsx @@ -3,8 +3,8 @@ import dayjs from 'dayjs'; import { ComponentProps, MouseEvent, MouseEventHandler, PointerEvent, ReactNode } from 'react'; import styled from 'styled-components'; +import BIcon from 'src/domains/misc/components/BIcon'; import Button from 'src/domains/misc/components/Button'; -import CIcon from 'src/domains/misc/components/CIcon'; import userPreferableTimeFormat from 'src/domains/misc/utils/userPreferableTimeFormat'; import { boxShadows, typography } from 'src/domains/styling/utils/tokens'; import vars from 'src/domains/styling/utils/vars'; @@ -53,7 +53,7 @@ const Toast = ({ return ( <Container title="Toast"> <IconContainer> - {status === 'inProgress' ? <Spinner icon="Spinner" size={20} /> : <CIcon size={20} icon={icon} color={color} />} + {status === 'inProgress' ? <Spinner icon="Spinner" size={20} /> : <BIcon size={20} icon={icon} color={color} />} </IconContainer> <RightSection> <Header> @@ -146,20 +146,20 @@ const Title = styled.span` flex-grow: 1; margin-right: ${vars('--spacing-s')}; color: ${vars('--color-neutral-foreground-1-rest')}; - ${typography.web.body1Strong} + ${typography.body1Strong} `; const Time = styled.span` min-width: fit-content; margin-right: ${vars('--spacing-s')}; color: ${vars('--color-neutral-foreground-1-rest')}; - ${typography.web.caption1} + ${typography.caption1} `; const Action = styled.button` margin-right: ${vars('--spacing-m')}; color: ${vars('--color-brand-foreground-link-rest')}; - ${typography.web.body1} + ${typography.body1} &:hover { text-decoration: underline; @@ -181,12 +181,12 @@ const Subtitle = styled.p` color: ${vars('--color-neutral-foreground-2-rest')}; word-wrap: anywhere; /* stylelint-disable-line declaration-property-value-no-unknown */ - ${typography.web.caption1} + ${typography.caption1} `; const Body = styled.div` color: ${vars('--color-neutral-foreground-2-rest')}; - ${typography.web.caption1} + ${typography.caption1} `; const ActionGroup = styled.section` @@ -213,7 +213,7 @@ const ProgressBar = styled.div` transform-origin: center left; `; -const Spinner = styled(CIcon)` +const Spinner = styled(BIcon)` animation: spin 2s infinite linear; path:first-of-type { diff --git a/src/domains/misc/components/Toast/consts.ts b/src/domains/misc/components/Toast/consts.ts index cc14490..bc11e17 100644 --- a/src/domains/misc/components/Toast/consts.ts +++ b/src/domains/misc/components/Toast/consts.ts @@ -1,4 +1,4 @@ -import { IconName } from 'src/domains/misc/components/CIcon'; +import { IconName } from 'src/domains/misc/components/BIcon'; import vars from 'src/domains/styling/utils/vars'; export const STATUS_ICONS_DATA: Record<string, { icon: IconName, color: string | undefined }> = { diff --git a/src/domains/misc/components/Tooltip/LazyLoadedTooltip.tsx b/src/domains/misc/components/Tooltip/LazyLoadedTooltip.tsx index a6ed1ca..db14a4a 100644 --- a/src/domains/misc/components/Tooltip/LazyLoadedTooltip.tsx +++ b/src/domains/misc/components/Tooltip/LazyLoadedTooltip.tsx @@ -89,7 +89,7 @@ const StyledContent = styled(RadixTooltip.Content)` &[data-side='left'] { animation-name: ${slideLeft}; } &[data-side='right'] { animation-name: ${slideRight}; } - ${typography.web.caption1} + ${typography.caption1} `; const StyledArrow = styled(RadixTooltip.Arrow)` diff --git a/src/domains/misc/consts/consts.ts b/src/domains/misc/consts/consts.ts index 5756de0..a329668 100644 --- a/src/domains/misc/consts/consts.ts +++ b/src/domains/misc/consts/consts.ts @@ -15,14 +15,14 @@ export const NEVER_CHANGING_DATA_OPTIONS = { } satisfies Omit<UseQueryOptions, 'queryKey' | 'queryFn'>; export const FAUCET_LINK = 'https://shielder-faucet.vercel.app/'; -export const LANDING_PAGE_LINK = 'https://common.fi'; -export const KNOWLEDGE_BASE_LINK = 'https://docs.common.fi/knowledge-base/web-app-user-guide'; -export const STATISTICS_LINK = 'https://stats.common.fi/'; -export const FEEDBACK_LINK='https://feedback.common.fi/?b=67f637404dea52efc92da1a6'; -export const CHANGELOG_LINK = 'https://feedback.common.fi/changelog'; -export const BEST_PRACTICES_LINK = 'https://docs.common.fi/knowledge-base/shielding/privacy-best-practices'; -export const FRAUD_PROTECTION_LINK = 'https://docs.common.fi/knowledge-base/fraud-protection'; -export const TERMS_OF_SERVICE_LINK = 'https://common.fi/terms-of-service-webapp'; -export const TERMS_OF_CONDITIONS_LINK = 'https://common.fi/terms-and-conditions-shielder-service'; -export const PRIVACY_POLICY_LINK = 'https://common.fi/privacy-policy-webapp'; -export const KEY_GENERATION_PROCESS_LINK = 'https://docs.common.fi/knowledge-base/shielding/key-generation-process'; +export const LANDING_PAGE_LINK = 'https://blanksquare.io'; +export const KNOWLEDGE_BASE_LINK = 'https://docs.blanksquare.io/knowledge-base/web-app-user-guide'; +export const STATISTICS_LINK = 'https://stats.blanksquare.io/'; +export const FEEDBACK_LINK='https://feedback.blanksquare.io/?b=67f637404dea52efc92da1a6'; +export const CHANGELOG_LINK = 'https://feedback.blanksquare.io/changelog'; +export const BEST_PRACTICES_LINK = 'https://docs.blanksquare.io/knowledge-base/shielding/privacy-best-practices'; +export const FRAUD_PROTECTION_LINK = 'https://docs.blanksquare.io/knowledge-base/fraud-protection'; +export const TERMS_OF_SERVICE_LINK = 'https://blanksquare.io/terms-of-service-webapp'; +export const TERMS_OF_CONDITIONS_LINK = 'https://blanksquare.io/terms-and-conditions-shielder-service'; +export const PRIVACY_POLICY_LINK = 'https://blanksquare.io/privacy-policy-webapp'; +export const KEY_GENERATION_PROCESS_LINK = 'https://docs.blanksquare.io/knowledge-base/shielding/key-generation-process'; diff --git a/src/domains/shielder/components/AccountTypeSelector/AccountTypeSelector.tsx b/src/domains/shielder/components/AccountTypeSelector/AccountTypeSelector.tsx index 6c065e1..cb33f07 100644 --- a/src/domains/shielder/components/AccountTypeSelector/AccountTypeSelector.tsx +++ b/src/domains/shielder/components/AccountTypeSelector/AccountTypeSelector.tsx @@ -4,7 +4,7 @@ import { useAccount } from 'wagmi'; import CheckmarkChecked from 'src/domains/misc/assets/checkmarkChecked.svg?react'; import CheckmarkUnchecked from 'src/domains/misc/assets/checkmarkUnchecked.svg?react'; import AccountTypeIcon from 'src/domains/misc/components/AccountTypeIcon'; -import CIcon from 'src/domains/misc/components/CIcon'; +import BIcon from 'src/domains/misc/components/BIcon'; import CopyButton from 'src/domains/misc/components/CopyButton'; import formatAddress from 'src/domains/misc/utils/formatAddress'; import useShielderStore from 'src/domains/shielder/stores/shielder'; @@ -39,7 +39,7 @@ const AccountTypeSelector = () => { <Address data={address} size={20}> {formatAddress(address)} </Address> - ) : <CIcon size={20} icon="ArrowTurnDownLeft" />} + ) : <BIcon size={20} icon="ArrowTurnDownLeft" />} </AdditionalInfo> </BalanceItem> ); @@ -96,7 +96,7 @@ const BalanceName = styled.div` display: flex; align-items: center; gap: ${vars('--spacing-xxs')}; - ${typography.web.body1Strong}; + ${typography.body1Strong}; background: inherit; `; @@ -122,6 +122,6 @@ const Details = styled.div` `; const Address = styled(CopyButton)` - ${typography.web.caption1}; + ${typography.caption1}; gap: ${vars('--spacing-xs')}; `; diff --git a/src/domains/shielder/components/Activity/ActivityItem.tsx b/src/domains/shielder/components/Activity/ActivityItem.tsx index f5068f4..b42f470 100644 --- a/src/domains/shielder/components/Activity/ActivityItem.tsx +++ b/src/domains/shielder/components/Activity/ActivityItem.tsx @@ -156,16 +156,16 @@ const Info = styled.div` const Label = styled.div` color: ${vars('--color-neutral-foreground-3-rest')}; - ${typography.web.caption2} + ${typography.caption2} `; const Title = styled.div` - ${typography.decorative.subtitle2} + ${typography.subtitle2} `; const Balance = styled.div<{ $isPositive: boolean, $status: Status }>` margin-left: auto; - ${typography.decorative.subtitle2}; + ${typography.subtitle2}; ${({ $isPositive, $status }) => { if ($isPositive) { diff --git a/src/domains/shielder/components/Activity/Empty.tsx b/src/domains/shielder/components/Activity/Empty.tsx index 2d3ed6f..8b4bc7f 100644 --- a/src/domains/shielder/components/Activity/Empty.tsx +++ b/src/domains/shielder/components/Activity/Empty.tsx @@ -31,12 +31,12 @@ const Text = styled(motion.div)` text-align: center; & > :first-of-type { - ${typography.decorative.subtitle2} + ${typography.subtitle2} } & > :last-of-type { max-width: 322px; color: ${vars('--color-neutral-foreground-2-rest')}; - ${typography.web.body1}; + ${typography.body1}; } `; diff --git a/src/domains/shielder/components/ActivityIcon.tsx b/src/domains/shielder/components/ActivityIcon.tsx index 77c5e3b..d8cb42c 100644 --- a/src/domains/shielder/components/ActivityIcon.tsx +++ b/src/domains/shielder/components/ActivityIcon.tsx @@ -1,6 +1,6 @@ import styled, { css, RuleSet } from 'styled-components'; -import CIcon, { IconName } from 'src/domains/misc/components/CIcon'; +import BIcon, { IconName } from 'src/domains/misc/components/BIcon'; import { LocalShielderActivityHistory } from 'src/domains/shielder/stores/getShielderIndexedDB'; import vars from 'src/domains/styling/utils/vars.ts'; @@ -25,14 +25,14 @@ const AccountTypeIcon = ({ type, size, className, status = 'stale' }: Props) => return ( <Wrapper> <IconWrapper className={className} $size={size} $status={status}> - <CIcon + <BIcon icon={ICONS_BY_TYPE[type]} size={size / 1.6} /> </IconWrapper> {type === 'Withdraw' && ( <AdditionalIconWrapper className={className}> - <CIcon icon="ShieldedFilled" size={size / 2.4} /> + <BIcon icon="ShieldedFilled" size={size / 2.4} /> </AdditionalIconWrapper> )} </Wrapper> diff --git a/src/domains/shielder/components/HelpDisclaimer.tsx b/src/domains/shielder/components/HelpDisclaimer.tsx index d326da0..7549247 100644 --- a/src/domains/shielder/components/HelpDisclaimer.tsx +++ b/src/domains/shielder/components/HelpDisclaimer.tsx @@ -1,15 +1,16 @@ import { styled } from 'styled-components'; -import CIcon from 'src/domains/misc/components/CIcon'; +import BIcon from 'src/domains/misc/components/BIcon'; +import ContentBox from 'src/domains/misc/components/ContentBox'; import { FRAUD_PROTECTION_LINK } from 'src/domains/misc/consts/consts'; -import { backgroundFilters, typography } from 'src/domains/styling/utils/tokens'; +import { typography } from 'src/domains/styling/utils/tokens'; import vars from 'src/domains/styling/utils/vars'; const HelpDisclaimer = () => ( <Container> - <CIcon size={20} icon="CheckmarkStarburst" /> + <BIcon size={20} icon="CheckmarkStarburst" /> <Text> - Common's privacy system is protected from fraud. + BlankSquare's privacy system is protected from fraud. {' '} <Link href={FRAUD_PROTECTION_LINK} target="_blank" rel="noopener noreferrer">Learn how</Link> </Text> @@ -18,25 +19,21 @@ const HelpDisclaimer = () => ( export default HelpDisclaimer; -const Container = styled.div` +const Container = styled(ContentBox)` display: flex; align-items: start; gap: ${vars('--spacing-s')}; + width: 100%; padding: ${vars('--spacing-l')}; color: ${vars('--color-neutral-foreground-3-rest')}; - - border-radius: ${vars('--border-radius-xxl')}; - background: ${vars('--color-neutral-background-alpha-4-rest')}; - - ${backgroundFilters.backgroundBlur6} `; const Text = styled.p` color: ${vars('--color-neutral-foreground-4-rest')}; - ${typography.web.caption1} + ${typography.caption1} `; const Link = styled.a` diff --git a/src/domains/shielder/components/Shielder.tsx b/src/domains/shielder/components/Shielder.tsx index b0290b8..b795b25 100644 --- a/src/domains/shielder/components/Shielder.tsx +++ b/src/domains/shielder/components/Shielder.tsx @@ -3,8 +3,8 @@ import styled, { css } from 'styled-components'; import { objectEntries, objectKeys } from 'tsafe'; import useChain from 'src/domains/chains/utils/useChain'; -import CIcon from 'src/domains/misc/components/CIcon'; -import DoubleBorderBox from 'src/domains/misc/components/DoubleBorderBox'; +import BIcon from 'src/domains/misc/components/BIcon'; +import ContentBox from 'src/domains/misc/components/ContentBox'; import Skeleton from 'src/domains/misc/components/Skeleton'; import Tabs from 'src/domains/misc/components/Tabs'; import Title from 'src/domains/misc/components/Title'; @@ -69,7 +69,7 @@ useState<keyof typeof TABS>('tokens'); if (!isSuccess) { return ( - <Wrapper> + <Container> <WithPadding> <Skeleton style={{ @@ -81,72 +81,72 @@ useState<keyof typeof TABS>('tokens'); }} /> </WithPadding> - </Wrapper> + </Container> ); } return ( - <Wrapper> - <Container $withoutBottomPadding={currentTab === 'activity'}> - <WithPadding> - <Title size="medium">Your accounts - - - - {currentTab === 'activity' ? ( - - ) : ( - <> - {selectedAccountType === 'public' && ( - - - -

Tokens that can be moved to shielded account:

-
-
- )} - - - - {selectedAccountType === 'shielded' && ( - - - - -

- Shielded account is created based on your connected account. - It’s specific to the platform you use – accounts created in - the Web App can be retrieved from the Web App on another device. -

-
- -
-
- )} - - )} - - + + + Your accounts + + + + {currentTab === 'activity' ? ( + + ) : ( + <> + {selectedAccountType === 'public' && ( + + + +

Tokens that can be moved to shielded account:

+
+
+ )} + + + + {selectedAccountType === 'shielded' && ( + + + + +

+ Shielded account is created based on your connected account. + It’s specific to the platform you use – accounts created in + the Web App can be retrieved from the Web App on another device. +

+
+ +
+
+ )} + + )} +
); }; export default Shielder; -const Wrapper = styled(DoubleBorderBox.Wrapper)` - width: 100%; - overflow: hidden; -`; - -const Container = styled(DoubleBorderBox.Content)<{ $withoutBottomPadding?: boolean }>` +const Container = styled(ContentBox)<{ $withoutBottomPadding?: boolean }>` display: flex; - flex-direction: column; + + gap: ${vars('--spacing-l')}; + flex-direction: column; + + width: 100%; padding-inline: ${vars('--spacing-none')}; padding-block: ${vars('--spacing-l')}; + + overflow: hidden; + ${({ $withoutBottomPadding }) => $withoutBottomPadding && css` padding-bottom: 0; ` @@ -171,10 +171,10 @@ const InfoBox = styled.div` gap: ${vars('--spacing-s')}; padding-left: ${vars('--spacing-xs')}; color: ${vars('--color-neutral-foreground-3-rest')}; - ${typography.web.body1Strong}; + ${typography.body1Strong}; `; -const Disclaimer = styled(DoubleBorderBox.Content)` +const Disclaimer = styled(ContentBox)` display: flex; flex-direction: row; @@ -193,7 +193,7 @@ const InfoContainer = styled.div` gap: ${vars('--spacing-xs')}; padding: ${vars('--spacing-m')} ${vars('--spacing-l')} ${vars('--spacing-l')}; color: ${vars('--color-neutral-foreground-2-rest')}; - ${typography.web.caption1}; + ${typography.caption1}; `; const ShieldImage = styled.img` diff --git a/src/domains/shielder/components/SignatureModal.tsx b/src/domains/shielder/components/SignatureModal.tsx index 5747b37..3374966 100644 --- a/src/domains/shielder/components/SignatureModal.tsx +++ b/src/domains/shielder/components/SignatureModal.tsx @@ -8,8 +8,8 @@ import { useAccount } from 'wagmi'; import { useWallet } from 'src/domains/chains/components/WalletProvider'; import { wagmiAdapter } from 'src/domains/chains/utils/clients'; import useConnectedChainNetworkEnvironment from 'src/domains/chains/utils/useConnectedChainNetworkEnvironment'; +import BIcon from 'src/domains/misc/components/BIcon'; import Button from 'src/domains/misc/components/Button'; -import CIcon from 'src/domains/misc/components/CIcon'; import Modal from 'src/domains/misc/components/Modal'; import CheckedContainer from 'src/domains/misc/components/PatternContainer'; import { KEY_GENERATION_PROCESS_LINK } from 'src/domains/misc/consts/consts'; @@ -90,7 +90,7 @@ const SignatureModal = () => {

Learn more

- +
{isReady && !isLoading && !isSuccess && ( @@ -116,17 +116,17 @@ const Content = styled.div` gap: ${vars('--spacing-l')}; `; -const SignatureIcon = styled(CIcon)` +const SignatureIcon = styled(BIcon)` position: relative; `; const Title = styled.h3<{ $isError?: boolean }>` - ${typography.decorative.subtitle1}; + ${typography.subtitle1}; ${({ $isError }) => $isError && css`color: ${vars('--color-status-danger-foreground-1-rest')};`} `; const Text = styled.p` - ${typography.decorative.body1}; + ${typography.body1}; text-align: center; color: ${vars('--color-neutral-foreground-2-rest')}; `; @@ -141,7 +141,7 @@ const Buttons = styled.div` const LearnMore = styled.a` display: flex; gap: ${vars('--spacing-xs')}; - ${typography.web.body1}; + ${typography.body1}; &, & > a { color: ${vars('--color-brand-foreground-link-rest')}; diff --git a/src/domains/shielder/components/TokenList/AssetBox/AssetBox.tsx b/src/domains/shielder/components/TokenList/AssetBox/AssetBox.tsx index 4bdbfe1..21a5db7 100644 --- a/src/domains/shielder/components/TokenList/AssetBox/AssetBox.tsx +++ b/src/domains/shielder/components/TokenList/AssetBox/AssetBox.tsx @@ -243,7 +243,7 @@ export default AssetBox; const Title = styled.h3` padding-bottom: ${vars('--spacing-m-nudge')}; - ${typography.web.caption1} + ${typography.caption1} `; const ClearButton = styled(Button)` @@ -264,7 +264,7 @@ const Input = styled(AutoResizingInput)` padding: 0; border: none; - ${typography.decorative.title1}; + ${typography.title1}; color: ${vars('--color-neutral-foreground-1-rest')}; text-align: right; @@ -292,11 +292,11 @@ const CurrentBalance = styled.span<{ $highlighted: boolean }>` `; const BalanceLabel = styled.span` - ${typography.web.body1} + ${typography.body1} `; const Balance = styled.span` - ${typography.web.body1Strong} + ${typography.body1Strong} `; const PercentageContainer = styled.div` @@ -309,13 +309,13 @@ const TokenDetails = styled.div` display: flex; align-items: center; gap: ${vars('--spacing-xs')}; - ${typography.decorative.subtitle2} + ${typography.subtitle2} `; const AccountDetails = styled.div` display: flex; gap: ${vars('--spacing-m')}; - ${typography.web.caption1}; + ${typography.caption1}; margin-top: ${vars('--spacing-m')}; `; @@ -324,7 +324,7 @@ const Address = styled.div` gap: ${vars('--spacing-s')}; align-items: center; color: ${vars('--color-brand-foreground-1-rest')}; - ${typography.web.body1}; + ${typography.body1}; `; const Divider = styled.div` diff --git a/src/domains/shielder/components/TokenList/AssetBox/PercentageInput.tsx b/src/domains/shielder/components/TokenList/AssetBox/PercentageInput.tsx index 7490e4d..ce204a0 100644 --- a/src/domains/shielder/components/TokenList/AssetBox/PercentageInput.tsx +++ b/src/domains/shielder/components/TokenList/AssetBox/PercentageInput.tsx @@ -1,6 +1,6 @@ import styled from 'styled-components'; -import CIcon from 'src/domains/misc/components/CIcon'; +import BIcon from 'src/domains/misc/components/BIcon'; import { transitionTime, typography } from 'src/domains/styling/utils/tokens'; import vars from 'src/domains/styling/utils/vars'; @@ -44,7 +44,7 @@ const Input = styled(AutoResizingInput)` background: none; outline: none; - ${typography.decorative.subtitle2} + ${typography.subtitle2} `; const Container = styled.label<{ $highlighted: boolean }>` @@ -52,7 +52,7 @@ const Container = styled.label<{ $highlighted: boolean }>` align-items: center; border-bottom: 1px dashed ${vars('--color-neutral-stroke-2-rest')}; cursor: text; - ${typography.decorative.subtitle2}; + ${typography.subtitle2}; &&, ${Input}, ${Input}::placeholder { color: ${props => props.$highlighted ? @@ -63,6 +63,6 @@ const Container = styled.label<{ $highlighted: boolean }>` } `; -const PencilIcon = styled(CIcon)` +const PencilIcon = styled(BIcon)` margin-right: ${vars('--spacing-xxs')}; `; diff --git a/src/domains/shielder/components/TokenList/Modals/ConfirmPage.tsx b/src/domains/shielder/components/TokenList/Modals/ConfirmPage.tsx index 9b74f17..c2fa2b9 100644 --- a/src/domains/shielder/components/TokenList/Modals/ConfirmPage.tsx +++ b/src/domains/shielder/components/TokenList/Modals/ConfirmPage.tsx @@ -3,9 +3,9 @@ import { type Address } from 'viem'; import useChain from 'src/domains/chains/utils/useChain'; import AccountTypeIcon from 'src/domains/misc/components/AccountTypeIcon'; +import BIcon from 'src/domains/misc/components/BIcon'; import Button from 'src/domains/misc/components/Button'; -import CIcon from 'src/domains/misc/components/CIcon'; -import DoubleBorderBox from 'src/domains/misc/components/DoubleBorderBox'; +import ContentBox from 'src/domains/misc/components/ContentBox'; import InfoPair from 'src/domains/misc/components/InfoPair'; import Skeleton from 'src/domains/misc/components/Skeleton'; import TokenIcon from 'src/domains/misc/components/TokenIcon'; @@ -99,7 +99,7 @@ const ConfirmPage = ({

Est. Total fee

} @@ -149,9 +149,9 @@ const Footer = styled(Wrapper)` gap: ${vars('--spacing-xl')}; `; -const Content = styled(DoubleBorderBox.Content)` +const Content = styled(ContentBox)` display: flex; - + gap: ${vars('--spacing-m')}; align-items: center; justify-content: space-between; @@ -161,7 +161,7 @@ const Content = styled(DoubleBorderBox.Content)` background: ${vars('--color-neutral-background-4a-rest')}; - ${typography.web.body1}; + ${typography.body1}; `; const AccountDetails = styled.div` @@ -175,14 +175,14 @@ const Address = styled.p` `; const Amount = styled.div` - ${typography.decorative.title1}; + ${typography.title1}; `; const TokenDetails = styled.div` display: flex; align-items: center; gap: ${vars('--spacing-s')}; - ${typography.decorative.subtitle2}; + ${typography.subtitle2}; `; const Divider = styled.div` @@ -209,7 +209,7 @@ const TotalFee = styled.div` align-items: center; gap: ${vars('--spacing-xs')}; color: ${vars('--color-neutral-foreground-2-rest')}; - ${typography.web.body1}; + ${typography.body1}; & > button { display: flex; diff --git a/src/domains/shielder/components/TokenList/Modals/SendModal/SelectAccountPage.tsx b/src/domains/shielder/components/TokenList/Modals/SendModal/SelectAccountPage.tsx index bb59399..94e665f 100644 --- a/src/domains/shielder/components/TokenList/Modals/SendModal/SelectAccountPage.tsx +++ b/src/domains/shielder/components/TokenList/Modals/SendModal/SelectAccountPage.tsx @@ -4,9 +4,9 @@ import styled, { RuleSet } from 'styled-components'; import { isAddress } from 'viem'; import { useWallet } from 'src/domains/chains/components/WalletProvider'; +import BIcon from 'src/domains/misc/components/BIcon'; import Button from 'src/domains/misc/components/Button'; -import CIcon from 'src/domains/misc/components/CIcon'; -import DoubleBorderBox from 'src/domains/misc/components/DoubleBorderBox'; +import ContentBox from 'src/domains/misc/components/ContentBox'; import PasteButton from 'src/domains/misc/components/PasteButton'; import TextInput from 'src/domains/misc/components/TextInput'; import { BEST_PRACTICES_LINK } from 'src/domains/misc/consts/consts'; @@ -62,7 +62,7 @@ const SelectAccountPage = ({ addressTo, setAddressTo, onConfirmClick }: Props) = transition={{ duration: 0.2, ease: 'easeInOut' }} > - @@ -76,7 +76,7 @@ const SelectAccountPage = ({ addressTo, setAddressTo, onConfirmClick }: Props) = - +

You're about to send tokens from your shielded account to a public account. It will originate from the shielded pool, leaving your old transfer history behind. @@ -93,7 +93,7 @@ const SelectAccountPage = ({ addressTo, setAddressTo, onConfirmClick }: Props) = initial={{ rotateZ: -90 }} animate={{ rotateZ: isExpanded ? -270 : -90 }} > - + @@ -130,7 +130,7 @@ const Container = styled.div` gap: ${vars('--spacing-xl')}; `; -const Content = styled(DoubleBorderBox.Content)` +const Content = styled(ContentBox)` display: flex; flex-direction: column; @@ -161,7 +161,7 @@ const AccordionHeader = styled.div` `; const AccordionTitle = styled.p` - ${typography.web.caption1Strong}; + ${typography.caption1Strong}; `; const AccordionContent = styled(motion.ul)` @@ -177,7 +177,7 @@ const AccordionItem = styled.li` display: flex; gap: ${vars('--spacing-s')}; align-items: start; - ${typography.web.caption1}; + ${typography.caption1}; &::before { content: '•'; @@ -192,7 +192,7 @@ const InfoContainer = styled.div` gap: ${vars('--spacing-xs')}; padding: ${vars('--spacing-m')} ${vars('--spacing-l')} ${vars('--spacing-l')}; color: ${vars('--color-neutral-foreground-2-rest')}; - ${typography.web.caption1}; + ${typography.caption1}; `; const ShieldImage = styled.img` @@ -206,7 +206,7 @@ const ShieldImage = styled.img` const Label = styled.div` display: flex; justify-content: space-between; - ${typography.web.body1}; + ${typography.body1}; `; const MessageContainer = styled(motion.div)` @@ -221,13 +221,13 @@ const MessageContent = styled.div<{ $status: MessageStatus }>` warning: vars('--color-status-warning-foreground-1-rest'), })({ $status: props.$status })}; - & > ${CIcon} { + & > ${BIcon} { margin-top: ${vars('--spacing-xs-nudge')}; } `; const MessageText = styled.p` - ${typography.web.caption1}; + ${typography.caption1}; `; const ChevronIconWrapper = styled(motion.div)` @@ -241,5 +241,5 @@ const Link = styled.a` color: ${vars('--color-brand-foreground-link-rest')}; text-decoration: none; - ${typography.web.body1} + ${typography.body1} `; diff --git a/src/domains/shielder/components/TokenList/Modals/SendModal/SelectAmountPage.tsx b/src/domains/shielder/components/TokenList/Modals/SendModal/SelectAmountPage.tsx index fca13e4..57ad7a2 100644 --- a/src/domains/shielder/components/TokenList/Modals/SendModal/SelectAmountPage.tsx +++ b/src/domains/shielder/components/TokenList/Modals/SendModal/SelectAmountPage.tsx @@ -4,9 +4,9 @@ import { isNullish } from 'utility-types'; import { useWallet } from 'src/domains/chains/components/WalletProvider'; import useChain from 'src/domains/chains/utils/useChain'; +import BIcon from 'src/domains/misc/components/BIcon'; import Button from 'src/domains/misc/components/Button'; -import CIcon from 'src/domains/misc/components/CIcon'; -import DoubleBorderBox from 'src/domains/misc/components/DoubleBorderBox'; +import ContentBox from 'src/domains/misc/components/ContentBox'; import InfoPair from 'src/domains/misc/components/InfoPair'; import Skeleton from 'src/domains/misc/components/Skeleton'; import TokenIcon from 'src/domains/misc/components/TokenIcon'; @@ -88,7 +88,7 @@ const SelectAmountPage = ({ onContinue, token, hasInsufficientFees, value, onVal /> - +

You’re about to send tokens from your shielded account to a public account. It will originate from the shielded pool, leaving your old transfer history behind. @@ -102,7 +102,7 @@ const SelectAmountPage = ({ onContinue, token, hasInsufficientFees, value, onVal

Est. Total fee

} @@ -139,7 +139,7 @@ const Container = styled.div` gap: ${vars('--spacing-xl')}; `; -const Content = styled(DoubleBorderBox.Content)` +const Content = styled(ContentBox)` display: flex; flex-direction: column; @@ -163,7 +163,7 @@ const InfoContainer = styled.div` gap: ${vars('--spacing-xs')}; padding: ${vars('--spacing-m')} ${vars('--spacing-l')} ${vars('--spacing-l')}; color: ${vars('--color-neutral-foreground-2-rest')}; - ${typography.web.caption1}; + ${typography.caption1}; `; const ShieldImage = styled.img` @@ -192,7 +192,7 @@ const TotalFeeLabel = styled.div` align-items: center; gap: ${vars('--spacing-xs')}; color: ${vars('--color-neutral-foreground-2-rest')}; - ${typography.web.body1}; + ${typography.body1}; & > button { display: flex; diff --git a/src/domains/shielder/components/TokenList/Modals/ShieldModal/SelectAmountPage.tsx b/src/domains/shielder/components/TokenList/Modals/ShieldModal/SelectAmountPage.tsx index 2410907..34e7ceb 100644 --- a/src/domains/shielder/components/TokenList/Modals/ShieldModal/SelectAmountPage.tsx +++ b/src/domains/shielder/components/TokenList/Modals/ShieldModal/SelectAmountPage.tsx @@ -4,9 +4,9 @@ import { isNullish } from 'utility-types'; import { useWallet } from 'src/domains/chains/components/WalletProvider'; import useChain from 'src/domains/chains/utils/useChain'; +import BIcon from 'src/domains/misc/components/BIcon'; import Button from 'src/domains/misc/components/Button'; -import CIcon from 'src/domains/misc/components/CIcon'; -import DoubleBorderBox from 'src/domains/misc/components/DoubleBorderBox'; +import ContentBox from 'src/domains/misc/components/ContentBox'; import InfoPair from 'src/domains/misc/components/InfoPair'; import Skeleton from 'src/domains/misc/components/Skeleton'; import TokenIcon from 'src/domains/misc/components/TokenIcon'; @@ -92,7 +92,7 @@ const SelectAmountPage = ({ onContinue, token, hasInsufficientFees, value, onVal /> - +

You're about to shield your tokens. Your shielded account balance and actions will be private and secured. @@ -106,7 +106,7 @@ const SelectAmountPage = ({ onContinue, token, hasInsufficientFees, value, onVal

Est. Total fee

} @@ -143,11 +143,16 @@ const Container = styled.div` gap: ${vars('--spacing-xl')}; `; -const Disclaimer = styled(DoubleBorderBox.Content)` +const Disclaimer = styled(ContentBox)` display: flex; + + flex-direction: row; justify-content: space-between; + gap: ${vars('--spacing-m')}; + margin: ${vars('--spacing-none')}; padding: ${vars('--spacing-s')} 0 0 0; + background: ${vars('--color-neutral-background-4a-rest')}; `; @@ -157,7 +162,7 @@ const InfoContainer = styled.div` gap: ${vars('--spacing-xs')}; padding: ${vars('--spacing-m')} ${vars('--spacing-l')} ${vars('--spacing-l')}; color: ${vars('--color-neutral-foreground-2-rest')}; - ${typography.web.caption1}; + ${typography.caption1}; `; const ShieldImage = styled.img` @@ -186,7 +191,7 @@ const TotalFeeLabel = styled.div` align-items: center; gap: ${vars('--spacing-xs')}; color: ${vars('--color-neutral-foreground-2-rest')}; - ${typography.web.body1}; + ${typography.body1}; & > button { display: flex; diff --git a/src/domains/shielder/components/TokenList/TokenListItem.tsx b/src/domains/shielder/components/TokenList/TokenListItem.tsx index fbed681..808f231 100644 --- a/src/domains/shielder/components/TokenList/TokenListItem.tsx +++ b/src/domains/shielder/components/TokenList/TokenListItem.tsx @@ -139,7 +139,7 @@ const Column = styled.div` `; const Title = styled.p` - ${typography.decorative.subtitle2}; + ${typography.subtitle2}; `; const Subtitle = styled.div` @@ -147,5 +147,5 @@ const Subtitle = styled.div` align-items: center; gap: ${vars('--spacing-xs')}; color: ${vars('--color-neutral-foreground-4-rest')}; - ${typography.web.caption1}; + ${typography.caption1}; `; diff --git a/src/domains/shielder/components/TransactionDetailsModal/ActivityDetailsModal.tsx b/src/domains/shielder/components/TransactionDetailsModal/ActivityDetailsModal.tsx index 850a772..8465283 100644 --- a/src/domains/shielder/components/TransactionDetailsModal/ActivityDetailsModal.tsx +++ b/src/domains/shielder/components/TransactionDetailsModal/ActivityDetailsModal.tsx @@ -6,7 +6,7 @@ import ChainIcon from 'src/domains/chains/components/ChainIcon'; import { useWallet } from 'src/domains/chains/components/WalletProvider'; import useChain from 'src/domains/chains/utils/useChain'; import AccountTypeIcon from 'src/domains/misc/components/AccountTypeIcon'; -import CIcon from 'src/domains/misc/components/CIcon'; +import BIcon from 'src/domains/misc/components/BIcon'; import InfoPair from 'src/domains/misc/components/InfoPair'; import Modal from 'src/domains/misc/components/Modal'; import Skeleton from 'src/domains/misc/components/Skeleton.tsx'; @@ -224,7 +224,7 @@ const ActivityDetailsModal = (props: Props) => { target="_blank" rel="noopener noreferrer" > - + )} @@ -237,7 +237,7 @@ const ActivityDetailsModal = (props: Props) => {

Est. Total fee

)} @@ -297,12 +297,12 @@ const Header = styled.header` `; const TokenName = styled.h2` - ${typography.decorative.subtitle1} + ${typography.subtitle1} `; const Balance = styled.p<{ $isPositive: boolean, $status: Status }>` margin-left: auto; - ${typography.decorative.subtitle1}; + ${typography.subtitle1}; ${({ $isPositive, $status }) => { if ($isPositive) { if ($status === 'completed') { @@ -359,14 +359,14 @@ const RowValue = styled.div` display: flex; align-items: center; gap: ${vars('--spacing-s')}; - ${typography.web.body1}; + ${typography.body1}; `; const TransactionId = styled.div` display: flex; align-items: center; color: ${vars('--color-brand-foreground-1-rest')}; - ${typography.web.body1}; + ${typography.body1}; & > a { display: flex; @@ -393,7 +393,7 @@ const TotalFee = styled.div` display: flex; align-items: center; gap: ${vars('--spacing-xs')}; - ${typography.web.body1}; + ${typography.body1}; & > button { display: flex; diff --git a/src/domains/shielder/components/TransactionDetailsModal/Steps.tsx b/src/domains/shielder/components/TransactionDetailsModal/Steps.tsx index 8e18108..d4c7d7c 100644 --- a/src/domains/shielder/components/TransactionDetailsModal/Steps.tsx +++ b/src/domains/shielder/components/TransactionDetailsModal/Steps.tsx @@ -1,7 +1,7 @@ import dayjs from 'dayjs'; import styled, { css, RuleSet } from 'styled-components'; -import CIcon from 'src/domains/misc/components/CIcon'; +import BIcon from 'src/domains/misc/components/BIcon'; import { typography } from 'src/domains/styling/utils/tokens'; import vars from 'src/domains/styling/utils/vars'; @@ -30,7 +30,7 @@ const Steps = ({ steps }: { steps: StepData[] }) => { {icon === 'Spinner' ? : icon && ( - ` `; const Name = styled.p` - ${typography.web.body1} + ${typography.body1} `; const Timestamp = styled.p` color: ${vars('--color-neutral-foreground-3-rest')}; - ${typography.web.caption2} + ${typography.caption2} `; -const LoadingIcon = styled(CIcon)` +const LoadingIcon = styled(BIcon)` animation: spin 1.4s linear infinite; & *:first-of-type { diff --git a/src/domains/shielder/components/TransactionDetailsModal/Title.tsx b/src/domains/shielder/components/TransactionDetailsModal/Title.tsx index d5e0f21..17cdc77 100644 --- a/src/domains/shielder/components/TransactionDetailsModal/Title.tsx +++ b/src/domains/shielder/components/TransactionDetailsModal/Title.tsx @@ -62,11 +62,11 @@ const Container = styled.div` flex-direction: column; & > :first-of-type { - ${typography.decorative.subtitle2}; + ${typography.subtitle2}; }; & > :last-of-type { - ${typography.web.caption2}; + ${typography.caption2}; color:${vars('--color-neutral-foreground-3-rest')} }; `; diff --git a/src/domains/shielder/components/Welcome/Welcome.tsx b/src/domains/shielder/components/Welcome/Welcome.tsx index 95737a7..e3280dc 100644 --- a/src/domains/shielder/components/Welcome/Welcome.tsx +++ b/src/domains/shielder/components/Welcome/Welcome.tsx @@ -2,7 +2,7 @@ import styled from 'styled-components'; import ConnectModal from 'src/domains/chains/components/ConnectModal'; import Button from 'src/domains/misc/components/Button'; -import DoubleBorderBox from 'src/domains/misc/components/DoubleBorderBox'; +import ContentBox from 'src/domains/misc/components/ContentBox'; import { useModal } from 'src/domains/misc/components/Modal'; import { typography } from 'src/domains/styling/utils/tokens'; import vars from 'src/domains/styling/utils/vars'; @@ -15,29 +15,27 @@ const Welcome = () => { const { open } = useModal(); return ( - - - - - Make your onchain actions private and secure with shielding. - - {STEPS.map((step, index) => ( - - {index + 1} -

{step}

-
- ))} -
-
- void open()} - > - Connect Wallet - -
-
+ + + + Make your onchain actions private and secure with shielding. + + {STEPS.map((step, index) => ( + + {index + 1} +

{step}

+
+ ))} +
+
+ void open()} + > + Connect Wallet + +
); }; @@ -51,7 +49,7 @@ const BreakTheTrace = styled.img` user-select: none; `; -const Content = styled(DoubleBorderBox.Content)` +const Content = styled(ContentBox)` display: flex; flex-direction: column; @@ -83,7 +81,7 @@ const Steps = styled.li` const Title = styled.h2` max-width: 308px; text-align: center; - ${typography.web.body1Strong}; + ${typography.body1Strong}; `; const Step = styled.div` @@ -91,7 +89,7 @@ const Step = styled.div` align-items: center; gap: ${vars('--spacing-s')}; color: ${vars('--color-neutral-foreground-2-rest')}; - ${typography.web.body1}; + ${typography.body1}; `; const StepNumber = styled.div` @@ -107,5 +105,5 @@ const StepNumber = styled.div` flex-shrink: 0; - ${typography.decorative.body1}; + ${typography.body1}; `; diff --git a/src/domains/shielder/consts/consts.ts b/src/domains/shielder/consts/consts.ts index 2646be6..8dce832 100644 --- a/src/domains/shielder/consts/consts.ts +++ b/src/domains/shielder/consts/consts.ts @@ -5,13 +5,13 @@ * Changing it will break compatibility for all users relying on the current message. */ export const MAINNET_SHIELDER_PRIVATE_KEY_SIGNING_MESSAGE = ` -Sign this message to enter the Common Web App and start shielding your assets. +Sign this message to enter the BlankSquare Web App and start shielding your assets. -SECURITY WARNING: Always ensure the website address is actually common.fi. If it's not, do not proceed! You may be at risk of losing your funds. +SECURITY WARNING: Always ensure the website address is actually blanksquare.io. If it's not, do not proceed! You may be at risk of losing your funds. `; export const TESTNET_SHIELDER_PRIVATE_KEY_SIGNING_MESSAGE = ` -Sign this message to enter the Common Web App and start shielding your assets on testnets. +Sign this message to enter the BlankSquare Web App and start shielding your assets on testnets. -SECURITY WARNING: Always ensure the website address is actually common.fi. If it's not, do not proceed! You may be at risk of losing your funds. +SECURITY WARNING: Always ensure the website address is actually blanksquare.io. If it's not, do not proceed! You may be at risk of losing your funds. `; diff --git a/src/domains/shielder/utils/useFeeBreakdownModal.tsx b/src/domains/shielder/utils/useFeeBreakdownModal.tsx index 47c2f9a..19f18ef 100644 --- a/src/domains/shielder/utils/useFeeBreakdownModal.tsx +++ b/src/domains/shielder/utils/useFeeBreakdownModal.tsx @@ -134,7 +134,7 @@ const Container = styled.div` display: flex; flex-direction: column; gap: ${vars('--spacing-l')}; - ${typography.web.body1}; + ${typography.body1}; `; const FeeBreakdown = styled.div` diff --git a/src/domains/styling/components/GlobalStyles.tsx b/src/domains/styling/components/GlobalStyles.tsx index 5e7662f..bf61b1a 100644 --- a/src/domains/styling/components/GlobalStyles.tsx +++ b/src/domains/styling/components/GlobalStyles.tsx @@ -3,6 +3,7 @@ import cssReset from 'styled-reset'; import { primitives, themes } from '../utils/tokens'; import vars from '../utils/vars'; +import '../fonts.css'; const primitivesString = Object.entries(primitives) .map(([property, value]) => `${property}: ${value};`).join('\n'); diff --git a/src/domains/styling/fonts.css b/src/domains/styling/fonts.css new file mode 100644 index 0000000..9dac1e9 --- /dev/null +++ b/src/domains/styling/fonts.css @@ -0,0 +1,41 @@ +/* Innovator Grotesk Font Family */ + +@font-face { + font-family: 'Innovator Grotesk'; + src: url('/fonts/Innovator Grotesk/InnovatorGrotesk-Light.woff2') format('woff2'); + font-weight: 300; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'Innovator Grotesk'; + src: url('/fonts/Innovator Grotesk/InnovatorGrotesk-Regular.woff2') format('woff2'); + font-weight: 400; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'Innovator Grotesk'; + src: url('/fonts/Innovator Grotesk/InnovatorGrotesk-Medium.woff2') format('woff2'); + font-weight: 500; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'Innovator Grotesk'; + src: url('/fonts/Innovator Grotesk/InnovatorGrotesk-SemiBold.woff2') format('woff2'); + font-weight: 600; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'Innovator Grotesk'; + src: url('/fonts/Innovator Grotesk/InnovatorGrotesk-Bold.woff2') format('woff2'); + font-weight: 700; + font-style: normal; + font-display: swap; +} \ No newline at end of file diff --git a/src/domains/styling/utils/tokens.ts b/src/domains/styling/utils/tokens.ts index 7a3efde..677cb37 100644 --- a/src/domains/styling/utils/tokens.ts +++ b/src/domains/styling/utils/tokens.ts @@ -6,143 +6,150 @@ import { css } from 'styled-components'; import vars from'./vars'; export const primitives = { - '--colors-brand-primary-10': 'rgb(13, 22, 36)', - '--colors-brand-primary-100': 'rgb(130, 178, 250)', - '--colors-brand-primary-110': 'rgb(148, 191, 255)', - '--colors-brand-primary-120': 'rgb(170, 204, 255)', - '--colors-brand-primary-130': 'rgb(189, 215, 255)', - '--colors-brand-primary-140': 'rgb(204, 224, 255)', - '--colors-brand-primary-150': 'rgb(229, 239, 255)', - '--colors-brand-primary-160': 'rgb(242, 247, 255)', - '--colors-brand-primary-20': 'rgb(21, 37, 60)', - '--colors-brand-primary-30': 'rgb(29, 49, 80)', - '--colors-brand-primary-40': 'rgb(36, 61, 99)', - '--colors-brand-primary-50': 'rgb(44, 75, 122)', - '--colors-brand-primary-60': 'rgb(51, 88, 143)', - '--colors-brand-primary-70': 'rgb(64, 110, 178)', - '--colors-brand-primary-80': 'rgb(84, 134, 209)', - '--colors-brand-primary-90': 'rgb(111, 161, 235)', - '--colors-brand-secondary-10': 'rgb(41, 23, 10)', - '--colors-brand-secondary-100': 'rgb(250, 158, 92)', - '--colors-brand-secondary-110': 'rgb(250, 174, 120)', - '--colors-brand-secondary-120': 'rgb(252, 189, 144)', - '--colors-brand-secondary-130': 'rgb(255, 215, 186)', - '--colors-brand-secondary-140': 'rgb(255, 225, 204)', - '--colors-brand-secondary-150': 'rgb(255, 241, 232)', - '--colors-brand-secondary-160': 'rgb(255, 252, 250)', - '--colors-brand-secondary-20': 'rgb(61, 33, 13)', - '--colors-brand-secondary-30': 'rgb(79, 43, 17)', - '--colors-brand-secondary-40': 'rgb(99, 54, 22)', - '--colors-brand-secondary-50': 'rgb(122, 65, 24)', - '--colors-brand-secondary-60': 'rgb(145, 77, 28)', - '--colors-brand-secondary-70': 'rgb(168, 88, 30)', - '--colors-brand-secondary-80': 'rgb(194, 106, 43)', - '--colors-brand-secondary-90': 'rgb(227, 129, 59)', - '--colors-grey-10': 'rgb(21, 25, 31)', - '--colors-grey-12': 'rgb(25, 29, 36)', - '--colors-grey-14': 'rgb(30, 35, 43)', - '--colors-grey-16': 'rgb(35, 41, 51)', - '--colors-grey-18': 'rgb(41, 47, 59)', - '--colors-grey-2': 'rgb(7, 8, 10)', - '--colors-grey-20': 'rgb(44, 51, 64)', - '--colors-grey-22': 'rgb(49, 57, 71)', - '--colors-grey-24': 'rgb(55, 63, 79)', - '--colors-grey-26': 'rgb(60, 70, 87)', - '--colors-grey-28': 'rgb(65, 76, 94)', - '--colors-grey-30': 'rgb(70, 82, 102)', - '--colors-grey-32': 'rgb(77, 89, 110)', - '--colors-grey-34': 'rgb(84, 97, 120)', - '--colors-grey-36': 'rgb(91, 105, 128)', - '--colors-grey-38': 'rgb(94, 108, 133)', - '--colors-grey-4': 'rgb(11, 12, 15)', - '--colors-grey-40': 'rgb(97, 111, 135)', - '--colors-grey-42': 'rgb(101, 115, 140)', - '--colors-grey-44': 'rgb(105, 120, 145)', - '--colors-grey-46': 'rgb(108, 123, 150)', - '--colors-grey-48': 'rgb(112, 128, 156)', - '--colors-grey-50': 'rgb(116, 132, 161)', - '--colors-grey-52': 'rgb(119, 136, 166)', - '--colors-grey-54': 'rgb(123, 141, 171)', - '--colors-grey-56': 'rgb(126, 144, 176)', - '--colors-grey-58': 'rgb(130, 149, 181)', - '--colors-grey-6': 'rgb(14, 16, 20)', - '--colors-grey-60': 'rgb(134, 153, 186)', - '--colors-grey-62': 'rgb(138, 157, 189)', - '--colors-grey-64': 'rgb(143, 162, 194)', - '--colors-grey-66': 'rgb(149, 167, 199)', - '--colors-grey-68': 'rgb(155, 173, 204)', - '--colors-grey-70': 'rgb(161, 179, 209)', - '--colors-grey-72': 'rgb(167, 184, 214)', - '--colors-grey-74': 'rgb(171, 189, 219)', - '--colors-grey-76': 'rgb(180, 196, 224)', - '--colors-grey-78': 'rgb(184, 201, 229)', - '--colors-grey-8': 'rgb(18, 20, 26)', - '--colors-grey-80': 'rgb(190, 205, 232)', - '--colors-grey-82': 'rgb(197, 211, 235)', - '--colors-grey-84': 'rgb(204, 216, 237)', - '--colors-grey-86': 'rgb(213, 224, 242)', - '--colors-grey-88': 'rgb(220, 229, 245)', - '--colors-grey-90': 'rgb(227, 234, 247)', - '--colors-grey-92': 'rgb(235, 240, 250)', - '--colors-grey-94': 'rgb(240, 244, 250)', - '--colors-grey-96': 'rgb(245, 248, 252)', - '--colors-grey-98': 'rgb(249, 250, 252)', - '--colors-grey-black': 'rgb(0, 0, 0)', - '--colors-grey-white': 'rgb(255, 255, 255)', - '--colors-grey-alpha-alpha-0': 'rgb(255, 255, 255, 0)', - '--colors-grey-alpha-grey-14-alpha-0': 'rgb(30, 35, 43, 0)', - '--colors-grey-alpha-grey-14-alpha-50': 'rgb(30, 35, 43, 0.5)', - '--colors-grey-alpha-grey-14-alpha-80': 'rgb(30, 35, 43, 0.8)', - '--colors-grey-alpha-grey-2-alpha-10': 'rgb(7, 8, 10, 0.1)', - '--colors-grey-alpha-grey-2-alpha-15': 'rgb(7, 8, 10, 0.15)', - '--colors-grey-alpha-grey-2-alpha-20': 'rgb(7, 8, 10, 0.2)', - '--colors-grey-alpha-grey-2-alpha-25': 'rgb(7, 8, 10, 0.25)', - '--colors-grey-alpha-grey-2-alpha-30': 'rgb(7, 8, 10, 0.3)', - '--colors-grey-alpha-grey-2-alpha-40': 'rgb(7, 8, 10, 0.4)', - '--colors-grey-alpha-grey-2-alpha-5': 'rgb(7, 8, 10, 0.05)', - '--colors-grey-alpha-grey-2-alpha-50': 'rgb(7, 8, 10, 0.5)', - '--colors-grey-alpha-grey-2-alpha-90': 'rgb(7, 8, 10, 0.9)', - '--colors-grey-alpha-grey-30-alpha-0': 'rgb(70, 82, 102, 0)', - '--colors-grey-alpha-grey-30-alpha-10': 'rgb(70, 82, 102, 0.1)', - '--colors-grey-alpha-grey-30-alpha-15': 'rgb(70, 82, 102, 0.15)', - '--colors-grey-alpha-grey-30-alpha-20': 'rgb(70, 82, 102, 0.2)', - '--colors-grey-alpha-grey-30-alpha-25': 'rgb(70, 82, 102, 0.25)', - '--colors-grey-alpha-grey-30-alpha-5': 'rgb(70, 82, 102, 0.05)', - '--colors-grey-alpha-grey-50-alpha-0': 'rgb(116, 132, 161, 0)', - '--colors-grey-alpha-grey-50-alpha-50': 'rgb(116, 132, 161, 0.5)', - '--colors-grey-alpha-grey-88-alpha-25': 'rgb(220, 229, 245, 0.25)', - '--colors-grey-alpha-grey-88-alpha-50': 'rgb(220, 229, 245, 0.5)', - '--colors-grey-alpha-grey-88-alpha-90': 'rgb(220, 229, 245, 0.9)', - '--colors-grey-alpha-white-alpha-0': 'rgb(255, 255, 255, 0)', - '--colors-grey-alpha-white-alpha-10': 'rgb(255, 255, 255, 0.1)', - '--colors-grey-alpha-white-alpha-30': 'rgb(255, 255, 255, 0.3)', - '--colors-grey-alpha-white-alpha-50': 'rgb(255, 255, 255, 0.5)', - '--colors-grey-alpha-white-alpha-80': 'rgb(255, 255, 255, 0.8)', - '--colors-shared-dark-orange-default': 'rgb(230, 93, 25)', - '--colors-shared-dark-orange-shade-10': 'rgb(173, 58, 0)', - '--colors-shared-dark-orange-shade-40': 'rgb(71, 24, 0)', - '--colors-shared-dark-orange-tint-30': 'rgb(237, 142, 94)', - '--colors-shared-dark-orange-tint-40': 'rgb(245, 190, 163)', - '--colors-shared-dark-orange-tint-60': 'rgb(252, 239, 232)', - '--colors-shared-green-default': 'rgb(0, 153, 92)', - '--colors-shared-green-shade-10': 'rgb(0, 128, 77)', - '--colors-shared-green-shade-40': 'rgb(0, 38, 23)', - '--colors-shared-green-tint-30': 'rgb(82, 204, 155)', - '--colors-shared-green-tint-40': 'rgb(138, 229, 193)', - '--colors-shared-green-tint-60': 'rgb(229, 255, 245)', - '--colors-shared-red-default': 'rgb(229, 64, 87)', - '--colors-shared-red-shade-10': 'rgb(204, 57, 77)', - '--colors-shared-red-shade-20': 'rgb(182, 47, 65)', - '--colors-shared-red-shade-40': 'rgb(63, 16, 22)', - '--colors-shared-red-tint-30': 'rgb(236, 116, 132)', - '--colors-shared-red-tint-40': 'rgb(245, 183, 191)', - '--colors-shared-red-tint-60': 'rgb(253, 237, 239)', - '--colors-shared-yellow-default': 'rgb(240, 183, 13)', - '--colors-shared-yellow-shade-30': 'rgb(143, 107, 0)', - '--colors-shared-yellow-shade-40': 'rgb(77, 57, 0)', - '--colors-shared-yellow-tint-30': 'rgb(254, 216, 102)', - '--colors-shared-yellow-tint-40': 'rgb(254, 235, 178)', - '--colors-shared-yellow-tint-60': 'rgb(255, 250, 235)', + '--colors-brand-primary-10': 'rgb(13 19 36)', + '--colors-brand-primary-100': 'rgb(130 162 250)', + '--colors-brand-primary-110': 'rgb(148 177 255)', + '--colors-brand-primary-120': 'rgb(170 193 255)', + '--colors-brand-primary-130': 'rgb(189 207 255)', + '--colors-brand-primary-140': 'rgb(204 218 255)', + '--colors-brand-primary-150': 'rgb(229 236 255)', + '--colors-brand-primary-160': 'rgb(242 247 255)', + '--colors-brand-primary-20': 'rgb(21 31 60)', + '--colors-brand-primary-30': 'rgb(29 43 80)', + '--colors-brand-primary-40': 'rgb(36 53 99)', + '--colors-brand-primary-50': 'rgb(44 65 122)', + '--colors-brand-primary-60': 'rgb(51 76 143)', + '--colors-brand-primary-70': 'rgb(64 94 178)', + '--colors-brand-primary-80': 'rgb(84 117 209)', + '--colors-brand-primary-90': 'rgb(111 144 235)', + '--colors-brand-secondary-10': 'rgb(41 23 10)', + '--colors-brand-secondary-100': 'rgb(250 158 92)', + '--colors-brand-secondary-110': 'rgb(250 174 120)', + '--colors-brand-secondary-120': 'rgb(252 189 144)', + '--colors-brand-secondary-130': 'rgb(255 215 186)', + '--colors-brand-secondary-140': 'rgb(255 225 204)', + '--colors-brand-secondary-150': 'rgb(255 241 232)', + '--colors-brand-secondary-160': 'rgb(255 252 250)', + '--colors-brand-secondary-20': 'rgb(61 33 13)', + '--colors-brand-secondary-30': 'rgb(79 43 17)', + '--colors-brand-secondary-40': 'rgb(99 54 22)', + '--colors-brand-secondary-50': 'rgb(122 65 24)', + '--colors-brand-secondary-60': 'rgb(145 77 28)', + '--colors-brand-secondary-70': 'rgb(168 88 30)', + '--colors-brand-secondary-80': 'rgb(194 106 43)', + '--colors-brand-secondary-90': 'rgb(227 129 59)', + '--colors-grey-10': 'rgb(22 22 23)', + '--colors-grey-12': 'rgb(25 25 26)', + '--colors-grey-14': 'rgb(27 27 28)', + '--colors-grey-16': 'rgb(30 30 31)', + '--colors-grey-18': 'rgb(32 32 33)', + '--colors-grey-2': 'rgb(5 5 5)', + '--colors-grey-20': 'rgb(36 35 35)', + '--colors-grey-22': 'rgb(37 37 38)', + '--colors-grey-24': 'rgb(40 40 41)', + '--colors-grey-26': 'rgb(42 42 43)', + '--colors-grey-28': 'rgb(45 45 46)', + '--colors-grey-30': 'rgb(47 47 48)', + '--colors-grey-32': 'rgb(49 50 51)', + '--colors-grey-34': 'rgb(52 53 54)', + '--colors-grey-36': 'rgb(54 55 56)', + '--colors-grey-38': 'rgb(57 58 59)', + '--colors-grey-4': 'rgb(13 13 13)', + '--colors-grey-40': 'rgb(59 60 61)', + '--colors-grey-42': 'rgb(62 63 64)', + '--colors-grey-44': 'rgb(64 65 66)', + '--colors-grey-46': 'rgb(67 68 69)', + '--colors-grey-48': 'rgb(69 70 71)', + '--colors-grey-50': 'rgb(188 190 194)', + '--colors-grey-52': 'rgb(190 192 196)', + '--colors-grey-54': 'rgb(193 195 199)', + '--colors-grey-56': 'rgb(195 197 201)', + '--colors-grey-58': 'rgb(198 200 204)', + '--colors-grey-6': 'rgb(17 18 18)', + '--colors-grey-60': 'rgb(200 202 207)', + '--colors-grey-62': 'rgb(203 205 209)', + '--colors-grey-64': 'rgb(205 207 212)', + '--colors-grey-66': 'rgb(208 210 214)', + '--colors-grey-68': 'rgb(210 212 217)', + '--colors-grey-70': 'rgb(213 215 219)', + '--colors-grey-72': 'rgb(215 217 222)', + '--colors-grey-74': 'rgb(218 220 224)', + '--colors-grey-76': 'rgb(220 222 227)', + '--colors-grey-78': 'rgb(223 225 229)', + '--colors-grey-8': 'rgb(19 20 20)', + '--colors-grey-80': 'rgb(225 227 232)', + '--colors-grey-82': 'rgb(228 230 235)', + '--colors-grey-84': 'rgb(230 232 237)', + '--colors-grey-86': 'rgb(233 235 240)', + '--colors-grey-88': 'rgb(235 237 242)', + '--colors-grey-90': 'rgb(237 239 245)', + '--colors-grey-92': 'rgb(240 242 247)', + '--colors-grey-94': 'rgb(242 244 250)', + '--colors-grey-96': 'rgb(247 248 252)', + '--colors-grey-98': 'rgb(250 251 252)', + '--colors-grey-black': 'rgb(0 0 0)', + '--colors-grey-white': 'rgb(255 255 255)', + '--colors-grey-alpha-0': 'rgb(255 255 255 / 0)', + '--colors-grey-alpha-black-18': 'rgb(0 0 0 / 0.18)', + '--colors-grey-alpha-black-25': 'rgb(0 0 0 / 0.25)', + '--colors-grey-alpha-black-30': 'rgb(0 0 0 / 0.3)', + '--colors-grey-alpha-black-60': 'rgb(0 0 0 / 0.6)', + '--colors-grey-alpha-black-87': 'rgb(0 0 0 / 0.87)', + '--colors-grey-alpha-grey-14-0': 'rgb(30 35 43 / 0)', + '--colors-grey-alpha-grey-14-50': 'rgb(27 27 28 / 0.5)', + '--colors-grey-alpha-grey-14-80': 'rgb(27 27 28 / 0.8)', + '--colors-grey-alpha-grey-2-10': 'rgb(5 5 5 / 0.1)', + '--colors-grey-alpha-grey-2-15': 'rgb(5 5 5 / 0.15)', + '--colors-grey-alpha-grey-2-20': 'rgb(5 5 5 / 0.2)', + '--colors-grey-alpha-grey-2-25': 'rgb(5 5 5 / 0.25)', + '--colors-grey-alpha-grey-2-30': 'rgb(5 5 5 / 0.3)', + '--colors-grey-alpha-grey-2-40': 'rgb(5 5 5 / 0.4)', + '--colors-grey-alpha-grey-2-5': 'rgb(5 5 5 / 0.05)', + '--colors-grey-alpha-grey-2-50': 'rgb(5 5 5 / 0.5)', + '--colors-grey-alpha-grey-2-90': 'rgb(7 8 10 / 0.9)', + '--colors-grey-alpha-grey-30-0': 'rgb(47 47 48 / 0)', + '--colors-grey-alpha-grey-30-10': 'rgb(47 47 48 / 0.1)', + '--colors-grey-alpha-grey-30-15': 'rgb(47 47 48 / 0.15)', + '--colors-grey-alpha-grey-30-20': 'rgb(47 47 48 / 0.2)', + '--colors-grey-alpha-grey-30-25': 'rgb(70 82 102 / 0.25)', + '--colors-grey-alpha-grey-30-5': 'rgb(47 47 48 / 0.05)', + '--colors-grey-alpha-grey-50-0': 'rgb(188 190 194 / 0)', + '--colors-grey-alpha-grey-50-50': 'rgb(188 190 194 / 0.5)', + '--colors-grey-alpha-grey-88-25': 'rgb(235 237 242 / 0.25)', + '--colors-grey-alpha-grey-88-50': 'rgb(235 237 242 / 0.5)', + '--colors-grey-alpha-grey-88-90': 'rgb(235 237 242 / 0.9)', + '--colors-grey-alpha-white-0': 'rgb(255 255 255 / 0)', + '--colors-grey-alpha-white-10': 'rgb(255 255 255 / 0.1)', + '--colors-grey-alpha-white-25': 'rgb(255 255 255 / 0.25)', + '--colors-grey-alpha-white-30': 'rgb(255 255 255 / 0.3)', + '--colors-grey-alpha-white-50': 'rgb(255 255 255 / 0.5)', + '--colors-grey-alpha-white-70': 'rgb(255 255 255 / 0.7)', + '--colors-grey-alpha-white-80': 'rgb(255 255 255 / 0.8)', + '--colors-shared-dark-orange-default': 'rgb(230 100 25)', + '--colors-shared-dark-orange-shade-10': 'rgb(173 64 0)', + '--colors-shared-dark-orange-shade-40': 'rgb(71 26 0)', + '--colors-shared-dark-orange-tint-30': 'rgb(237 146 94)', + '--colors-shared-dark-orange-tint-40': 'rgb(245 193 163)', + '--colors-shared-dark-orange-tint-60': 'rgb(252 239 232)', + '--colors-shared-green-default': 'rgb(0 153 99)', + '--colors-shared-green-shade-10': 'rgb(0 128 83)', + '--colors-shared-green-shade-40': 'rgb(0 38 25)', + '--colors-shared-green-tint-30': 'rgb(82 204 161)', + '--colors-shared-green-tint-40': 'rgb(138 229 197)', + '--colors-shared-green-tint-60': 'rgb(229 255 245)', + '--colors-shared-red-default': 'rgb(229 64 81)', + '--colors-shared-red-shade-10': 'rgb(204 57 72)', + '--colors-shared-red-shade-20': 'rgb(182 47 61)', + '--colors-shared-red-shade-40': 'rgb(63 16 21)', + '--colors-shared-red-tint-30': 'rgb(236 116 128)', + '--colors-shared-red-tint-40': 'rgb(245 183 189)', + '--colors-shared-red-tint-60': 'rgb(253 237 239)', + '--colors-shared-yellow-default': 'rgb(240 191 13)', + '--colors-shared-yellow-shade-30': 'rgb(143 112 0)', + '--colors-shared-yellow-shade-40': 'rgb(77 60 0)', + '--colors-shared-yellow-tint-30': 'rgb(254 221 102)', + '--colors-shared-yellow-tint-40': 'rgb(254 238 178)', + '--colors-shared-yellow-tint-60': 'rgb(255 251 235)', '--number-values-0': '0px', '--number-values-1': '1px', '--number-values-2': '2px', @@ -192,7 +199,7 @@ export const themes = { '--color-brand-background-compound-pressed': '--colors-brand-primary-70', '--color-brand-background-compound-rest': '--colors-brand-primary-110', '--color-brand-background-glow-a': '--colors-brand-primary-130', - '--color-brand-background-glow-b': '--colors-grey-alpha-alpha-0', + '--color-brand-background-glow-b': '--colors-grey-alpha-0', '--color-brand-background-inverted-hover': '--colors-brand-primary-160', '--color-brand-background-inverted-pressed': '--colors-brand-primary-140', '--color-brand-background-inverted-rest': '--colors-grey-white', @@ -266,45 +273,45 @@ export const themes = { '--color-neutral-background-5a-selected': '--colors-grey-80', '--color-neutral-background-6-rest': '--colors-grey-90', '--color-neutral-background-6a-rest': '--colors-grey-82', - '--color-neutral-background-alpha-1-rest': '--colors-grey-alpha-grey-88-alpha-90', - '--color-neutral-background-alpha-2-rest': '--colors-grey-alpha-grey-88-alpha-50', - '--color-neutral-background-alpha-3-rest': '--colors-grey-alpha-grey-88-alpha-25', - '--color-neutral-background-alpha-4-rest': '--colors-grey-alpha-white-alpha-30', - '--color-neutral-background-canvas-rest': '--colors-grey-92', + '--color-neutral-background-alpha-1-rest': '--colors-grey-alpha-grey-88-90', + '--color-neutral-background-alpha-2-rest': '--colors-grey-alpha-grey-88-50', + '--color-neutral-background-alpha-3-rest': '--colors-grey-alpha-grey-88-25', + '--color-neutral-background-alpha-4-rest': '--colors-grey-alpha-white-30', + '--color-neutral-background-canvas-rest': '--colors-grey-96', '--color-neutral-background-disabled-rest': '--colors-grey-88', '--color-neutral-background-gradient-color-a': '--colors-grey-90', '--color-neutral-background-gradient-color-b': '--colors-grey-96', '--color-neutral-background-inverted-rest': '--colors-grey-14', - '--color-neutral-background-inverted-disabled-rest': '--colors-grey-alpha-white-alpha-10', - '--color-neutral-background-overlay-rest': '--colors-grey-alpha-white-alpha-50', - '--color-neutral-background-scrollbar-overlay-rest': '--colors-grey-alpha-grey-88-alpha-50', + '--color-neutral-background-inverted-disabled-rest': '--colors-grey-alpha-white-10', + '--color-neutral-background-overlay-rest': '--colors-grey-alpha-white-50', + '--color-neutral-background-scrollbar-overlay-rest': '--colors-grey-alpha-grey-88-50', '--color-neutral-background-static-dark-rest': '--colors-grey-10', '--color-neutral-background-static-light-rest': '--colors-grey-white', '--color-neutral-background-stencil-1-rest': '--colors-grey-92', '--color-neutral-background-stencil-2-rest': '--colors-grey-96', - '--color-neutral-background-stencil-3-rest': '--colors-grey-alpha-grey-88-alpha-50', + '--color-neutral-background-stencil-3-rest': '--colors-grey-alpha-grey-88-50', '--color-neutral-background-subtle-hover': '--colors-grey-94', '--color-neutral-background-subtle-pressed': '--colors-grey-88', - '--color-neutral-background-subtle-rest': '--colors-grey-alpha-alpha-0', + '--color-neutral-background-subtle-rest': '--colors-grey-alpha-0', '--color-neutral-background-subtle-selected': '--colors-grey-90', - '--color-neutral-background-subtle-inverted-hover': '--colors-grey-alpha-grey-2-alpha-10', - '--color-neutral-background-subtle-inverted-pressed': '--colors-grey-alpha-grey-2-alpha-30', - '--color-neutral-background-subtle-inverted-rest': '--colors-grey-alpha-alpha-0', - '--color-neutral-background-subtle-inverted-selected': '--colors-grey-alpha-grey-2-alpha-20', - '--color-neutral-background-subtle-light-alpha-hover': '--colors-grey-alpha-white-alpha-80', - '--color-neutral-background-subtle-light-alpha-pressed': '--colors-grey-alpha-white-alpha-50', - '--color-neutral-background-subtle-light-alpha-selected': '--colors-grey-alpha-alpha-0', - '--color-neutral-background-transparent-hover': '--colors-grey-alpha-alpha-0', - '--color-neutral-background-transparent-pressed': '--colors-grey-alpha-alpha-0', - '--color-neutral-background-transparent-rest': '--colors-grey-alpha-alpha-0', - '--color-neutral-background-transparent-selected': '--colors-grey-alpha-alpha-0', + '--color-neutral-background-subtle-inverted-hover': '--colors-grey-alpha-grey-2-10', + '--color-neutral-background-subtle-inverted-pressed': '--colors-grey-alpha-grey-2-30', + '--color-neutral-background-subtle-inverted-rest': '--colors-grey-alpha-0', + '--color-neutral-background-subtle-inverted-selected': '--colors-grey-alpha-grey-2-20', + '--color-neutral-background-subtle-light-alpha-hover': '--colors-grey-alpha-white-80', + '--color-neutral-background-subtle-light-alpha-pressed': '--colors-grey-alpha-white-50', + '--color-neutral-background-subtle-light-alpha-selected': '--colors-grey-alpha-0', + '--color-neutral-background-transparent-hover': '--colors-grey-alpha-0', + '--color-neutral-background-transparent-pressed': '--colors-grey-alpha-0', + '--color-neutral-background-transparent-rest': '--colors-grey-alpha-0', + '--color-neutral-background-transparent-selected': '--colors-grey-alpha-0', '--color-neutral-foreground-1-hover': '--colors-grey-14', '--color-neutral-foreground-1-pressed': '--colors-grey-14', - '--color-neutral-foreground-1-rest': '--colors-grey-14', + '--color-neutral-foreground-1-rest': '--colors-grey-alpha-black-87', '--color-neutral-foreground-1-selected': '--colors-grey-14', '--color-neutral-foreground-2-hover': '--colors-grey-14', '--color-neutral-foreground-2-pressed': '--colors-grey-14', - '--color-neutral-foreground-2-rest': '--colors-grey-26', + '--color-neutral-foreground-2-rest': '--colors-grey-alpha-black-60', '--color-neutral-foreground-2-selected': '--colors-grey-14', '--color-neutral-foreground-2-brand-hover': '--colors-brand-primary-90', '--color-neutral-foreground-2-brand-pressed': '--colors-brand-primary-80', @@ -315,19 +322,19 @@ export const themes = { '--color-neutral-foreground-2-link-selected': '--colors-grey-14', '--color-neutral-foreground-3-hover': '--colors-grey-26', '--color-neutral-foreground-3-pressed': '--colors-grey-26', - '--color-neutral-foreground-3-rest': '--colors-grey-38', + '--color-neutral-foreground-3-rest': '--colors-grey-alpha-black-30', '--color-neutral-foreground-3-selected': '--colors-grey-26', '--color-neutral-foreground-3-brand-hover': '--colors-brand-primary-80', '--color-neutral-foreground-3-brand-pressed': '--colors-brand-primary-70', '--color-neutral-foreground-3-brand-selected': '--colors-brand-primary-80', - '--color-neutral-foreground-4-rest': '--colors-grey-46', - '--color-neutral-foreground-disabled-rest': '--colors-grey-74', + '--color-neutral-foreground-4-rest': '--colors-grey-alpha-black-18', + '--color-neutral-foreground-disabled-rest': '--colors-grey-alpha-black-25', '--color-neutral-foreground-inverted-1-hover': '--colors-grey-white', '--color-neutral-foreground-inverted-1-pressed': '--colors-grey-white', '--color-neutral-foreground-inverted-1-rest': '--colors-grey-white', '--color-neutral-foreground-inverted-1-selected': '--colors-grey-white', '--color-neutral-foreground-inverted-2-rest': '--colors-grey-white', - '--color-neutral-foreground-inverted-disabled-rest': '--colors-grey-alpha-white-alpha-50', + '--color-neutral-foreground-inverted-disabled-rest': '--colors-grey-alpha-white-50', '--color-neutral-foreground-inverted-link-hover': '--colors-grey-white', '--color-neutral-foreground-inverted-link-pressed': '--colors-grey-white', '--color-neutral-foreground-inverted-link-rest': '--colors-grey-white', @@ -345,22 +352,22 @@ export const themes = { '--color-neutral-stroke-accessible-pressed': '--colors-grey-32', '--color-neutral-stroke-accessible-rest': '--colors-grey-40', '--color-neutral-stroke-accessible-selected': '--colors-brand-primary-130', - '--color-neutral-stroke-alpha-rest': '--colors-grey-alpha-grey-2-alpha-5', + '--color-neutral-stroke-alpha-rest': '--colors-grey-alpha-grey-2-5', '--color-neutral-stroke-disabled-rest': '--colors-grey-88', - '--color-neutral-stroke-disabled-inverted-rest': '--colors-grey-alpha-white-alpha-50', + '--color-neutral-stroke-disabled-inverted-rest': '--colors-grey-alpha-white-50', '--color-neutral-stroke-focus-1-rest': '--colors-grey-white', '--color-neutral-stroke-focus-2-rest': '--colors-grey-black', '--color-neutral-stroke-gradient-color-a': '--colors-grey-white', - '--color-neutral-stroke-gradient-color-b': '--colors-grey-alpha-alpha-0', + '--color-neutral-stroke-gradient-color-b': '--colors-grey-alpha-0', '--color-neutral-stroke-on-brand-1-rest': '--colors-grey-white', '--color-neutral-stroke-on-brand-2-hover': '--colors-grey-white', '--color-neutral-stroke-on-brand-2-pressed': '--colors-grey-white', '--color-neutral-stroke-on-brand-2-rest': '--colors-grey-white', '--color-neutral-stroke-on-brand-2-selected': '--colors-grey-white', '--color-neutral-stroke-subtle-rest': '--colors-grey-94', - '--color-neutral-stroke-transparent-rest': '--colors-grey-alpha-alpha-0', - '--color-neutral-stroke-transparent-disabled-rest': '--colors-grey-alpha-alpha-0', - '--color-neutral-stroke-transparent-interactive-rest': '--colors-grey-alpha-alpha-0', + '--color-neutral-stroke-transparent-rest': '--colors-grey-alpha-0', + '--color-neutral-stroke-transparent-disabled-rest': '--colors-grey-alpha-0', + '--color-neutral-stroke-transparent-interactive-rest': '--colors-grey-alpha-0', '--color-status-danger-background-1-rest': '--colors-shared-red-tint-60', '--color-status-danger-background-3-hover': '--colors-shared-red-shade-10', '--color-status-danger-background-3-pressed': '--colors-shared-red-shade-20', @@ -383,7 +390,7 @@ export const themes = { '--color-status-success-background-3-rest': '--colors-shared-green-default', '--color-status-success-foreground-1-rest': '--colors-shared-green-shade-10', '--color-status-success-foreground-3-rest': '--colors-shared-green-default', - '--color-status-success-stroke-1-rest': '--colors-shared-green-tint-40', + '--color-status-success-stroke-1-rest': '--colors-shared-green-tint-30', '--color-status-success-stroke-2-rest': '--colors-shared-green-default', '--color-status-warning-background-1-rest': '--colors-shared-yellow-tint-60', '--color-status-warning-background-3-rest': '--colors-shared-yellow-default', @@ -391,14 +398,14 @@ export const themes = { '--color-status-warning-foreground-2-rest': '--colors-shared-yellow-shade-30', '--color-status-warning-stroke-1-rest': '--colors-shared-yellow-tint-40', '--color-status-warning-stroke-2-rest': '--colors-shared-yellow-default', - '--shadow-ambient': '--colors-grey-alpha-grey-30-alpha-15', + '--shadow-ambient': '--colors-grey-alpha-grey-30-15', '--shadow-ambient-brand': '--colors-brand-primary-80', - '--shadow-ambient-darker': '--colors-grey-alpha-grey-30-alpha-20', - '--shadow-ambient-lighter': '--colors-grey-alpha-grey-30-alpha-5', - '--shadow-key': '--colors-grey-alpha-grey-30-alpha-15', + '--shadow-ambient-darker': '--colors-grey-alpha-grey-30-20', + '--shadow-ambient-lighter': '--colors-grey-alpha-grey-30-5', + '--shadow-key': '--colors-grey-alpha-grey-30-15', '--shadow-key-brand': '--colors-brand-primary-80', - '--shadow-key-darker': '--colors-grey-alpha-grey-30-alpha-25', - '--shadow-key-lighter': '--colors-grey-alpha-grey-30-alpha-10', + '--shadow-key-darker': '--colors-grey-alpha-grey-30-25', + '--shadow-key-lighter': '--colors-grey-alpha-grey-30-10', '--border-radius-none': '--number-values-0', '--border-radius-xxs-nudge': '--number-values-1', '--border-radius-xxs': '--number-values-2', @@ -497,7 +504,7 @@ export const themes = { '--color-brand-background-compound-pressed': '--colors-brand-primary-80', '--color-brand-background-compound-rest': '--colors-brand-primary-120', '--color-brand-background-glow-a': '--colors-brand-primary-40', - '--color-brand-background-glow-b': '--colors-grey-alpha-grey-14-alpha-0', + '--color-brand-background-glow-b': '--colors-grey-alpha-grey-14-0', '--color-brand-background-inverted-hover': '--colors-brand-primary-160', '--color-brand-background-inverted-pressed': '--colors-brand-primary-140', '--color-brand-background-inverted-rest': '--colors-grey-white', @@ -571,45 +578,45 @@ export const themes = { '--color-neutral-background-5a-selected': '--colors-grey-30', '--color-neutral-background-6-rest': '--colors-grey-20', '--color-neutral-background-6a-rest': '--colors-grey-36', - '--color-neutral-background-alpha-1-rest': '--colors-grey-alpha-grey-2-alpha-90', - '--color-neutral-background-alpha-2-rest': '--colors-grey-alpha-grey-2-alpha-50', - '--color-neutral-background-alpha-3-rest': '--colors-grey-alpha-grey-2-alpha-25', - '--color-neutral-background-alpha-4-rest': '--colors-grey-alpha-grey-30-alpha-5', - '--color-neutral-background-canvas-rest': '--colors-grey-4', + '--color-neutral-background-alpha-1-rest': '--colors-grey-alpha-grey-2-90', + '--color-neutral-background-alpha-2-rest': '--colors-grey-alpha-grey-2-50', + '--color-neutral-background-alpha-3-rest': '--colors-grey-alpha-grey-2-25', + '--color-neutral-background-alpha-4-rest': '--colors-grey-alpha-grey-30-5', + '--color-neutral-background-canvas-rest': '--colors-grey-2', '--color-neutral-background-disabled-rest': '--colors-grey-12', '--color-neutral-background-gradient-color-a': '--colors-grey-2', '--color-neutral-background-gradient-color-b': '--colors-grey-6', '--color-neutral-background-inverted-rest': '--colors-grey-white', - '--color-neutral-background-inverted-disabled-rest': '--colors-grey-alpha-white-alpha-10', - '--color-neutral-background-overlay-rest': '--colors-grey-alpha-grey-2-alpha-50', - '--color-neutral-background-scrollbar-overlay-rest': '--colors-grey-alpha-grey-50-alpha-50', + '--color-neutral-background-inverted-disabled-rest': '--colors-grey-alpha-white-10', + '--color-neutral-background-overlay-rest': '--colors-grey-alpha-grey-2-50', + '--color-neutral-background-scrollbar-overlay-rest': '--colors-grey-alpha-grey-50-50', '--color-neutral-background-static-dark-rest': '--colors-grey-10', '--color-neutral-background-static-light-rest': '--colors-grey-white', '--color-neutral-background-stencil-1-rest': '--colors-grey-18', '--color-neutral-background-stencil-2-rest': '--colors-grey-14', - '--color-neutral-background-stencil-3-rest': '--colors-grey-alpha-grey-30-alpha-10', + '--color-neutral-background-stencil-3-rest': '--colors-grey-alpha-grey-30-10', '--color-neutral-background-subtle-hover': '--colors-grey-16', '--color-neutral-background-subtle-pressed': '--colors-grey-14', - '--color-neutral-background-subtle-rest': '--colors-grey-alpha-alpha-0', + '--color-neutral-background-subtle-rest': '--colors-grey-alpha-0', '--color-neutral-background-subtle-selected': '--colors-grey-12', - '--color-neutral-background-subtle-inverted-hover': '--colors-grey-alpha-grey-2-alpha-10', - '--color-neutral-background-subtle-inverted-pressed': '--colors-grey-alpha-grey-2-alpha-30', - '--color-neutral-background-subtle-inverted-rest': '--colors-grey-alpha-alpha-0', - '--color-neutral-background-subtle-inverted-selected': '--colors-grey-alpha-grey-2-alpha-20', - '--color-neutral-background-subtle-light-alpha-hover': '--colors-grey-alpha-grey-14-alpha-80', - '--color-neutral-background-subtle-light-alpha-pressed': '--colors-grey-alpha-grey-14-alpha-50', - '--color-neutral-background-subtle-light-alpha-selected': '--colors-grey-alpha-alpha-0', - '--color-neutral-background-transparent-hover': '--colors-grey-alpha-alpha-0', - '--color-neutral-background-transparent-pressed': '--colors-grey-alpha-alpha-0', - '--color-neutral-background-transparent-rest': '--colors-grey-alpha-alpha-0', - '--color-neutral-background-transparent-selected': '--colors-grey-alpha-alpha-0', + '--color-neutral-background-subtle-inverted-hover': '--colors-grey-alpha-grey-2-10', + '--color-neutral-background-subtle-inverted-pressed': '--colors-grey-alpha-grey-2-30', + '--color-neutral-background-subtle-inverted-rest': '--colors-grey-alpha-0', + '--color-neutral-background-subtle-inverted-selected': '--colors-grey-alpha-grey-2-20', + '--color-neutral-background-subtle-light-alpha-hover': '--colors-grey-alpha-grey-14-80', + '--color-neutral-background-subtle-light-alpha-pressed': '--colors-grey-alpha-grey-14-50', + '--color-neutral-background-subtle-light-alpha-selected': '--colors-grey-alpha-0', + '--color-neutral-background-transparent-hover': '--colors-grey-alpha-0', + '--color-neutral-background-transparent-pressed': '--colors-grey-alpha-0', + '--color-neutral-background-transparent-rest': '--colors-grey-alpha-0', + '--color-neutral-background-transparent-selected': '--colors-grey-alpha-0', '--color-neutral-foreground-1-hover': '--colors-grey-white', '--color-neutral-foreground-1-pressed': '--colors-grey-white', '--color-neutral-foreground-1-rest': '--colors-grey-white', '--color-neutral-foreground-1-selected': '--colors-grey-white', '--color-neutral-foreground-2-hover': '--colors-grey-white', '--color-neutral-foreground-2-pressed': '--colors-grey-white', - '--color-neutral-foreground-2-rest': '--colors-grey-84', + '--color-neutral-foreground-2-rest': '--colors-grey-alpha-white-70', '--color-neutral-foreground-2-selected': '--colors-grey-white', '--color-neutral-foreground-2-brand-hover': '--colors-brand-primary-140', '--color-neutral-foreground-2-brand-pressed': '--colors-brand-primary-130', @@ -620,7 +627,7 @@ export const themes = { '--color-neutral-foreground-2-link-selected': '--colors-grey-white', '--color-neutral-foreground-3-hover': '--colors-grey-84', '--color-neutral-foreground-3-pressed': '--colors-grey-84', - '--color-neutral-foreground-3-rest': '--colors-grey-68', + '--color-neutral-foreground-3-rest': '--colors-grey-alpha-white-50', '--color-neutral-foreground-3-selected': '--colors-grey-84', '--color-neutral-foreground-3-brand-hover': '--colors-brand-primary-100', '--color-neutral-foreground-3-brand-pressed': '--colors-brand-primary-90', @@ -632,7 +639,7 @@ export const themes = { '--color-neutral-foreground-inverted-1-rest': '--colors-grey-14', '--color-neutral-foreground-inverted-1-selected': '--colors-grey-14', '--color-neutral-foreground-inverted-2-rest': '--colors-grey-20', - '--color-neutral-foreground-inverted-disabled-rest': '--colors-grey-alpha-white-alpha-50', + '--color-neutral-foreground-inverted-disabled-rest': '--colors-grey-alpha-white-50', '--color-neutral-foreground-inverted-link-hover': '--colors-grey-white', '--color-neutral-foreground-inverted-link-pressed': '--colors-grey-white', '--color-neutral-foreground-inverted-link-rest': '--colors-grey-white', @@ -650,22 +657,22 @@ export const themes = { '--color-neutral-stroke-accessible-pressed': '--colors-grey-70', '--color-neutral-stroke-accessible-rest': '--colors-grey-68', '--color-neutral-stroke-accessible-selected': '--colors-brand-primary-140', - '--color-neutral-stroke-alpha-rest': '--colors-grey-alpha-white-alpha-10', + '--color-neutral-stroke-alpha-rest': '--colors-grey-alpha-white-10', '--color-neutral-stroke-disabled-rest': '--colors-grey-26', - '--color-neutral-stroke-disabled-inverted-rest': '--colors-grey-alpha-white-alpha-50', + '--color-neutral-stroke-disabled-inverted-rest': '--colors-grey-alpha-white-50', '--color-neutral-stroke-focus-1-rest': '--colors-grey-black', '--color-neutral-stroke-focus-2-rest': '--colors-grey-white', '--color-neutral-stroke-gradient-color-a': '--colors-grey-16', - '--color-neutral-stroke-gradient-color-b': '--colors-grey-alpha-alpha-0', + '--color-neutral-stroke-gradient-color-b': '--colors-grey-alpha-0', '--color-neutral-stroke-on-brand-1-rest': '--colors-grey-16', '--color-neutral-stroke-on-brand-2-hover': '--colors-grey-white', '--color-neutral-stroke-on-brand-2-pressed': '--colors-grey-white', '--color-neutral-stroke-on-brand-2-rest': '--colors-grey-white', '--color-neutral-stroke-on-brand-2-selected': '--colors-grey-white', '--color-neutral-stroke-subtle-rest': '--colors-grey-16', - '--color-neutral-stroke-transparent-rest': '--colors-grey-alpha-alpha-0', - '--color-neutral-stroke-transparent-disabled-rest': '--colors-grey-alpha-alpha-0', - '--color-neutral-stroke-transparent-interactive-rest': '--colors-grey-alpha-alpha-0', + '--color-neutral-stroke-transparent-rest': '--colors-grey-alpha-0', + '--color-neutral-stroke-transparent-disabled-rest': '--colors-grey-alpha-0', + '--color-neutral-stroke-transparent-interactive-rest': '--colors-grey-alpha-0', '--color-status-danger-background-1-rest': '--colors-shared-red-shade-40', '--color-status-danger-background-3-hover': '--colors-shared-red-shade-10', '--color-status-danger-background-3-pressed': '--colors-shared-red-shade-20', @@ -688,7 +695,7 @@ export const themes = { '--color-status-success-background-3-rest': '--colors-shared-green-default', '--color-status-success-foreground-1-rest': '--colors-shared-green-tint-30', '--color-status-success-foreground-3-rest': '--colors-shared-green-tint-40', - '--color-status-success-stroke-1-rest': '--colors-shared-green-default', + '--color-status-success-stroke-1-rest': '--colors-shared-green-tint-30', '--color-status-success-stroke-2-rest': '--colors-shared-green-tint-40', '--color-status-warning-background-1-rest': '--colors-shared-yellow-shade-40', '--color-status-warning-background-3-rest': '--colors-shared-yellow-default', @@ -696,14 +703,14 @@ export const themes = { '--color-status-warning-foreground-2-rest': '--colors-shared-yellow-tint-40', '--color-status-warning-stroke-1-rest': '--colors-shared-yellow-default', '--color-status-warning-stroke-2-rest': '--colors-shared-yellow-tint-40', - '--shadow-ambient': '--colors-grey-alpha-grey-2-alpha-30', + '--shadow-ambient': '--colors-grey-alpha-grey-2-30', '--shadow-ambient-brand': '--colors-brand-primary-80', - '--shadow-ambient-darker': '--colors-grey-alpha-grey-2-alpha-40', - '--shadow-ambient-lighter': '--colors-grey-alpha-grey-2-alpha-15', - '--shadow-key': '--colors-grey-alpha-grey-2-alpha-30', + '--shadow-ambient-darker': '--colors-grey-alpha-grey-2-40', + '--shadow-ambient-lighter': '--colors-grey-alpha-grey-2-15', + '--shadow-key': '--colors-grey-alpha-grey-2-30', '--shadow-key-brand': '--colors-brand-primary-80', - '--shadow-key-darker': '--colors-grey-alpha-grey-2-alpha-50', - '--shadow-key-lighter': '--colors-grey-alpha-grey-2-alpha-15', + '--shadow-key-darker': '--colors-grey-alpha-grey-2-50', + '--shadow-key-lighter': '--colors-grey-alpha-grey-2-15', '--border-radius-none': '--number-values-0', '--border-radius-xxs-nudge': '--number-values-1', '--border-radius-xxs': '--number-values-2', @@ -789,358 +796,194 @@ export const themes = { } as const satisfies Record>; export const typography = { - web: { - caption2: css` - font-size: 11px; - font-family: Inter, sans-serif; - line-height: 16px; /* 145.455% */ - font-weight: 400; - font-style: normal; - letter-spacing: 0.25px; + caption2: css` + font-size: 11px; + font-family: "Innovator Grotesk", sans-serif; + line-height: 16px; /* 145.455% */ + font-weight: 400; + font-style: normal; + letter-spacing: 0.24px; - font-variant-numeric: lining-nums tabular-nums; - font-feature-settings: 'cv01' on; - `, - caption2Strong: css` - font-size: 11px; - font-family: Inter, sans-serif; - line-height: 16px; /* 145.455% */ - font-weight: 500; - font-style: normal; - letter-spacing: 0.25px; - - font-variant-numeric: lining-nums tabular-nums; - font-feature-settings: 'cv01' on; - `, - caption1: css` - font-size: 13px; - font-family: Inter, sans-serif; - line-height: 18px; /* 138.462% */ - font-weight: 400; - font-style: normal; - letter-spacing: 0.15px; - - font-variant-numeric: lining-nums tabular-nums; - font-feature-settings: 'cv01' on; - `, - caption1Strong: css` - font-size: 13px; - font-family: Inter, sans-serif; - line-height: 18px; /* 138.462% */ - font-weight: 600; - font-style: normal; - letter-spacing: 0.15px; - - font-variant-numeric: lining-nums tabular-nums; - font-feature-settings: 'cv01' on; - `, - caption1Stronger: css` - font-size: 13px; - font-family: Inter, sans-serif; - line-height: 18px; /* 138.462% */ - font-weight: 700; - font-style: normal; - letter-spacing: 0.15px; - - font-variant-numeric: lining-nums tabular-nums; - font-feature-settings: 'cv01' on; - `, - body1: css` - font-size: 14px; - font-family: Inter, sans-serif; - line-height: 20px; /* 142.857% */ - font-weight: 400; - font-style: normal; - letter-spacing: 0; - - font-variant-numeric: lining-nums tabular-nums; - font-feature-settings: 'cv01' on; - `, - body1Strong: css` - font-size: 14px; - font-family: Inter, sans-serif; - line-height: 20px; /* 142.857% */ - font-weight: 500; - font-style: normal; - letter-spacing: 0; - - font-variant-numeric: lining-nums tabular-nums; - font-feature-settings: 'cv01' on; - `, - body1Stronger: css` - font-size: 14px; - font-family: Inter, sans-serif; - line-height: 20px; /* 142.857% */ - font-weight: 700; - font-style: normal; - letter-spacing: 0; - - font-variant-numeric: lining-nums tabular-nums; - font-feature-settings: 'cv01' on; - `, - body2: css` - font-size: 16px; - font-family: Inter, sans-serif; - line-height: 24px; /* 150% */ - font-weight: 400; - font-style: normal; - letter-spacing: -0.15px; - - font-variant-numeric: lining-nums tabular-nums; - font-feature-settings: 'cv01' on; - `, + font-variant-numeric: lining-nums tabular-nums slashed-zero; + font-feature-settings: 'ss03' on; + `, + caption2Strong: css` + font-size: 11px; + font-family: "Innovator Grotesk", sans-serif; + line-height: 16px; /* 145.455% */ + font-weight: 500; + font-style: normal; + letter-spacing: 0.24px; - subtitle2: css` - font-size: 16px; - font-family: Inter, sans-serif; - line-height: 24px; /* 150% */ - font-weight: 500; - font-style: normal; - letter-spacing: -0.15px; + font-variant-numeric: lining-nums tabular-nums slashed-zero; + font-feature-settings: 'ss03' on; + `, + caption1: css` + font-size: 13px; + font-family: "Innovator Grotesk", sans-serif; + line-height: 18px; /* 138.462% */ + font-weight: 400; + font-style: normal; + letter-spacing: 0.2px; - font-variant-numeric: lining-nums tabular-nums; - font-feature-settings: 'cv01' on; - `, - subtitle2Stronger: css` - font-size: 16px; - font-family: Inter, sans-serif; - line-height: 24px; /* 150% */ - font-weight: 700; - font-style: normal; - letter-spacing: -0.15px; + font-variant-numeric: lining-nums tabular-nums slashed-zero; + font-feature-settings: 'ss03' on; + `, + caption1Strong: css` + font-size: 13px; + font-family: "Innovator Grotesk", sans-serif; + line-height: 18px; /* 138.462% */ + font-weight: 500; + font-style: normal; + letter-spacing: 0.2px; - font-variant-numeric: lining-nums tabular-nums; - font-feature-settings: 'cv01' on; - `, - subtitle1: css` - font-size: 20px; - font-family: Inter, sans-serif; - line-height: 25px; /* 125% */ - font-weight: 500; - font-style: normal; - letter-spacing: -0.25px; + font-variant-numeric: lining-nums tabular-nums slashed-zero; + font-feature-settings: 'ss03' on; + `, + caption1Stronger: css` + font-size: 13px; + font-family: "Innovator Grotesk", sans-serif; + line-height: 18px; /* 138.462% */ + font-weight: 600; + font-style: normal; + letter-spacing: 0.2px; - font-variant-numeric: lining-nums tabular-nums; - font-feature-settings: 'cv01' on; - `, - title3: css` - font-size: 24px; - font-family: Inter, sans-serif; - line-height: 30px; /* 125% */ - font-weight: 500; - font-style: normal; - letter-spacing: -0.15px; + font-variant-numeric: lining-nums tabular-nums slashed-zero; + font-feature-settings: 'ss03' on; + `, + body1: css` + font-size: 14px; + font-family: "Innovator Grotesk", sans-serif; + line-height: 20px; /* 142.857% */ + font-weight: 400; + font-style: normal; + letter-spacing: 0.16px; - font-variant-numeric: lining-nums tabular-nums; - font-feature-settings: 'cv01' on; - `, - title2: css` - font-size: 28px; - font-family: Inter, sans-serif; - line-height: 34px; /* 121.429% */ - font-weight: 600; - font-style: normal; - letter-spacing: 0.4px; + font-variant-numeric: lining-nums tabular-nums slashed-zero; + font-feature-settings: 'ss03' on; + `, + body1Strong: css` + font-size: 14px; + font-family: "Innovator Grotesk", sans-serif; + line-height: 20px; /* 142.857% */ + font-weight: 500; + font-style: normal; + letter-spacing: 0.16px; - font-variant-numeric: lining-nums tabular-nums; - font-feature-settings: 'cv01' on; - `, - title1: css` - font-size: 32px; - font-family: Inter, sans-serif; - line-height: 38px; /* 118.75% */ - font-weight: 600; - font-style: normal; - letter-spacing: 0.4px; + font-variant-numeric: lining-nums tabular-nums slashed-zero; + font-feature-settings: 'ss03' on; + `, + body1Stronger: css` + font-size: 14px; + font-family: "Innovator Grotesk", sans-serif; + line-height: 20px; /* 142.857% */ + font-weight: 600; + font-style: normal; + letter-spacing: 0.16px; - font-variant-numeric: lining-nums tabular-nums; - font-feature-settings: 'cv01' on; - `, - largeTitle: css` - font-size: 40px; - font-family: Inter, sans-serif; - line-height: 48px; /* 120% */ - font-weight: 600; - font-style: normal; - letter-spacing: 0.4px; + font-variant-numeric: lining-nums tabular-nums slashed-zero; + font-feature-settings: 'ss03' on; + `, + body2: css` + font-size: 16px; + font-family: "Innovator Grotesk", sans-serif; + line-height: 24px; /* 150% */ + font-weight: 400; + font-style: normal; - font-variant-numeric: lining-nums tabular-nums; - font-feature-settings: 'cv01' on; - `, - display: css` - font-size: 68px; - font-family: Inter, sans-serif; - line-height: 82px; /* 120.588% */ - font-weight: 600; - font-style: normal; - letter-spacing: 0.25px; + font-variant-numeric: lining-nums tabular-nums slashed-zero; + font-feature-settings: 'ss03' on; + `, + body2Strong: css` + font-size: 16px; + font-family: "Innovator Grotesk", sans-serif; + line-height: 24px; /* 150% */ + font-weight: 500; + font-style: normal; - font-variant-numeric: lining-nums tabular-nums; - font-feature-settings: 'cv01' on; - `, - }, - decorative: { - caption2: css` - font-size: 11px; - font-family: Borna, sans-serif; - line-height: 14px; /* 127.273% */ - font-weight: 400; - font-style: normal; - letter-spacing: 0.25px; - `, - caption2Strong: css` - font-size: 11px; - font-family: Borna, sans-serif; - line-height: 16px; /* 145.455% */ - font-weight: 500; - font-style: normal; - letter-spacing: 0.25px; - `, - caption1: css` - font-size: 13px; - font-family: Borna, sans-serif; - line-height: 18px; /* 138.462% */ - font-weight: 400; - font-style: normal; - letter-spacing: 0.25px; - `, - caption1Strong: css` - font-size: 13px; - font-family: Borna, sans-serif; - line-height: 18px; /* 138.462% */ - font-weight: 500; - font-style: normal; - letter-spacing: 0.25px; - `, - caption1Stronger: css` - font-size: 13px; - font-family: Borna, sans-serif; - line-height: 18px; /* 138.462% */ - font-weight: 400; - font-style: normal; - letter-spacing: 0.25px; - `, - body1: css` - font-size: 14px; - font-family: Borna, sans-serif; - line-height: 20px; /* 142.857% */ - font-weight: 400; - font-style: normal; - letter-spacing: 0.25px; - `, - body1Strong: css` - font-size: 14px; - font-family: Borna, sans-serif; - line-height: 20px; /* 142.857% */ - font-weight: 500; - font-style: normal; - letter-spacing: 0.25px; - `, - body1Stronger: css` - font-size: 14px; - font-family: Borna, sans-serif; - line-height: 20px; /* 142.857% */ - font-weight: 600; - font-style: normal; - letter-spacing: 0.25px; - `, - body2: css` - font-size: 16px; - font-family: Borna, sans-serif; - line-height: 22px; /* 137.5% */ - font-weight: 400; - font-style: normal; - letter-spacing: 0.25px; - `, - body2Strong: css` - font-size: 16px; - font-family: Borna, sans-serif; - line-height: 22px; /* 137.5% */ - font-weight: 500; - font-style: normal; - letter-spacing: 0.25px; - `, - subtitle2: css` - font-size: 16px; - font-family: Borna, sans-serif; - line-height: 20px; /* 125% */ - font-weight: 500; - font-style: normal; - letter-spacing: 0.25px; + font-variant-numeric: lining-nums tabular-nums slashed-zero; + font-feature-settings: 'ss03' on; + `, + subtitle2: css` + font-size: 16px; + font-family: "Innovator Grotesk", sans-serif; + line-height: 24px; /* 150% */ + font-weight: 500; + font-style: normal; - font-feature-settings: 'ss01' on; - `, - subtitle2Stronger: css` - font-size: 16px; - font-family: Borna, sans-serif; - line-height: 20px; /* 125% */ - font-weight: 600; - font-style: normal; - letter-spacing: 0.25px; + font-variant-numeric: lining-nums tabular-nums slashed-zero; + font-feature-settings: 'ss03' on; + `, + subtitle2Stronger: css` + font-size: 16px; + font-family: "Innovator Grotesk", sans-serif; + line-height: 24px; /* 150% */ + font-weight: 600; + font-style: normal; - font-feature-settings: 'ss01' on; - `, - subtitle1: css` - font-size: 20px; - font-family: Borna, sans-serif; - line-height: 24px; /* 120% */ - font-weight: 500; - font-style: normal; - letter-spacing: 0.15px; + font-variant-numeric: lining-nums tabular-nums slashed-zero; + font-feature-settings: 'ss03' on; + `, + subtitle1: css` + font-size: 20px; + font-family: "Innovator Grotesk", sans-serif; + line-height: 25px; /* 125% */ + font-weight: 500; + font-style: normal; - font-feature-settings: 'ss01' on; - `, - title3: css` - font-size: 24px; - font-family: Borna, sans-serif; - line-height: 30px; /* 125% */ - font-weight: 500; - font-style: normal; - letter-spacing: 0; + font-variant-numeric: lining-nums tabular-nums slashed-zero; + font-feature-settings: 'ss03' on; + `, + title3: css` + font-size: 24px; + font-family: "Innovator Grotesk", sans-serif; + line-height: 30px; /* 125% */ + font-weight: 500; + font-style: normal; - font-feature-settings: 'ss01' on; - `, - title2: css` - font-size: 28px; - font-family: Borna, sans-serif; - line-height: 34px; /* 121.429% */ - font-weight: 500; - font-style: normal; - letter-spacing: 0; + font-variant-numeric: lining-nums tabular-nums slashed-zero; + font-feature-settings: 'ss03' on; + `, + title2: css` + font-size: 28px; + font-family: "Innovator Grotesk", sans-serif; + line-height: 34px; /* 121.429% */ + font-weight: 500; + font-style: normal; - font-feature-settings: 'ss01' on; - `, - title1: css` - font-size: 32px; - font-family: Borna, sans-serif; - line-height: 38px; /* 118.75% */ - font-weight: 500; - font-style: normal; - letter-spacing: 0; + font-variant-numeric: lining-nums tabular-nums slashed-zero; + font-feature-settings: 'ss03' on; + `, + title1: css` + font-size: 32px; + font-family: "Innovator Grotesk", sans-serif; + line-height: 38px; /* 118.75% */ + font-weight: 500; + font-style: normal; - font-feature-settings: 'ss01' on; - `, - largeTitle: css` - font-size: 40px; - font-family: Borna, sans-serif; - line-height: 44px; /* 110% */ - font-weight: 500; - font-style: normal; - letter-spacing: 0; + font-variant-numeric: lining-nums tabular-nums slashed-zero; + font-feature-settings: 'ss03' on; + `, + largeTitle: css` + font-size: 40px; + font-family: "Innovator Grotesk", sans-serif; + line-height: 48px; /* 120% */ + font-weight: 500; + font-style: normal; - font-feature-settings: 'ss01' on; - `, - display: css` - font-size: 68px; - font-family: Borna, sans-serif; - line-height: 80px; /* 117.647% */ - font-weight: 500; - font-style: normal; - letter-spacing: 0; + font-variant-numeric: lining-nums tabular-nums slashed-zero; + font-feature-settings: 'ss03' on; + `, + display: css` + font-size: 68px; + font-family: "Innovator Grotesk", sans-serif; + line-height: 82px; /* 120.588% */ + font-weight: 500; + font-style: normal; - font-feature-settings: 'ss01' on; - `, - }, + font-variant-numeric: lining-nums tabular-nums slashed-zero; + font-feature-settings: 'ss03' on; + `, }; export const backgroundFilters = {