From 77b95804831d12b1d2622251b71b6b464ad5cc3f Mon Sep 17 00:00:00 2001 From: "ildar.timerbaev" Date: Mon, 13 Nov 2023 23:20:35 +0600 Subject: [PATCH 1/5] Tailwind migration: fixed dark theme datepicker and schedules list items --- src/common/components/post-scheduler/index.tsx | 2 +- .../components/schedules/scheduled-list-item.tsx | 12 ++++++++---- src/style/_base.scss | 6 +++--- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/common/components/post-scheduler/index.tsx b/src/common/components/post-scheduler/index.tsx index c5330b7525e..e8c7194da36 100644 --- a/src/common/components/post-scheduler/index.tsx +++ b/src/common/components/post-scheduler/index.tsx @@ -50,7 +50,7 @@ export const DialogBody = (props: DialogBodyProps) => { {_t("post-scheduler.error-message")} )} -
+
{summary}
+ +
{post.status === 1 && ( -
- {timeSvg} {dateFormatted} +
+
{timeSvg}
+ {dateFormatted}
)} {post.status === 2 && ( -
- {timeSvg} {dateFormatted} +
+
{timeSvg}
+ {dateFormatted}
)} diff --git a/src/style/_base.scss b/src/style/_base.scss index e014f6b3b62..3ac7464c4ea 100644 --- a/src/style/_base.scss +++ b/src/style/_base.scss @@ -200,7 +200,7 @@ a[target="_blank"] { // Date picker @import "~react-datetime/css/react-datetime.css"; // dark theme -.theme-night { +.dark { .rdtPicker { @apply bg-blue-metallic; border: 1px solid; @@ -290,10 +290,10 @@ a[target="_blank"] { /* Track */ ::-webkit-scrollbar-track { - box-shadow: inset 0 0 5px grey; + box-shadow: inset 0 0 5px grey; border-radius: 10px; } - + /* Handle */ ::-webkit-scrollbar-thumb { @apply bg-blue-dark-sky; From 3be981d8b7630edf15d5245cdbe959fd3da7c033 Mon Sep 17 00:00:00 2001 From: "ildar.timerbaev" Date: Mon, 13 Nov 2023 23:52:42 +0600 Subject: [PATCH 2/5] Tailwind migration: fixed login dialog logo alignment --- src/common/components/login/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/components/login/index.tsx b/src/common/components/login/index.tsx index abc21703c16..5d42b9037e9 100644 --- a/src/common/components/login/index.tsx +++ b/src/common/components/login/index.tsx @@ -548,7 +548,7 @@ export class Login extends BaseComponent { return ( <> {users.length === 0 && ( -
+
Logo

{_t("login.title")}

From c3c0a75990f1b543794e24bccbebe5c281c7a1a0 Mon Sep 17 00:00:00 2001 From: "ildar.timerbaev" Date: Mon, 13 Nov 2023 23:54:04 +0600 Subject: [PATCH 3/5] Tailwind migration: fixed tests --- .../components/comment/__snapshots__/index.spec.tsx.snap | 4 ++-- src/common/components/login/__snapshots__/index.spec.tsx.snap | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/components/comment/__snapshots__/index.spec.tsx.snap b/src/common/components/comment/__snapshots__/index.spec.tsx.snap index 69b098375de..eb3cc57f44e 100644 --- a/src/common/components/comment/__snapshots__/index.spec.tsx.snap +++ b/src/common/components/comment/__snapshots__/index.spec.tsx.snap @@ -203,7 +203,7 @@ exports[`(1) Default render 1`] = `
@@ -551,7 +551,7 @@ exports[`(2) Cancellable, in progress 1`] = `
diff --git a/src/common/components/login/__snapshots__/index.spec.tsx.snap b/src/common/components/login/__snapshots__/index.spec.tsx.snap index ac72127779f..38ec93187ea 100644 --- a/src/common/components/login/__snapshots__/index.spec.tsx.snap +++ b/src/common/components/login/__snapshots__/index.spec.tsx.snap @@ -3,7 +3,7 @@ exports[`(1) Default render 1`] = ` Array [
Logo Logo Date: Mon, 13 Nov 2023 23:57:57 +0600 Subject: [PATCH 4/5] Tailwind migration: fixed scheduled item text color --- src/common/components/schedules/scheduled-list-item.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/common/components/schedules/scheduled-list-item.tsx b/src/common/components/schedules/scheduled-list-item.tsx index 4f2514ddca2..cbe9acaeddc 100644 --- a/src/common/components/schedules/scheduled-list-item.tsx +++ b/src/common/components/schedules/scheduled-list-item.tsx @@ -52,11 +52,13 @@ export function ScheduledListItem({ post, deleteFn, moveFn }: Props) {
{author}
-
({accountReputation(reputation)})
+
+ ({accountReputation(reputation)}) +
{tag} -
+
{dateRelative}
From 97a8950f1fefe30226e11528679f206e8ea66b08 Mon Sep 17 00:00:00 2001 From: "ildar.timerbaev" Date: Mon, 13 Nov 2023 23:59:01 +0600 Subject: [PATCH 5/5] Tailwind migration: fixed HS logo alignment --- src/common/components/login/_index.scss | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/common/components/login/_index.scss b/src/common/components/login/_index.scss index eed5737ea35..125ce82337d 100644 --- a/src/common/components/login/_index.scss +++ b/src/common/components/login/_index.scss @@ -49,7 +49,7 @@ .user-list-body { overflow-y: auto; max-height: 300px; - + .user-list-item { align-items: center; border-radius: 25px; @@ -172,6 +172,7 @@ .hs-logo, .kc-logo { height: 14px; + width: 14px; margin-right: 6px; } } @@ -182,7 +183,8 @@ } } } -} -.google-recaptcha{ +} + +.google-recaptcha { margin: 16px 0px; } \ No newline at end of file