Skip to content

Commit

Permalink
[FIX] Menu options margin spacing (RocketChat#26775)
Browse files Browse the repository at this point in the history
  • Loading branch information
guijun13 authored Sep 6, 2022
1 parent 5240f16 commit 01c8786
Show file tree
Hide file tree
Showing 7 changed files with 80 additions and 22 deletions.
2 changes: 1 addition & 1 deletion apps/meteor/client/sidebar/header/UserDropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ const UserDropdown = ({ user, onClose }: UserDropdownProps): ReactElement => {

return (
<Box display='flex' flexDirection='column' w={!isMobile ? '244px' : undefined}>
<Box pi='x16' display='flex' flexDirection='row' alignItems='center'>
<Box pi='x12' display='flex' flexDirection='row' alignItems='center'>
<Box mie='x4'>
<UserAvatar size='x36' username={username || ''} etag={avatarETag} />
</Box>
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
"@rocket.chat/favicon": "workspace:^",
"@rocket.chat/forked-matrix-appservice-bridge": "^4.0.1",
"@rocket.chat/forked-matrix-bot-sdk": "^0.6.0-beta.2",
"@rocket.chat/fuselage": "0.31.18",
"@rocket.chat/fuselage": "next",
"@rocket.chat/fuselage-hooks": "0.31.18",
"@rocket.chat/fuselage-polyfills": "0.31.18",
"@rocket.chat/fuselage-toastbar": "0.31.18",
Expand Down
2 changes: 1 addition & 1 deletion packages/fuselage-ui-kit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"devDependencies": {
"@rocket.chat/apps-engine": "~1.30.0",
"@rocket.chat/eslint-config": "workspace:^",
"@rocket.chat/fuselage": "0.31.18",
"@rocket.chat/fuselage": "next",
"@rocket.chat/fuselage-hooks": "0.31.18",
"@rocket.chat/fuselage-polyfills": "0.31.18",
"@rocket.chat/icons": "0.31.18",
Expand Down
2 changes: 1 addition & 1 deletion packages/gazzodown/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"@mdx-js/react": "^1.6.22",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/css-in-js": "0.31.18",
"@rocket.chat/fuselage": "0.31.18",
"@rocket.chat/fuselage": "next",
"@rocket.chat/fuselage-tokens": "0.31.18",
"@rocket.chat/message-parser": "0.31.18",
"@rocket.chat/styled": "0.31.18",
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"devDependencies": {
"@rocket.chat/css-in-js": "0.31.18",
"@rocket.chat/fuselage": "0.31.18",
"@rocket.chat/fuselage": "next",
"@rocket.chat/fuselage-hooks": "0.31.18",
"@rocket.chat/icons": "0.31.18",
"@rocket.chat/ui-contexts": "workspace:~",
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-video-conf/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"devDependencies": {
"@rocket.chat/css-in-js": "0.31.18",
"@rocket.chat/eslint-config": "workspace:^",
"@rocket.chat/fuselage": "0.31.18",
"@rocket.chat/fuselage": "next",
"@rocket.chat/fuselage-hooks": "0.31.18",
"@rocket.chat/styled": "0.31.18",
"@types/jest": "^27.4.1",
Expand Down
90 changes: 74 additions & 16 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3333,6 +3333,19 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/css-in-js@npm:~0.31.19-dev.10":
version: 0.31.19-dev.10
resolution: "@rocket.chat/css-in-js@npm:0.31.19-dev.10"
dependencies:
"@emotion/hash": ^0.8.0
"@rocket.chat/css-supports": ~0.31.19-dev.10
"@rocket.chat/memo": ~0.31.19-dev.10
"@rocket.chat/stylis-logical-props-middleware": ~0.31.19-dev.10
stylis: ~4.0.13
checksum: 9e69aae1bb1243abbc4a9fd864817e38d8ace88e80f39f9c58701afcf589cb8080d308943c431bea8ff48854dec756637bc8bb4d0e5cdad621406050cb86fd46
languageName: node
linkType: hard

"@rocket.chat/css-supports@npm:^0.31.18":
version: 0.31.18
resolution: "@rocket.chat/css-supports@npm:0.31.18"
Expand All @@ -3342,6 +3355,15 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/css-supports@npm:~0.31.19-dev.10":
version: 0.31.19-dev.10
resolution: "@rocket.chat/css-supports@npm:0.31.19-dev.10"
dependencies:
"@rocket.chat/memo": ~0.31.19-dev.10
checksum: 4374ebc9bf43d3b6ab42d1f2daa5d426950d32a49de19b97e1f54214e1b608d21b9311883419138774bb41d220e5e23ab5195d1b1ae40b6d03d931502c488b15
languageName: node
linkType: hard

"@rocket.chat/ddp-streamer@workspace:ee/apps/ddp-streamer":
version: 0.0.0-use.local
resolution: "@rocket.chat/ddp-streamer@workspace:ee/apps/ddp-streamer"
Expand Down Expand Up @@ -3527,13 +3549,20 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/fuselage-tokens@npm:0.31.18, @rocket.chat/fuselage-tokens@npm:^0.31.18":
"@rocket.chat/fuselage-tokens@npm:0.31.18":
version: 0.31.18
resolution: "@rocket.chat/fuselage-tokens@npm:0.31.18"
checksum: b8dc4c9ca4abef4c4d95c5b927b2f5a6a4aa38cee4cb22c58425f7423edf5424966de161af2686904be6c6fb4da0f3174b13e10872ee3a05cc6367aaadf0153a
languageName: node
linkType: hard

"@rocket.chat/fuselage-tokens@npm:~0.32.0-dev.92":
version: 0.32.0-dev.92
resolution: "@rocket.chat/fuselage-tokens@npm:0.32.0-dev.92"
checksum: 57121863319fed1a69f05f95eb28478bd8e8a3fd0b99712adf61a22f0f88b874f65242b53bb5353c06a949def0e0f737fdba377f1053ff6662db9887fd9658cd
languageName: node
linkType: hard

"@rocket.chat/fuselage-ui-kit@npm:0.31.18":
version: 0.31.18
resolution: "@rocket.chat/fuselage-ui-kit@npm:0.31.18"
Expand All @@ -3558,7 +3587,7 @@ __metadata:
dependencies:
"@rocket.chat/apps-engine": ~1.30.0
"@rocket.chat/eslint-config": "workspace:^"
"@rocket.chat/fuselage": 0.31.18
"@rocket.chat/fuselage": next
"@rocket.chat/fuselage-hooks": 0.31.18
"@rocket.chat/fuselage-polyfills": 0.31.18
"@rocket.chat/icons": 0.31.18
Expand Down Expand Up @@ -3598,15 +3627,15 @@ __metadata:
languageName: unknown
linkType: soft

"@rocket.chat/fuselage@npm:0.31.18":
version: 0.31.18
resolution: "@rocket.chat/fuselage@npm:0.31.18"
"@rocket.chat/fuselage@npm:next":
version: 0.32.0-dev.142
resolution: "@rocket.chat/fuselage@npm:0.32.0-dev.142"
dependencies:
"@rocket.chat/css-in-js": ^0.31.18
"@rocket.chat/css-supports": ^0.31.18
"@rocket.chat/fuselage-tokens": ^0.31.18
"@rocket.chat/memo": ^0.31.18
"@rocket.chat/styled": ^0.31.18
"@rocket.chat/css-in-js": ~0.31.19-dev.10
"@rocket.chat/css-supports": ~0.31.19-dev.10
"@rocket.chat/fuselage-tokens": ~0.32.0-dev.92
"@rocket.chat/memo": ~0.31.19-dev.10
"@rocket.chat/styled": ~0.31.19-dev.10
invariant: ^2.2.4
react-keyed-flatten-children: ^1.3.0
peerDependencies:
Expand All @@ -3616,7 +3645,7 @@ __metadata:
react: ^17.0.2
react-dom: ^17.0.2
react-virtuoso: 1.2.4
checksum: bc78ea2d302381ab122ceccbc77b3a97653aa8d9293b25009e6f37b04d59ff608371c9dce2de243651199c6bb9e6d176c6f19d1022bad9a71dfd705caca9590f
checksum: fd9f30f2229c8e41b46e23b37beb5acc58c796a06cfc0fd1f7c1c877b349db257af58b31a12ab4a5606b6a6d8ae268ad2424893226d93cb373bcb8207bfbb656
languageName: node
linkType: hard

Expand All @@ -3628,7 +3657,7 @@ __metadata:
"@mdx-js/react": ^1.6.22
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/css-in-js": 0.31.18
"@rocket.chat/fuselage": 0.31.18
"@rocket.chat/fuselage": next
"@rocket.chat/fuselage-tokens": 0.31.18
"@rocket.chat/message-parser": 0.31.18
"@rocket.chat/styled": 0.31.18
Expand Down Expand Up @@ -3804,6 +3833,13 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/memo@npm:~0.31.19-dev.10":
version: 0.31.19-dev.10
resolution: "@rocket.chat/memo@npm:0.31.19-dev.10"
checksum: de95f407d449c04bd61a4a1c9aea81ba5ee0bb421c168b9297d49de60fcb04b6ae6aa0e3f8ebca03ba38b815238c0fe367541a171943bda0521598ee7c429d64
languageName: node
linkType: hard

"@rocket.chat/message-parser@npm:0.31.18":
version: 0.31.18
resolution: "@rocket.chat/message-parser@npm:0.31.18"
Expand Down Expand Up @@ -3843,7 +3879,7 @@ __metadata:
"@rocket.chat/favicon": "workspace:^"
"@rocket.chat/forked-matrix-appservice-bridge": ^4.0.1
"@rocket.chat/forked-matrix-bot-sdk": ^0.6.0-beta.2
"@rocket.chat/fuselage": 0.31.18
"@rocket.chat/fuselage": next
"@rocket.chat/fuselage-hooks": 0.31.18
"@rocket.chat/fuselage-polyfills": 0.31.18
"@rocket.chat/fuselage-toastbar": 0.31.18
Expand Down Expand Up @@ -4266,6 +4302,16 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/styled@npm:~0.31.19-dev.10":
version: 0.31.19-dev.10
resolution: "@rocket.chat/styled@npm:0.31.19-dev.10"
dependencies:
"@rocket.chat/css-in-js": ~0.31.19-dev.10
tslib: ^2.3.1
checksum: 0ebfbdbd374e2ef861bae34344160bbdf0a9aafe6a29b455202326c25daaf36e3b934b773938ca03e2e5b95166e5996fb23b93a1ff033034e8f1fd59e2791b89
languageName: node
linkType: hard

"@rocket.chat/stylis-logical-props-middleware@npm:^0.31.18":
version: 0.31.18
resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.18"
Expand All @@ -4278,12 +4324,24 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/stylis-logical-props-middleware@npm:~0.31.19-dev.10":
version: 0.31.19-dev.10
resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.19-dev.10"
dependencies:
"@rocket.chat/css-supports": ~0.31.19-dev.10
tslib: ^2.3.1
peerDependencies:
stylis: 4.0.10
checksum: d2a2baac81ae7bd1dfe62dbbc14350eda95c1419f211648f1ff4148d3700a4270cb5c4922dd79b3276257af09efcd42d95c6b898653b2e67fbae1f1b64ff245a
languageName: node
linkType: hard

"@rocket.chat/ui-client@workspace:^, @rocket.chat/ui-client@workspace:packages/ui-client":
version: 0.0.0-use.local
resolution: "@rocket.chat/ui-client@workspace:packages/ui-client"
dependencies:
"@rocket.chat/css-in-js": 0.31.18
"@rocket.chat/fuselage": 0.31.18
"@rocket.chat/fuselage": next
"@rocket.chat/fuselage-hooks": 0.31.18
"@rocket.chat/icons": 0.31.18
"@rocket.chat/ui-contexts": "workspace:~"
Expand Down Expand Up @@ -4373,7 +4431,7 @@ __metadata:
dependencies:
"@rocket.chat/css-in-js": 0.31.18
"@rocket.chat/eslint-config": "workspace:^"
"@rocket.chat/fuselage": 0.31.18
"@rocket.chat/fuselage": next
"@rocket.chat/fuselage-hooks": 0.31.18
"@rocket.chat/styled": 0.31.18
"@types/jest": ^27.4.1
Expand Down Expand Up @@ -20301,7 +20359,7 @@ __metadata:
optional: true
bin:
lessc: ./bin/lessc
checksum: c9b8c0e865427112c48a9cac36f14964e130577743c29d56a6d93b5812b70846b04ccaa364acf1e8d75cee3855215ec0a2d8d9de569c80e774f10b6245f39b7d
checksum: 61568b56b5289fdcfe3d51baf3c13e7db7140022c0a37ef0ae343169f0de927a4b4f4272bc10c20101796e8ee79e934e024051321bba93b3ae071f734309bd98
languageName: node
linkType: hard

Expand Down

0 comments on commit 01c8786

Please sign in to comment.