Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Regression: Sidebar icons spacing #26139

Merged
merged 10 commits into from
Jul 14, 2022
Merged

Regression: Sidebar icons spacing #26139

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3a6f2a8
fix sidebar icons spacing
guijun13 Jul 5, 2022
3abb96e
Merge branch 'develop' into fix/sidebar-icons
guijun13 Jul 8, 2022
ceb446f
remove box component
guijun13 Jul 13, 2022
cf089ca
Merge branch 'develop' into fix/sidebar-icons
guijun13 Jul 13, 2022
6f1ead3
Merge branch 'develop' into fix/sidebar-icons
guijun13 Jul 13, 2022
b35346a
Merge remote-tracking branch 'origin/develop' into fix/sidebar-icons
ggazzo Jul 14, 2022
e69f536
fixing some alignments of our omnichannel friend
ggazzo Jul 14, 2022
e317de1
fixing some alignments of our omnichannel friend
ggazzo Jul 14, 2022
2ce1c46
Merge branch 'fix/sidebar-icons' of github.com:RocketChat/Rocket.Chat…
ggazzo Jul 14, 2022
bd0783b
handle fuselage upgrade
ggazzo Jul 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apps/meteor/client/sidebar/header/actions/CreateRoom.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Box, Sidebar, Dropdown } from '@rocket.chat/fuselage';
import { Sidebar, Dropdown, Box } from '@rocket.chat/fuselage';
import { useAtLeastOnePermission } from '@rocket.chat/ui-contexts';
import React, { HTMLAttributes, useRef, VFC } from 'react';
import { createPortal } from 'react-dom';
Expand All @@ -18,8 +18,8 @@ const CreateRoom: VFC<Omit<HTMLAttributes<HTMLElement>, 'is'>> = (props) => {
return (
<>
{showCreate && (
<Box ref={reference}>
<Sidebar.TopBar.Action {...props} icon='edit-rounded' onClick={(): void => toggle()} />
<Box ref={reference} {...props}>
<Sidebar.TopBar.Action icon='edit-rounded' onClick={(): void => toggle()} />
ggazzo marked this conversation as resolved.
Show resolved Hide resolved
</Box>
)}
{isVisible &&
Expand Down
6 changes: 3 additions & 3 deletions apps/meteor/client/sidebar/header/actions/Sort.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Box, Sidebar, Dropdown } from '@rocket.chat/fuselage';
import { Sidebar, Dropdown, Box } from '@rocket.chat/fuselage';
import React, { VFC, useRef, HTMLAttributes } from 'react';
import { createPortal } from 'react-dom';

Expand All @@ -12,8 +12,8 @@ const Sort: VFC<Omit<HTMLAttributes<HTMLElement>, 'is'>> = (props) => {

return (
<>
<Box ref={reference}>
<Sidebar.TopBar.Action {...props} icon='sort' onClick={(): void => toggle()} />
<Box ref={reference} {...props}>
<Sidebar.TopBar.Action icon='sort' onClick={(): void => toggle()} />
</Box>
{isVisible &&
createPortal(
Expand Down