Skip to content

style(modals): Tokenization added and quick fixes on popover #2353

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.

Sign up for GitHub

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

Open
TheoGrandin74 wants to merge 1 commit into
base: new-navigation
Choose a base branch
from
Open

style(modals): Tokenization added and quick fixes on popover #2353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
528 changes: 217 additions & 311 deletions apps/console-v5/src/routeTree.gen.ts
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions ...onments/feature/src/lib/create-clone-environment-modal/create-clone-environment-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ export function CreateCloneEnvironmentModal({
>
{environmentToClone && (
<InputText
className="mb-6"
className="mb-3"
name="clone"
value={environmentToClone.name}
label="Environment to clone"
Expand All @@ -169,7 +169,7 @@ export function CreateCloneEnvironmentModal({
}}
render={({ field, fieldState: { error } }) => (
<InputText
className="mb-6"
className="mb-3"
name={field.name}
onChange={(event: FormEvent<HTMLInputElement>) => {
field.onChange(event.currentTarget.value)
Expand All @@ -189,7 +189,7 @@ export function CreateCloneEnvironmentModal({
}}
render={({ field, fieldState: { error } }) => (
<InputSelect
className="mb-6"
className="mb-3"
onChange={field.onChange}
value={field.value}
label="Target project"
Expand All @@ -212,7 +212,7 @@ export function CreateCloneEnvironmentModal({
render={({ field, fieldState: { error } }) => (
<InputSelect
dataTestId="input-select-cluster"
className="mb-6"
className="mb-3"
onChange={field.onChange}
value={field.value}
label="Cluster"
Expand Down Expand Up @@ -260,7 +260,7 @@ export function CreateCloneEnvironmentModal({
}}
render={({ field }) => (
<InputSelect
className="mb-6"
className="mb-3"
dataTestId="input-select-mode"
options={environmentModes}
onChange={field.onChange}
Expand Down
5 changes: 1 addition & 4 deletions ...uster/src/lib/feature/page-settings-resources-feature/page-settings-resources-feature.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@ import {
useEditCluster,
useUpdateKarpenterPrivateFargate,
} from '@qovery/domains/clusters/feature'
import {
type ClusterResourcesEdit,
type SCWControlPlaneFeatureType,
} from '@qovery/shared/interfaces'
import { type ClusterResourcesEdit, type SCWControlPlaneFeatureType } from '@qovery/shared/interfaces'
import { useModal } from '@qovery/shared/ui'
import { PageSettingsResources } from '../../ui/page-settings-resources/page-settings-resources'

Expand Down
2 changes: 1 addition & 1 deletion libs/shared/spotlight/feature/src/lib/spotlight/spotlight.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ export function Spotlight({ organizationId, open, onOpenChange }: SpotlightProps
className="bg-surface-neutral-subtle"
loop
>
<div className="outline-neutral rounded-lg bg-surface-neutral outline outline-[1px]">
<div className="rounded-lg bg-surface-neutral outline outline-[1px] outline-neutral">
<div className="flex w-full items-center border-b border-neutral pl-4 text-base text-neutral-subtle">
<Icon iconName="magnifying-glass" iconStyle="regular" />
<Command.Input
Expand Down
4 changes: 2 additions & 2 deletions libs/shared/ui/src/lib/components/modal/modal.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ const Content = (props: ModalContentProps) => {

return (
<div className="px-5 py-4">
<h3 className="h3 text-base font-medium text-neutral-400">Title</h3>
<p className="mb-6 mt-2 text-sm text-neutral-350">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
<h3 className="h3 text-base font-medium text-neutral">Title</h3>
<p className="mb-6 mt-2 text-sm text-neutral-subtle">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
<div className="flex justify-end">
<Button type="button" size="lg" onClick={() => setOpen && setOpen(false)}>
Save changes
Expand Down
4 changes: 2 additions & 2 deletions libs/shared/ui/src/lib/components/modal/modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,11 @@ export const Modal = (props: ModalProps) => {
<Dialog.Overlay
data-testid="overlay"
onClick={handleOutsideClick}
className="modal__overlay fixed left-0 top-0 z-overlay flex h-screen w-full bg-black/80"
className="modal__overlay fixed left-0 top-0 z-overlay flex h-screen w-full bg-background-overlay"
/>
{fakeModal && (
<div
className="modal__overlay fixed left-0 top-0 flex h-screen w-full bg-black/80"
className="modal__overlay fixed left-0 top-0 flex h-screen w-full bg-background-overlay"
onClick={handleOutsideClick}
/>
)}
Expand Down
6 changes: 3 additions & 3 deletions libs/shared/ui/src/lib/components/modals/modal-confirmation/modal-confirmation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ export function ModalConfirmation({

return (
<div className="p-6">
<h2 className="h4 mb-2 max-w-sm text-neutral-400 dark:text-neutral-50">{title}</h2>
<div className="mb-6 text-sm text-neutral-350 dark:text-neutral-50">
<h2 className="h4 mb-2 max-w-sm text-neutral">{title}</h2>
<div className="mb-6 text-sm text-neutral-subtle">
{confirmationMethod === 'action' ? (
description ? (
description
Expand All @@ -66,7 +66,7 @@ export function ModalConfirmation({
<span
data-testid="copy-cta"
onClick={copyToClipboard}
className="link relative -top-0.5 ml-1 inline max-w-[250px] cursor-pointer truncate text-sm text-sky-500"
className="link relative -top-0.5 ml-1 inline max-w-[250px] cursor-pointer truncate text-sm text-info"
>
{name} <Icon iconName="copy" />
</span>
Expand Down
8 changes: 4 additions & 4 deletions libs/shared/ui/src/lib/components/modals/modal-crud/modal-crud.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,17 @@ export function ModalCrud(props: ModalCrudProps) {
<Popover.Trigger>
<button
type="button"
className="mt-2 cursor-pointer text-sm font-medium text-brand-500 transition hover:text-brand-600"
className="mt-2 cursor-pointer text-sm font-medium text-info transition hover:text-info-hover"
>
Show how it works <Icon className="text-xs" iconStyle="regular" iconName="circle-question" />
</button>
</Popover.Trigger>
<Popover.Content side="left" className="relative text-sm text-neutral-350" style={{ width: 440 }}>
<h6 className="mb-2 font-medium text-neutral-400">How it works</h6>
<Popover.Content side="left" className="relative z-50 text-sm text-neutral-subtle" style={{ width: 440 }}>
<h6 className="mb-2 font-medium text-neutral">How it works</h6>
{howItWorks}
<Popover.Close className="absolute right-4 top-4">
<button type="button">
<Icon name="icon-solid-xmark text-lg leading-4 font-thin text-neutral-400" />
<Icon name="icon-solid-xmark text-base leading-4 font-thin text-neutral-subtle" />
</button>
</Popover.Close>
</Popover.Content>
Expand Down
8 changes: 4 additions & 4 deletions ...shared/ui/src/lib/components/modals/modal-multi-confirmation/modal-multi-confirmation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,18 @@ export function ModalMultiConfirmation({
return (
<Section className="p-5">
<Dialog.Title asChild>
<Heading level={1} className="mb-2 max-w-sm text-2xl text-neutral-400">
<Heading level={1} className="mb-2 max-w-sm text-2xl text-neutral">
{title}
</Heading>
</Dialog.Title>
<Dialog.Description className="mb-6 text-sm text-neutral-350">{description}</Dialog.Description>
<Dialog.Description className="mb-6 text-sm text-neutral-subtle">{description}</Dialog.Description>

<form onSubmit={onSubmit}>
{children}
{(warning || checks) && (
<Callout.Root className="mb-5 grid grid-cols-[1fr_auto] gap-y-3" color="red">
<Callout.Icon>
<Icon iconName="triangle-exclamation" className="text-red-600" />
<Icon iconName="triangle-exclamation" className="text-negative" />
</Callout.Icon>

<Callout.Text>
Expand Down Expand Up @@ -89,7 +89,7 @@ export function ModalMultiConfirmation({
/>
<label htmlFor={field.name}>{check}</label>
</div>
{error && <p className="text-sm text-red-500">{error.message}</p>}
{error && <p className="text-sm text-negative">{error.message}</p>}
</div>
)}
/>
Expand Down