Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add mouse hover effects #1405

Merged
merged 5 commits into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/common/selectToken/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export const SelectTokenButton: FC<Props> = ({
type="button"
data-testid={testId}
className={cn(
'rounded-12 flex items-center gap-8 p-10',
'rounded-12 hover:outline-background-400 flex items-center gap-8 p-10 hover:outline hover:outline-1',
symbol ? 'bg-black text-white' : 'bg-primary text-black',
className
)}
Expand Down
8 changes: 6 additions & 2 deletions src/components/simulator/input/BuySellBlockNew/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ export const BuySellHeader: FC<Props> = (props) => {
onClick={setLimit}
className={cn(
'rounded-40 font-weight-500',
!isRange ? 'bg-background-900' : 'text-white/60',
!isRange
? 'bg-background-900'
: 'text-white/60 hover:text-white/80',
'px-10 py-4'
)}
data-testid="tab-limit"
Expand All @@ -62,7 +64,9 @@ export const BuySellHeader: FC<Props> = (props) => {
onClick={setRange}
className={cn(
'rounded-40 font-weight-500',
isRange ? 'bg-background-900' : 'text-white/60',
isRange
? 'bg-background-900'
: 'text-white/60 hover:text-white/80',
'px-10 py-4'
)}
data-testid="tab-range"
Expand Down
10 changes: 8 additions & 2 deletions src/components/simulator/input/SimInputStrategyType.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,14 @@ export const SimInputStrategyType: FC<Props> = ({ baseToken, quoteToken }) => {
to={`/simulate/${label}`}
search={{ baseToken, quoteToken }}
className={cn(
'rounded-10 text-14 font-weight-500 flex size-full flex-row items-center justify-center gap-8 bg-black px-8 py-16 outline-white/60',
'rounded-10 text-14 font-weight-500 group flex size-full flex-row items-center justify-center gap-8 bg-black px-8 py-16 outline-white',
'md:px-12',
'focus-visible:outline focus-visible:outline-1'
)}
inactiveProps={{
className:
'hover:outline hover:outline-1 hover:outline-background-400',
}}
activeProps={{ className: 'outline outline-1 outline-white' }}
replace={true}
resetScroll={false}
Expand All @@ -70,7 +74,9 @@ export const SimInputStrategyType: FC<Props> = ({ baseToken, quoteToken }) => {
{svg}
<span
className={`capitalize ${
isActive ? 'text-white' : 'text-white/40'
isActive
? 'text-white'
: 'text-white/40 group-hover:text-white/80'
}`}
>
{title}
Expand Down
2 changes: 1 addition & 1 deletion src/components/simulator/input/SimInputTokenSelection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export const SimInputTokenSelection: FC<Props> = ({
/>
<button
type="button"
className="border-background-900 relative z-10 grid h-40 w-40 flex-shrink-0 -rotate-90 place-items-center rounded-full border-[5px] bg-black"
className="border-background-900 hover:bg-background-800 relative z-10 grid h-40 w-40 flex-shrink-0 -rotate-90 place-items-center rounded-full border-[5px] bg-black"
onClick={() => {
navigate({
search: { baseToken: quoteToken, quoteToken: baseToken },
Expand Down
4 changes: 3 additions & 1 deletion src/components/strategies/StrategyPageTabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ export const StrategyPageTabs = ({ currentPathname, tabs }: Props) => {
key={href}
className={cn(
'flex w-full items-center justify-center gap-4 rounded-full py-5 md:px-10',
active ? 'bg-white/10' : 'bg-transparent text-white/60'
active
? 'bg-white/10'
: 'bg-transparent text-white/60 hover:text-white/80'
)}
aria-current={active ? 'location' : 'false'}
>
Expand Down
8 changes: 6 additions & 2 deletions src/components/strategies/common/OrderHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ export const OrderHeader: FC<Props> = (props) => {
onClick={setLimit}
className={cn(
'rounded-40 font-weight-500',
!isRange ? 'bg-background-900' : 'text-white/60',
!isRange
? 'bg-background-900'
: 'text-white/60 hover:text-white/80',
'px-10 py-4'
)}
data-testid="tab-limit"
Expand All @@ -48,7 +50,9 @@ export const OrderHeader: FC<Props> = (props) => {
onClick={setRange}
className={cn(
'rounded-40 font-weight-500',
isRange ? 'bg-background-900' : 'text-white/60',
isRange
? 'bg-background-900'
: 'text-white/60 hover:text-white/80',
'px-10 py-4'
)}
data-testid="tab-range"
Expand Down
2 changes: 1 addition & 1 deletion src/components/strategies/create/CreateLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export const CreateLayout: FC<Props> = (props) => {
setShowGraph(true);
}}
data-testid="open-chart"
className="bg-background-800 grid size-40 place-items-center rounded-full"
className="bg-background-800 hover:border-background-700 border-background-800 grid size-40 place-items-center rounded-full border-2"
>
<IconCandles className="size-18" />
</button>
Expand Down
10 changes: 7 additions & 3 deletions src/components/strategies/create/CreateStrategyOption.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -99,17 +99,21 @@ export const CreateStrategyOption: FC<Props> = ({ base, quote }) => {
aria-selected={id === selectedId}
onClick={() => setItem(id)}
className={cn(
'rounded-10 text-14 flex size-full flex-col items-center justify-start gap-8 bg-black px-8 py-16 outline-white/60',
'rounded-10 text-14 group flex size-full flex-col items-center justify-start gap-8 bg-black px-8 py-16 outline-white/60',
'md:px-12',
'focus-visible:outline focus-visible:outline-1',
id === selectedId ? 'outline outline-1 outline-white' : ''
id === selectedId
? 'outline outline-1 outline-white'
: 'hover:outline-background-400 hover:outline hover:outline-1'
)}
data-testid={id}
>
{svg}
<span
className={`text-12 md:text-14 ${
id === selectedId ? 'text-white' : 'text-white/40'
id === selectedId
? 'text-white'
: 'text-white/60 group-hover:text-white/80'
}`}
>
{aboveBreakpoint('md') ? label : label.split(' ')[0]}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ export const CreateStrategyTokenSelection: FC<Props> = ({ base, quote }) => {
{!!base && (
<>
<button
className="border-background-900 relative z-10 mx-auto grid size-40 place-items-center rounded-full border-[5px] bg-black"
className="border-background-900 hover:bg-background-800 relative z-10 mx-auto grid size-40 place-items-center rounded-full border-[5px] bg-black"
onClick={swapTokens}
disabled={!base || !quote}
>
Expand Down
6 changes: 3 additions & 3 deletions src/components/strategies/edit/EditPriceNav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const EditPriceNav: FC<Props> = ({ editType }) => {
aria-label="Switch between type of strategy"
>
<Link
className="aria-current-page:bg-white/10 aria-current-page:text-white flex-1 rounded-full bg-transparent py-4 text-center text-white/60"
className="aria-current-page:bg-white/10 aria-current-page:text-white flex-1 rounded-full bg-transparent py-4 text-center text-white/60 hover:text-white/80"
to="/strategies/edit/$strategyId/prices/disposable"
search={toDisposablePricesSearch(strategy, editType)}
params={params}
Expand All @@ -34,7 +34,7 @@ export const EditPriceNav: FC<Props> = ({ editType }) => {
Disposable
</Link>
<Link
className="aria-current-page:bg-white/10 aria-current-page:text-white flex-1 rounded-full bg-transparent py-4 text-center text-white/60"
className="aria-current-page:bg-white/10 aria-current-page:text-white flex-1 rounded-full bg-transparent py-4 text-center text-white/60 hover:text-white/80"
to="/strategies/edit/$strategyId/prices/recurring"
search={toRecurringPricesSearch(strategy, editType)}
params={params}
Expand All @@ -44,7 +44,7 @@ export const EditPriceNav: FC<Props> = ({ editType }) => {
Recurring
</Link>
<Link
className="aria-current-page:bg-white/10 aria-current-page:text-white flex-1 rounded-full bg-transparent py-4 text-center text-white/60"
className="aria-current-page:bg-white/10 aria-current-page:text-white flex-1 rounded-full bg-transparent py-4 text-center text-white/60 hover:text-white/80"
to="/strategies/edit/$strategyId/prices/overlapping"
search={toOverlappingPricesSearch(strategy, editType)}
params={params}
Expand Down
2 changes: 1 addition & 1 deletion src/components/strategies/edit/EditStrategyLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export const EditStrategyLayout: FC<Props> = (props) => {
carbonEvents.strategy.strategyChartOpen(undefined);
setShowGraph(true);
}}
className="bg-background-800 grid size-40 place-items-center rounded-full"
className="hover:border-background-700 border-background-800 bg-background-800 grid size-40 place-items-center rounded-full border-2"
>
<IconCandles className="size-18" />
</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,19 @@
opacity: 0.5;
cursor: not-allowed;
}
.select-token:not(:checked):not(:disabled):hover + label {
outline: solid 1px rgba(164, 164, 164, 1);
}
.budget-mode:checked + label {
color: white;
background-color: #404040;
}
.budget-mode:focus-visible + label {
outline: solid 1px white;
}
}
.budget-mode:not(:checked) + label {
color: rgb(255 255 255 / 0.6);
}
.budget-mode:not(:checked):hover + label {
color: rgb(255 255 255 / 0.8);
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ export const StrategyBlockCreate: FC<Props> = ({
onClick={() => carbonEvents.strategy.newStrategyCreateClick(undefined)}
to="/strategies/create"
className={cn(
'bg-content rounded-10 py-50 text-24 font-weight-500 flex flex-col items-center justify-center gap-24 md:text-[32px]',
'bg-content rounded-10 py-50 text-24 font-weight-500 group flex flex-col items-center justify-center gap-24 md:text-[32px]',
className
)}
>
<div className="bg-primary/20 size-72 rounded-full md:size-80">
<div className="bg-primary/15 group-hover:bg-primary/25 size-72 rounded-full md:size-80">
<IconPlus className="text-primary md:p-26 p-24" />
</div>
<h1 className="w-[200px] text-center leading-9 md:w-[250px]">{title}</h1>
Expand Down