From a5ea0b1e3ce4b1aa7a51acc8864bda1e090ae4bc Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Wed, 26 Apr 2023 11:20:37 +0200 Subject: [PATCH] :bug: Retour aux dossiers missing in folder information + wrong css --- .../classes.module.scss | 6 ++-- .../DefaultNotaryDashboard/index.tsx | 30 +++++++++---------- .../Folder/FolderInformation/index.tsx | 2 +- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/front/Components/LayoutTemplates/DefaultNotaryDashboard/classes.module.scss b/src/front/Components/LayoutTemplates/DefaultNotaryDashboard/classes.module.scss index 7bd278e7..c701b96b 100644 --- a/src/front/Components/LayoutTemplates/DefaultNotaryDashboard/classes.module.scss +++ b/src/front/Components/LayoutTemplates/DefaultNotaryDashboard/classes.module.scss @@ -88,12 +88,13 @@ min-width: calc(100vw - 389px); padding: 64px 48px; overflow-y: auto; - + @media (max-width: ($screen-m - 1px)) { min-width: calc(100vw - 56px); } - + @media(max-width: $screen-s){ + padding: 40px 16px 64px 16px; flex: 1; min-width: unset; } @@ -102,6 +103,7 @@ display: none; @media (max-width: $screen-s) { display: block; + margin-bottom: 24px; } } diff --git a/src/front/Components/LayoutTemplates/DefaultNotaryDashboard/index.tsx b/src/front/Components/LayoutTemplates/DefaultNotaryDashboard/index.tsx index 1b20db23..b8e17182 100644 --- a/src/front/Components/LayoutTemplates/DefaultNotaryDashboard/index.tsx +++ b/src/front/Components/LayoutTemplates/DefaultNotaryDashboard/index.tsx @@ -84,21 +84,21 @@ export default class DefaultNotaryDashboard extends React.Component {this.props.hasBackArrow && ( - <> -
- -
-
- -
- +
+ +
+ )} + {this.props.mobileBackText && ( +
+ +
)} {this.props.children} diff --git a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx index bc2ef367..ccd9eb62 100644 --- a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx +++ b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx @@ -46,7 +46,7 @@ class FolderInformationClass extends BasePage { .get() .modules.pages.Folder.pages.EditCollaborators.props.path.replace("[folderUid]", this.props.selectedFolderUid); return ( - +
{this.state.selectedFolder ? (