diff --git a/front/index.html b/front/index.html
index 02e3fccd8..b575f2061 100644
--- a/front/index.html
+++ b/front/index.html
@@ -39,7 +39,7 @@
{{/if}}
-
+
diff --git a/front/src/components/Write/write.module.scss b/front/src/components/Write/write.module.scss
index 0e38b713f..9cdbcb2d7 100644
--- a/front/src/components/Write/write.module.scss
+++ b/front/src/components/Write/write.module.scss
@@ -72,7 +72,7 @@
display: flex;
flex-direction: row;
gap: 1em;
- max-height: calc(100vh - 80px);
+ max-height: calc(100vh - 91px);
}
:global {
diff --git a/front/src/components/articles.module.scss b/front/src/components/articles.module.scss
index 657b04063..89ff829a0 100644
--- a/front/src/components/articles.module.scss
+++ b/front/src/components/articles.module.scss
@@ -1,12 +1,6 @@
@use '../styles/defaults' as *;
@use '../styles/variables' as *;
-:global {
- body {
- overflow-y: scroll;
- }
-}
-
.articleCounter {
font-size: 1.1rem;
font-weight: 600;
diff --git a/front/src/components/corpus/corpus.module.scss b/front/src/components/corpus/corpus.module.scss
index a0d830c86..c717bbe81 100644
--- a/front/src/components/corpus/corpus.module.scss
+++ b/front/src/components/corpus/corpus.module.scss
@@ -1,12 +1,6 @@
@use '../../styles/defaults' as *;
@use '../../styles/variables' as *;
-:global {
- body {
- overflow-y: scroll;
- }
-}
-
.section {
@extend .wrapped-center;
padding: 1rem;
diff --git a/front/src/index.jsx b/front/src/index.jsx
index a3f2845b4..4513c21b3 100644
--- a/front/src/index.jsx
+++ b/front/src/index.jsx
@@ -47,7 +47,7 @@ const workspacePathsRx = /^\/workspaces\/(?[a-z0-9]+)\/(?:articles|books)$/
try {
const { user, token } = await getUserProfile({ applicationConfig, sessionToken })
const pathname = location.pathname
- const workspacePathRxResult = pathname.match(workspacePathsRx)
+ const workspacePathRxResult = pathname.match(workspacePathsRx)
let activeWorkspaceId
if (workspacePathRxResult) {
activeWorkspaceId = workspacePathRxResult.groups.id
@@ -98,70 +98,70 @@ root.render(
}>
-
-
-
-
-
-
-
- {/* Articles index */}
-
-
-
- {/* Books index */}
-
-
-
- {/* Workspaces index */}
-
-
-
-
-
-
-
- {/* Annotate a Book */}
-
-
-
- {/* Annotate an article or its version */}
-
-
-
- {/* Write and Compare */}
-
-
-
- {/* Write with a given version */}
-
-
-
- {/* Write and/or Preview */}
-
-
-
- {/* Collaborative editing */}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ {/* Articles index */}
+
+
+
+ {/* Books index */}
+
+
+
+ {/* Workspaces index */}
+
+
+
+
+
+
+
+ {/* Annotate a Book */}
+
+
+
+ {/* Annotate an article or its version */}
+
+
+
+ {/* Write and Compare */}
+
+
+
+ {/* Write with a given version */}
+
+
+
+ {/* Write and/or Preview */}
+
+
+
+ {/* Collaborative editing */}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/front/src/layouts/App.jsx b/front/src/layouts/App.jsx
index 4a5c9012a..2d58ecc55 100644
--- a/front/src/layouts/App.jsx
+++ b/front/src/layouts/App.jsx
@@ -1,16 +1,30 @@
import { Loading } from '@geist-ui/core'
+import clsx from 'clsx'
import React, { Suspense } from 'react'
import { useSelector } from 'react-redux'
+import { Route, Switch } from 'react-router-dom'
+
+import styles from './app.module.scss'
export default function StyloApp ({ children }) {
const hasBooted = useSelector(state => state.hasBooted)
return (
-
- }>
- {hasBooted ? (children) : }
-
-
+ }>
+ {hasBooted ?
+
+
+
+ {children}
+
+
+
+
+ {children}
+
+
+ : }
+
)
}
diff --git a/front/src/layouts/app.module.scss b/front/src/layouts/app.module.scss
new file mode 100644
index 000000000..ce038c84d
--- /dev/null
+++ b/front/src/layouts/app.module.scss
@@ -0,0 +1,12 @@
+.app {
+ overflow-y: scroll;
+ height: 100%;
+}
+
+.viewportMaxHeight {
+ overflow-y: auto;
+}
+
+.content {
+ min-height: 100vh;
+}