diff --git a/pages/album/[album].jsx b/pages/album/[album].jsx index b688845c..b6199f7e 100644 --- a/pages/album/[album].jsx +++ b/pages/album/[album].jsx @@ -12,21 +12,20 @@ const Page = (props) => ( menu={buildMenu(props.pageUrl, menuModel)} showAuthor={true} menuPadding={true} + layout={'thin'} > {props.album.title} -
-
- -
-
+
+ +
) diff --git a/pages/article/[article].jsx b/pages/article/[article].jsx index dfad639e..84a92733 100644 --- a/pages/article/[article].jsx +++ b/pages/article/[article].jsx @@ -15,23 +15,22 @@ const Page = (props) => ( menu={buildMenu(props.pageUrl, menuModel)} showAuthor={true} menuPadding={true} + layout={'thin'} > {props.article.title} -
-
- -
-
+
+ +
) diff --git a/pages/articles/[page].jsx b/pages/articles/[page].jsx index 555c3ad1..744da190 100644 --- a/pages/articles/[page].jsx +++ b/pages/articles/[page].jsx @@ -13,18 +13,17 @@ const Page = (props) => ( menu={buildMenu(props.pageUrl, menuModel)} showAuthor={true} menuPadding={true} + layout={'wide'} > {props.title} -
- -
+ ) diff --git a/pages/collective.jsx b/pages/collective.jsx index b194d5b5..cf613e2f 100644 --- a/pages/collective.jsx +++ b/pages/collective.jsx @@ -16,35 +16,34 @@ const Page = (props) => ( menu={buildMenu(props.pageUrl, menuModel)} showAuthor={true} menuPadding={true} + layout={'wide'} > {props.title} -
- {!props.image ? null : ( - + )} + + ( + )} - - ( - - )} - /> -
+ /> ) diff --git a/pages/document/[document].jsx b/pages/document/[document].jsx index 6c9ecc45..1caa3dae 100644 --- a/pages/document/[document].jsx +++ b/pages/document/[document].jsx @@ -14,15 +14,14 @@ const Page = (props) => ( menu={buildMenu(props.pageUrl, menuModel)} showAuthor={true} menuPadding={true} + layout={'wide'} > {props.file.title} -
- - -
+ + ) diff --git a/pages/documents.tsx b/pages/documents.tsx index 97e82696..29104f3e 100644 --- a/pages/documents.tsx +++ b/pages/documents.tsx @@ -106,21 +106,20 @@ const Page: NextPage = props => ( menu={buildMenu(props.pageUrl, menuModel)} showAuthor={true} menuPadding={true} + layout={'thin'} > {props.title} -
- {props.collections.map((collection, index) => ( - - ))} -
+ {props.collections.map((collection, index) => ( + + ))} ) diff --git a/pages/gallery.jsx b/pages/gallery.jsx index 7006780b..8725b4c9 100644 --- a/pages/gallery.jsx +++ b/pages/gallery.jsx @@ -69,27 +69,26 @@ const Page = (props) => ( menu={buildMenu(props.pageUrl, menuModel)} showAuthor={true} menuPadding={true} + layout={'wide'} > {props.title} -
-
- {props.collections.map(([year, albums], index) => ( - - )) - } -
-
+
+ {props.collections.map(([year, albums], index) => ( + + )) + } +
) diff --git a/pages/index.tsx b/pages/index.tsx index af7215cc..5fb4b299 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -14,21 +14,20 @@ const Page = (props) => ( menu={buildMenu(props.pageUrl, menuModel)} showAuthor={true} menuPadding={true} + layout={'wide'} > {props.title} -
- + - -
+ ) diff --git a/pages/schedule.jsx b/pages/schedule.jsx index 51cd8254..7aed7b1e 100644 --- a/pages/schedule.jsx +++ b/pages/schedule.jsx @@ -12,18 +12,17 @@ const Page = (props) => ( menu={buildMenu(props.pageUrl, menuModel)} showAuthor={true} menuPadding={true} + layout={'wide'} > {props.title} -
- {/**/} + {/**/} - + - -
+ ) diff --git a/pages/teacher/[person].jsx b/pages/teacher/[person].jsx index 3ad105eb..224bd231 100644 --- a/pages/teacher/[person].jsx +++ b/pages/teacher/[person].jsx @@ -14,16 +14,15 @@ const Index = (props) => ( menu={buildMenu(props.pageUrl, menuModel)} showAuthor={true} menuPadding={true} + layout={'wide'} > {props.title} -
- - {props.person.post} - -
+ + {props.person.post} + ) diff --git a/src/components/App/index.tsx b/src/components/App/index.tsx index 6993b4e9..7a3d3fc5 100644 --- a/src/components/App/index.tsx +++ b/src/components/App/index.tsx @@ -16,11 +16,10 @@ export interface IAppProps { menu: any showAuthor: boolean menuPadding: boolean - layout?: 'full' | 'wide' | 'thin' + layout: 'full' | 'wide' | 'thin' } export const App: React.FC = props => { - const layout = props.layout ? props.layout : 'full' const motionDisabled = useReducedMotion() return ( @@ -36,7 +35,7 @@ export const App: React.FC = props => {
-