Skip to content

Commit 2c76696

Browse files
lisalupiphilibea
authored andcommitted
feat: vanilla extract on badge and actionBar (#5461)
* feat: vanilla extract on badge and actionBar * fix: create vanilla extract fadeIn animation
1 parent a4302c7 commit 2c76696

File tree

13 files changed

+18905
-521
lines changed

13 files changed

+18905
-521
lines changed

packages/plus/src/components/EstimateCost/__tests__/__snapshots__/Regular.test.tsx.snap

Lines changed: 7466 additions & 0 deletions
Large diffs are not rendered by default.

packages/plus/src/components/EstimateCost/__tests__/__snapshots__/index.test.tsx.snap

Lines changed: 7338 additions & 57 deletions
Large diffs are not rendered by default.

packages/plus/src/components/OfferList/__tests__/__snapshots__/index.test.tsx.snap

Lines changed: 519 additions & 1 deletion
Large diffs are not rendered by default.

packages/plus/src/components/Plans/__tests__/__snapshots__/index.test.tsx.snap

Lines changed: 1989 additions & 105 deletions
Large diffs are not rendered by default.

packages/ui/src/components/ActionBar/index.tsx

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
11
'use client'
22

3+
<<<<<<< HEAD
34
import { assignInlineVars } from '@vanilla-extract/dynamic'
45
import type { ReactNode } from 'react'
56
import { createPortal } from 'react-dom'
67
import { Stack } from '../Stack'
78
import { actionBar, rankActionBar, stackActionBar } from './styles.css'
9+
=======
10+
import { theme } from '@ultraviolet/themes'
11+
import type { ReactNode } from 'react'
12+
import { createPortal } from 'react-dom'
13+
import { Stack } from '../Stack'
14+
import { actionBar, stackActionBar } from './styles.css'
15+
>>>>>>> 8b51fae44 (feat: vanilla extract on badge and actionBar (#5461))
816

917
type ActionBarProps = {
1018
children: ReactNode
@@ -36,9 +44,15 @@ export const ActionBar = ({
3644
className={`${className ? `${className} ` : ''}${actionBar}`}
3745
data-testid={dataTestId}
3846
role={role}
47+
<<<<<<< HEAD
3948
style={assignInlineVars({
4049
[rankActionBar]: `${rank}`,
4150
})}
51+
=======
52+
style={{
53+
bottom: `calc(${theme.sizing['700']} * ${rank} + ${theme.space['2']})`,
54+
}}
55+
>>>>>>> 8b51fae44 (feat: vanilla extract on badge and actionBar (#5461))
4256
>
4357
<Stack alignItems="center" className={stackActionBar}>
4458
{children}

packages/ui/src/components/ActionBar/styles.css.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
import { theme } from '@ultraviolet/themes'
22
import { fadeInVanillaExtract } from '../../utils'
3+
<<<<<<< HEAD
34
import { createVar, style } from '@vanilla-extract/css'
45

56
export const rankActionBar = createVar()
7+
=======
8+
import { style } from '@vanilla-extract/css'
9+
>>>>>>> 8b51fae44 (feat: vanilla extract on badge and actionBar (#5461))
610

711
export const stackActionBar = style({
812
height: '100%',
@@ -19,5 +23,8 @@ export const actionBar = style({
1923
position: 'fixed',
2024
transform: 'translate(-50%, 0)',
2125
width: '37.5rem',
26+
<<<<<<< HEAD
2227
bottom: `calc(${theme.sizing['700']} * ${rankActionBar} + ${theme.space['2']})`,
28+
=======
29+
>>>>>>> 8b51fae44 (feat: vanilla extract on badge and actionBar (#5461))
2330
})

0 commit comments

Comments
 (0)