Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
Rocket.Chat
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RocketChat
Rocket.Chat
Commits
6649361d
Unverified
Commit
6649361d
authored
5 years ago
by
Guilherme Gazzo
Committed by
Diego Sampaio
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[FIX] Admin height if the blue banner is opened (#16629)
* fix admin height * fix review
parent
ea3a31af
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
client/components/basic/Page.js
+1
-1
1 addition, 1 deletion
client/components/basic/Page.js
client/routes.js
+3
-2
3 additions, 2 deletions
client/routes.js
with
4 additions
and
3 deletions
client/components/basic/Page.js
+
1
−
1
View file @
6649361d
...
...
@@ -5,7 +5,7 @@ import { BurgerMenuButton } from './BurgerMenuButton';
export
function
Page
(
props
)
{
return
<
Flex
.
Container
direction
=
'
column
'
>
<
Box
is
=
'
section
'
style
=
{
useMemo
(()
=>
({
height
:
'
100
vh
'
}),
[])}
{...
props
}
/
>
<
Box
is
=
'
section
'
style
=
{
useMemo
(()
=>
({
height
:
'
100
%
'
}),
[])}
{...
props
}
/
>
<
/Flex.Container>
;
}
...
...
This diff is collapsed.
Click to expand it.
client/routes.js
+
3
−
2
View file @
6649361d
...
...
@@ -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' });
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment