From f92ba7d6bca067db3798ee70df04f4fea01596ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= Date: Tue, 10 Feb 2026 18:15:26 +0100 Subject: [PATCH] nicolium: more migrations 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/ui/column.tsx | 12 ++-- packages/pl-fe/src/components/ui/form.tsx | 2 +- .../components/external-login-form.tsx | 12 ++-- .../pl-fe/src/styles/new/authentication.scss | 7 ++ packages/pl-fe/src/styles/new/components.scss | 71 +++++++++---------- packages/pl-fe/src/styles/new/forms.scss | 50 +++++++++++++ packages/pl-fe/src/styles/new/index.scss | 2 + packages/pl-fe/src/styles/new/layout.scss | 2 +- 8 files changed, 105 insertions(+), 53 deletions(-) create mode 100644 packages/pl-fe/src/styles/new/authentication.scss create mode 100644 packages/pl-fe/src/styles/new/forms.scss diff --git a/packages/pl-fe/src/components/ui/column.tsx b/packages/pl-fe/src/components/ui/column.tsx index f8da4bf2f..7b3bfe5f6 100644 --- a/packages/pl-fe/src/components/ui/column.tsx +++ b/packages/pl-fe/src/components/ui/column.tsx @@ -33,7 +33,7 @@ const ColumnHeader: React.FC = ({ label, backHref, backParams, cl {action && ( -
+
{action}
)} @@ -83,7 +83,7 @@ const Column: React.FC = (props): JSX.Element => { }, []); return ( - + {label} @@ -100,12 +100,8 @@ const Column: React.FC = (props): JSX.Element => { diff --git a/packages/pl-fe/src/components/ui/form.tsx b/packages/pl-fe/src/components/ui/form.tsx index 906d55fc3..5269fc8f7 100644 --- a/packages/pl-fe/src/components/ui/form.tsx +++ b/packages/pl-fe/src/components/ui/form.tsx @@ -20,7 +20,7 @@ const Form: React.FC = ({ onSubmit, children, ...filteredProps }) => { }, [onSubmit]); return ( -
+ {children}
); diff --git a/packages/pl-fe/src/features/external-login/components/external-login-form.tsx b/packages/pl-fe/src/features/external-login/components/external-login-form.tsx index 8794bf70b..edf0060ff 100644 --- a/packages/pl-fe/src/features/external-login/components/external-login-form.tsx +++ b/packages/pl-fe/src/features/external-login/components/external-login-form.tsx @@ -2,9 +2,7 @@ import React, { useState, useEffect } from 'react'; import { useIntl, FormattedMessage, defineMessages } from 'react-intl'; import { externalLogin, loginWithCode } from '@/actions/external-auth'; -import Button from '@/components/ui/button'; import Form from '@/components/ui/form'; -import FormActions from '@/components/ui/form-actions'; import FormGroup from '@/components/ui/form-group'; import Input from '@/components/ui/input'; import Spinner from '@/components/ui/spinner'; @@ -76,7 +74,7 @@ const ExternalLoginForm: React.FC = () => { } return ( -
+ { /> - - - + +
); }; diff --git a/packages/pl-fe/src/styles/new/authentication.scss b/packages/pl-fe/src/styles/new/authentication.scss new file mode 100644 index 000000000..86ca56f59 --- /dev/null +++ b/packages/pl-fe/src/styles/new/authentication.scss @@ -0,0 +1,7 @@ +@use 'mixins'; + +.⁂-external-login { + button { + @include mixins.button($theme: primary); + } +} \ No newline at end of file diff --git a/packages/pl-fe/src/styles/new/components.scss b/packages/pl-fe/src/styles/new/components.scss index b49ac3dc8..8b03b0e6f 100644 --- a/packages/pl-fe/src/styles/new/components.scss +++ b/packages/pl-fe/src/styles/new/components.scss @@ -524,43 +524,42 @@ div[data-viewport-type="window"]:has(.⁂-empty-message) { } } +.⁂-column { + position: relative; + + &__header { + &__action { + display: flex; + flex-grow: 1; + justify-content: end; + } + } + + &[column-type='transparent'] { + .⁂-column__header { + @apply p-4 sm:p-0 sm:pb-4 black:p-4; + } + } + + &[column-type='filled'] { + .⁂-column__header { + @apply rounded-t-3xl sticky top-0 z-10 bg-white/90 dark:bg-primary-900/90 black:bg-black/75 backdrop-blur backdrop-saturate-200 -mt-4 -mx-4 p-4; + + &--scrolled { + @apply rounded-t-none; + } + } + + &.⁂-card-lg { + .⁂-column__header { + @apply sm:-mt-6 sm:-mx-6 sm:p-6; + } + } + + } +} + .⁂-emoji { @apply transition-transform hover:scale-125; } -.⁂-textarea { - @apply block w-full rounded-md text-gray-900 placeholder:text-gray-600 dark:text-gray-100 dark:placeholder:text-gray-600 sm:text-sm resize-none; - - &--transparent { - @apply bg-transparent border-0 p-0 focus:ring-0; - } - - &:not(&--transparent) { - @apply bg-white border border-gray-300 p-2 focus:border-primary-500 focus:ring-1 focus:ring-primary-500 disabled:opacity-50 black:bg-black dark:border-gray-800 dark:bg-gray-900 dark:text-gray-100 dark:ring-1 dark:ring-gray-800 dark:focus:border-primary-500 dark:focus:ring-primary-500; - } - - &--mono { - @apply font-mono; - } - - &--has-error { - @apply text-red-600 border-red-600; - } - - &--resizable { - @apply resize; - } - - &__container { - @apply flex flex-col gap-1.5; - } - - &__max-length { - @include mixins.text($size: xs, $theme: muted); - @apply text-right rtl:text-left; - - &--exceeded { - @apply text-danger-700 dark:text-danger-500; - } - } -} diff --git a/packages/pl-fe/src/styles/new/forms.scss b/packages/pl-fe/src/styles/new/forms.scss new file mode 100644 index 000000000..1945c26ac --- /dev/null +++ b/packages/pl-fe/src/styles/new/forms.scss @@ -0,0 +1,50 @@ +@use 'mixins'; + +.⁂-form { + display: flex; + flex-direction: column; + gap: 1rem; + + &__actions { + display: flex; + justify-content: flex-end; + gap: 0.5rem; + } +} + +.⁂-textarea { + @apply block w-full rounded-md text-gray-900 placeholder:text-gray-600 dark:text-gray-100 dark:placeholder:text-gray-600 sm:text-sm resize-none; + + &--transparent { + @apply bg-transparent border-0 p-0 focus:ring-0; + } + + &:not(&--transparent) { + @apply bg-white border border-gray-300 p-2 focus:border-primary-500 focus:ring-1 focus:ring-primary-500 disabled:opacity-50 black:bg-black dark:border-gray-800 dark:bg-gray-900 dark:text-gray-100 dark:ring-1 dark:ring-gray-800 dark:focus:border-primary-500 dark:focus:ring-primary-500; + } + + &--mono { + @apply font-mono; + } + + &--has-error { + @apply text-red-600 border-red-600; + } + + &--resizable { + @apply resize; + } + + &__container { + @apply flex flex-col gap-1.5; + } + + &__max-length { + @include mixins.text($size: xs, $theme: muted); + @apply text-right rtl:text-left; + + &--exceeded { + @apply text-danger-700 dark:text-danger-500; + } + } +} \ No newline at end of file diff --git a/packages/pl-fe/src/styles/new/index.scss b/packages/pl-fe/src/styles/new/index.scss index 3f8037526..5afab31f4 100644 --- a/packages/pl-fe/src/styles/new/index.scss +++ b/packages/pl-fe/src/styles/new/index.scss @@ -1,10 +1,12 @@ @use 'components'; +@use 'forms'; @use 'layout'; @use 'modals'; @use 'accounts'; @use 'statuses'; @use 'timelines'; @use 'compose'; +@use 'authentication'; @use 'admin'; @use 'drive'; @use 'chats'; diff --git a/packages/pl-fe/src/styles/new/layout.scss b/packages/pl-fe/src/styles/new/layout.scss index f2d9fe1bf..0236e9ad4 100644 --- a/packages/pl-fe/src/styles/new/layout.scss +++ b/packages/pl-fe/src/styles/new/layout.scss @@ -525,4 +525,4 @@ div:has(.⁂-background-shapes), .dark { .⁂-layout__content .⁂-site-error { height: fit-content; -} \ No newline at end of file +}