From 1b5afbbd23e2fea788641f0e53d0e0834bca0623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= Date: Tue, 10 Feb 2026 17:22:44 +0100 Subject: [PATCH] nicolium: style migrations, reduce html nesting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nicole mikołajczyk --- packages/pl-fe/src/components/big-card.tsx | 18 +++---- packages/pl-fe/src/components/ui/card.tsx | 14 ++---- packages/pl-fe/src/styles/new/components.scss | 48 +++++++++++++++++++ 3 files changed, 57 insertions(+), 23 deletions(-) diff --git a/packages/pl-fe/src/components/big-card.tsx b/packages/pl-fe/src/components/big-card.tsx index 75afde2f6..b8fb18153 100644 --- a/packages/pl-fe/src/components/big-card.tsx +++ b/packages/pl-fe/src/components/big-card.tsx @@ -1,8 +1,6 @@ import React from 'react'; import Card, { CardBody } from '@/components/ui/card'; -import Stack from '@/components/ui/stack'; -import Text from '@/components/ui/text'; interface IBigCard { title: React.ReactNode; @@ -13,18 +11,14 @@ interface IBigCard { const BigCard: React.FC = ({ title, subtitle, children }) => ( -
- - {title} - {subtitle && {subtitle}} - +
+

{title}

+ {subtitle &&

{subtitle}

}
- -
- {children} -
-
+
+ {children} +
); diff --git a/packages/pl-fe/src/components/ui/card.tsx b/packages/pl-fe/src/components/ui/card.tsx index 8b61e30c9..dc5dcf850 100644 --- a/packages/pl-fe/src/components/ui/card.tsx +++ b/packages/pl-fe/src/components/ui/card.tsx @@ -5,17 +5,11 @@ import { defineMessages, useIntl } from 'react-intl'; import SvgIcon from '@/components/ui/svg-icon'; -const sizes = { - md: 'p-4 sm:rounded-xl', - lg: 'p-4 sm:p-6 sm:rounded-xl', - xl: 'p-4 sm:p-10 sm:rounded-3xl', -}; - const messages = defineMessages({ back: { id: 'card.back.label', defaultMessage: 'Back' }, }); -type CardSizes = keyof typeof sizes +type CardSizes = 'md' | 'lg' | 'xl'; interface ICard extends Pick, 'role' | 'aria-label'> { /** The type of card. */ @@ -35,10 +29,8 @@ const Card = React.forwardRef(({ children, variant = 'def ref={ref} {...filteredProps} className={clsx({ - 'bg-white dark:bg-primary-900 black:bg-black text-gray-900 dark:text-gray-100 shadow-lg dark:shadow-none': variant === 'rounded', - [sizes[size]]: variant === 'rounded', - 'py-4': variant === 'slim', - 'black:rounded-none': size !== 'xl', + [`⁂-card--rounded ⁂-card--${size}`]: variant === 'rounded', + '⁂-card--slim': variant === 'slim', }, className)} > {children} diff --git a/packages/pl-fe/src/styles/new/components.scss b/packages/pl-fe/src/styles/new/components.scss index c70b3503e..a7f2bfa85 100644 --- a/packages/pl-fe/src/styles/new/components.scss +++ b/packages/pl-fe/src/styles/new/components.scss @@ -475,3 +475,51 @@ div[data-viewport-type="window"]:has(.⁂-empty-message) { } } } + +.⁂-card { + &--rounded { + @apply bg-white dark:bg-primary-900 black:bg-black text-gray-900 dark:text-gray-100 shadow-lg dark:shadow-none; + + &.⁂-card { + &--md { + @apply p-4 sm:rounded-xl; + } + + &--lg { + @apply p-4 sm:p-6 sm:rounded-xl; + } + + &--xl { + @apply p-4 sm:p-10 sm:rounded-3xl; + } + + &--md, + &--lg, + &--xl { + @apply black:rounded-none; + } + } + } + + &--slim { + @apply py-4; + } +} + +.⁂-big-card { + &__header { + @apply flex flex-col gap-2 -mx-4 mb-4 border-b border-solid border-gray-200 pb-4 dark:border-gray-800 sm:-mx-10 sm:pb-10; + + h1 { + @include mixins.text($size: 2xl, $align: center, $weight: bold); + } + + p { + @include mixins.text($theme: muted, $align: center); + } + } + + &__body { + @apply mx-auto sm:w-2/3 sm:pt-10; + } +}