From 6649361db70647ea3ea707345d37a540da1a2f7e Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Wed, 19 Feb 2020 12:52:15 -0300 Subject: [PATCH] [FIX] Admin height if the blue banner is opened (#16629) * fix admin height * fix review --- client/components/basic/Page.js | 2 +- client/routes.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/client/components/basic/Page.js b/client/components/basic/Page.js index ddf01872c40..67034e0caec 100644 --- a/client/components/basic/Page.js +++ b/client/components/basic/Page.js @@ -5,7 +5,7 @@ import { BurgerMenuButton } from './BurgerMenuButton'; export function Page(props) { return - ({ height: '100vh' }), [])} {...props} /> + ({ height: '100%' }), [])} {...props} /> ; } diff --git a/client/routes.js b/client/routes.js index 515a6b2a6da..ce613e76b18 100644 --- a/client/routes.js +++ b/client/routes.js @@ -233,19 +233,20 @@ FlowRouter.route('/setup-wizard/:step?', { }, }); +const style = 'overflow: hidden; flex: 1 1 auto; height: 1%;'; FlowRouter.route('/admin/:group?', { name: 'admin', action: async ({ group = 'info' } = {}) => { switch (group) { case 'info': { const { InformationRoute } = await import('./components/admin/info/InformationRoute'); - BlazeLayout.render('main', { center: await createTemplateForComponent(InformationRoute) }); + BlazeLayout.render('main', { center: await createTemplateForComponent(InformationRoute, { }, () => HTML.DIV({ style })) }); // eslint-disable-line break; } default: { const { SettingsRoute } = await import('./components/admin/settings/SettingsRoute'); - BlazeLayout.render('main', { center: await createTemplateForComponent(SettingsRoute, { group }) }); + BlazeLayout.render('main', { center: await createTemplateForComponent(SettingsRoute, { group }, () => HTML.DIV({ style })) }); // eslint-disable-line // BlazeLayout.render('main', { center: 'admin' }); } }