From db4d53ec43834472dce5aab106ed44a568d0ae0d Mon Sep 17 00:00:00 2001 From: satof3 Date: Thu, 18 Apr 2024 19:25:11 +0900 Subject: [PATCH 1/9] Change appearance Tag button and Search button when edit mode --- apps/app/src/components/PageControls/PageControls.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/app/src/components/PageControls/PageControls.tsx b/apps/app/src/components/PageControls/PageControls.tsx index 9d8e0c16249..0a7553fda6c 100644 --- a/apps/app/src/components/PageControls/PageControls.tsx +++ b/apps/app/src/components/PageControls/PageControls.tsx @@ -58,7 +58,7 @@ const Tags = (props: TagsProps): JSX.Element => { onClick={onClickEditTagsButton} > local_offer - Tags + Tags ); @@ -273,7 +273,7 @@ const PageControlsSubstance = (props: PageControlsSubstanceProps): JSX.Element = return (
- { isDeviceLargerThanMd && ( + { isViewMode && isDeviceLargerThanMd && ( )} From d7279c0e7cef5b4f16be4963de3ef50ec272104c Mon Sep 17 00:00:00 2001 From: satof3 Date: Tue, 23 Apr 2024 19:07:46 +0900 Subject: [PATCH 2/9] Disappear hstack when editor mode less than lg --- apps/app/src/components/PageControls/PageControls.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/app/src/components/PageControls/PageControls.tsx b/apps/app/src/components/PageControls/PageControls.tsx index 0a7553fda6c..1a7e6a2b423 100644 --- a/apps/app/src/components/PageControls/PageControls.tsx +++ b/apps/app/src/components/PageControls/PageControls.tsx @@ -284,7 +284,7 @@ const PageControlsSubstance = (props: PageControlsSubstanceProps): JSX.Element = )} { !hideSubControls && ( -
+
{revisionId != null && _isIPageInfoForOperation && ( Date: Tue, 23 Apr 2024 20:59:04 +0900 Subject: [PATCH 3/9] Fix menu button appearance when editor mode --- .../PageEditor/EditorNavbar/EditorNavbar.tsx | 2 +- .../src/components/PageEditor/EditorNavbarBottom.tsx | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/apps/app/src/components/PageEditor/EditorNavbar/EditorNavbar.tsx b/apps/app/src/components/PageEditor/EditorNavbar/EditorNavbar.tsx index 6797a4a0363..078685bb4ef 100644 --- a/apps/app/src/components/PageEditor/EditorNavbar/EditorNavbar.tsx +++ b/apps/app/src/components/PageEditor/EditorNavbar/EditorNavbar.tsx @@ -12,7 +12,7 @@ export const EditorNavbar = (): JSX.Element => { const { data: editingUsers } = useEditingUsers(); return ( -
+
import('~/components/SavePageControls').t const OptionsSelector = dynamic(() => import('~/components/PageEditor/OptionsSelector').then(mod => mod.OptionsSelector), { ssr: false }); const EditorNavbarBottom = (): JSX.Element => { + + const { mutate: mutateDrawerOpened } = useDrawerOpened(); + return (
+ mutateDrawerOpened(true)} + > + reorder +
From d09c34b768a782873672170417e14537a7a9c4b9 Mon Sep 17 00:00:00 2001 From: satof3 Date: Tue, 23 Apr 2024 21:04:26 +0900 Subject: [PATCH 4/9] Adjust pagetitle and pagepath appearance when moblie editor --- apps/app/src/components/PageControls/PageControls.tsx | 2 +- .../PageEditor/EditorNavbar/EditorNavbar.module.scss | 5 +++++ apps/app/src/components/PageHeader/PageHeader.tsx | 2 +- .../src/components/PageHeader/PagePathHeader.module.scss | 8 ++++++++ .../src/components/PageHeader/PageTitleHeader.module.scss | 8 ++++++++ 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/apps/app/src/components/PageControls/PageControls.tsx b/apps/app/src/components/PageControls/PageControls.tsx index 1a7e6a2b423..61e51244f62 100644 --- a/apps/app/src/components/PageControls/PageControls.tsx +++ b/apps/app/src/components/PageControls/PageControls.tsx @@ -57,7 +57,7 @@ const Tags = (props: TagsProps): JSX.Element => { className="btn btn-sm btn-outline-neutral-secondary" onClick={onClickEditTagsButton} > - local_offer + local_offer Tags
diff --git a/apps/app/src/components/PageEditor/EditorNavbar/EditorNavbar.module.scss b/apps/app/src/components/PageEditor/EditorNavbar/EditorNavbar.module.scss index f2df5238550..2987657894b 100644 --- a/apps/app/src/components/PageEditor/EditorNavbar/EditorNavbar.module.scss +++ b/apps/app/src/components/PageEditor/EditorNavbar/EditorNavbar.module.scss @@ -1,3 +1,8 @@ +@use '@growi/core/scss/bootstrap/init' as bs; + .editor-navbar :global { min-height: 72px; + @include bs.media-breakpoint-down(md) { + min-height: 96px; + } } diff --git a/apps/app/src/components/PageHeader/PageHeader.tsx b/apps/app/src/components/PageHeader/PageHeader.tsx index d12b70cc0a6..c8c61a0538a 100644 --- a/apps/app/src/components/PageHeader/PageHeader.tsx +++ b/apps/app/src/components/PageHeader/PageHeader.tsx @@ -21,7 +21,7 @@ export const PageHeader: FC = () => { -
+
diff --git a/apps/app/src/components/PageHeader/PagePathHeader.module.scss b/apps/app/src/components/PageHeader/PagePathHeader.module.scss index b52c3d7b1e7..844aeb5f7d4 100644 --- a/apps/app/src/components/PageHeader/PagePathHeader.module.scss +++ b/apps/app/src/components/PageHeader/PagePathHeader.module.scss @@ -1,5 +1,13 @@ +@use '@growi/core/scss/bootstrap/init' as bs; + .page-path-header :global { max-width: calc(100vw - 650px); + @include bs.media-breakpoint-down(lg) { + max-width: calc(100vw - 372px); + } + @include bs.media-breakpoint-down(md) { + max-width: calc(100vw - 264px); + } input { min-width: 20px; min-height: unset; diff --git a/apps/app/src/components/PageHeader/PageTitleHeader.module.scss b/apps/app/src/components/PageHeader/PageTitleHeader.module.scss index 8214c3cd493..dd5b9109f7a 100644 --- a/apps/app/src/components/PageHeader/PageTitleHeader.module.scss +++ b/apps/app/src/components/PageHeader/PageTitleHeader.module.scss @@ -1,5 +1,13 @@ +@use '@growi/core/scss/bootstrap/init' as bs; + .page-title-header :global { max-width: calc(100vw - 650px); + @include bs.media-breakpoint-down(lg) { + max-width: calc(100vw - 372px); + } + @include bs.media-breakpoint-down(md) { + max-width: calc(100vw - 264px); + } input { min-width: 20px; min-height: unset; From 978287e8907c7da98f2a6eb876388040ab0eaae7 Mon Sep 17 00:00:00 2001 From: satof3 Date: Wed, 24 Apr 2024 17:45:53 +0900 Subject: [PATCH 5/9] Adjust responsive in editor --- .../components/PageEditor/EditorNavbar/EditingUserList.tsx | 4 ++-- .../PageEditor/EditorNavbar/EditorNavbar.module.scss | 2 +- .../components/PageEditor/EditorNavbar/EditorNavbar.tsx | 7 ++++--- .../src/components/PageHeader/PagePathHeader.module.scss | 3 +++ .../src/components/PageHeader/PageTitleHeader.module.scss | 3 +++ apps/app/src/components/PageHeader/PageTitleHeader.tsx | 2 +- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/apps/app/src/components/PageEditor/EditorNavbar/EditingUserList.tsx b/apps/app/src/components/PageEditor/EditorNavbar/EditingUserList.tsx index dd848e38dd1..c5bc6e6822d 100644 --- a/apps/app/src/components/PageEditor/EditorNavbar/EditingUserList.tsx +++ b/apps/app/src/components/PageEditor/EditorNavbar/EditingUserList.tsx @@ -27,8 +27,8 @@ export const EditingUserList: FC = ({ userList }) => { } return ( -
-
+
+
{firstFourUsers.map(user => (
{ const { data: editingUsers } = useEditingUsers(); return ( -
- - +
+
+
); }; diff --git a/apps/app/src/components/PageHeader/PagePathHeader.module.scss b/apps/app/src/components/PageHeader/PagePathHeader.module.scss index 844aeb5f7d4..b6c1ee9c779 100644 --- a/apps/app/src/components/PageHeader/PagePathHeader.module.scss +++ b/apps/app/src/components/PageHeader/PagePathHeader.module.scss @@ -8,6 +8,9 @@ @include bs.media-breakpoint-down(md) { max-width: calc(100vw - 264px); } + @include bs.media-breakpoint-down(sm) { + max-width: calc(100vw - 48px); + } input { min-width: 20px; min-height: unset; diff --git a/apps/app/src/components/PageHeader/PageTitleHeader.module.scss b/apps/app/src/components/PageHeader/PageTitleHeader.module.scss index dd5b9109f7a..fa756711178 100644 --- a/apps/app/src/components/PageHeader/PageTitleHeader.module.scss +++ b/apps/app/src/components/PageHeader/PageTitleHeader.module.scss @@ -8,6 +8,9 @@ @include bs.media-breakpoint-down(md) { max-width: calc(100vw - 264px); } + @include bs.media-breakpoint-down(sm) { + max-width: calc(100vw - 48px); + } input { min-width: 20px; min-height: unset; diff --git a/apps/app/src/components/PageHeader/PageTitleHeader.tsx b/apps/app/src/components/PageHeader/PageTitleHeader.tsx index ea947243f1c..5959dcc5f25 100644 --- a/apps/app/src/components/PageHeader/PageTitleHeader.tsx +++ b/apps/app/src/components/PageHeader/PageTitleHeader.tsx @@ -108,7 +108,7 @@ export const PageTitleHeader: FC = (props) => {
) }

Date: Thu, 25 Apr 2024 21:19:20 +0900 Subject: [PATCH 6/9] Replace margin element --- apps/app/src/components/PageControls/PageControls.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/app/src/components/PageControls/PageControls.tsx b/apps/app/src/components/PageControls/PageControls.tsx index 6d0a06dda54..30f190aee29 100644 --- a/apps/app/src/components/PageControls/PageControls.tsx +++ b/apps/app/src/components/PageControls/PageControls.tsx @@ -58,8 +58,8 @@ const Tags = (props: TagsProps): JSX.Element => { className="btn btn-sm btn-outline-neutral-secondary" onClick={onClickEditTagsButton} > - local_offer - {t('Tags')} + local_offer + {t('Tags')}

); From 1a79b4b22b8b4153a413e692ce42845c67b4fde3 Mon Sep 17 00:00:00 2001 From: satof3 Date: Thu, 25 Apr 2024 21:29:45 +0900 Subject: [PATCH 7/9] Simplify code --- apps/app/src/components/PageControls/PageControls.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/app/src/components/PageControls/PageControls.tsx b/apps/app/src/components/PageControls/PageControls.tsx index 30f190aee29..78033dc684f 100644 --- a/apps/app/src/components/PageControls/PageControls.tsx +++ b/apps/app/src/components/PageControls/PageControls.tsx @@ -285,7 +285,7 @@ const PageControlsSubstance = (props: PageControlsSubstanceProps): JSX.Element = )} { !hideSubControls && ( -
+
{revisionId != null && _isIPageInfoForOperation && ( Date: Thu, 25 Apr 2024 21:35:34 +0900 Subject: [PATCH 8/9] Undo changes --- .../components/PageHeader/PagePathHeader.module.scss | 12 +----------- .../PageHeader/PageTitleHeader.module.scss | 12 +----------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/apps/app/src/components/PageHeader/PagePathHeader.module.scss b/apps/app/src/components/PageHeader/PagePathHeader.module.scss index b6c1ee9c779..475757400eb 100644 --- a/apps/app/src/components/PageHeader/PagePathHeader.module.scss +++ b/apps/app/src/components/PageHeader/PagePathHeader.module.scss @@ -1,16 +1,6 @@ -@use '@growi/core/scss/bootstrap/init' as bs; - .page-path-header :global { max-width: calc(100vw - 650px); - @include bs.media-breakpoint-down(lg) { - max-width: calc(100vw - 372px); - } - @include bs.media-breakpoint-down(md) { - max-width: calc(100vw - 264px); - } - @include bs.media-breakpoint-down(sm) { - max-width: calc(100vw - 48px); - } + input { min-width: 20px; min-height: unset; diff --git a/apps/app/src/components/PageHeader/PageTitleHeader.module.scss b/apps/app/src/components/PageHeader/PageTitleHeader.module.scss index fa756711178..44f1d8ca74c 100644 --- a/apps/app/src/components/PageHeader/PageTitleHeader.module.scss +++ b/apps/app/src/components/PageHeader/PageTitleHeader.module.scss @@ -1,16 +1,6 @@ -@use '@growi/core/scss/bootstrap/init' as bs; - .page-title-header :global { max-width: calc(100vw - 650px); - @include bs.media-breakpoint-down(lg) { - max-width: calc(100vw - 372px); - } - @include bs.media-breakpoint-down(md) { - max-width: calc(100vw - 264px); - } - @include bs.media-breakpoint-down(sm) { - max-width: calc(100vw - 48px); - } + input { min-width: 20px; min-height: unset; From b950410ff1b25d3da5afcd491937042a14ac9e2c Mon Sep 17 00:00:00 2001 From: satof3 Date: Thu, 25 Apr 2024 21:38:58 +0900 Subject: [PATCH 9/9] Remove blank line --- apps/app/src/components/PageHeader/PagePathHeader.module.scss | 1 - apps/app/src/components/PageHeader/PageTitleHeader.module.scss | 1 - 2 files changed, 2 deletions(-) diff --git a/apps/app/src/components/PageHeader/PagePathHeader.module.scss b/apps/app/src/components/PageHeader/PagePathHeader.module.scss index 475757400eb..b52c3d7b1e7 100644 --- a/apps/app/src/components/PageHeader/PagePathHeader.module.scss +++ b/apps/app/src/components/PageHeader/PagePathHeader.module.scss @@ -1,6 +1,5 @@ .page-path-header :global { max-width: calc(100vw - 650px); - input { min-width: 20px; min-height: unset; diff --git a/apps/app/src/components/PageHeader/PageTitleHeader.module.scss b/apps/app/src/components/PageHeader/PageTitleHeader.module.scss index 44f1d8ca74c..8214c3cd493 100644 --- a/apps/app/src/components/PageHeader/PageTitleHeader.module.scss +++ b/apps/app/src/components/PageHeader/PageTitleHeader.module.scss @@ -1,6 +1,5 @@ .page-title-header :global { max-width: calc(100vw - 650px); - input { min-width: 20px; min-height: unset;