Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Fuselage …
Browse files Browse the repository at this point in the history 
…into feat/createCloudWorkspaceForm

* 'develop' of github.com:RocketChat/Rocket.Chat.Fuselage:
  fix(onboarding-ui): Labels wrapping under checkbox (#509)
  • Loading branch information
@gabriellsh
gabriellsh committed Aug 5, 2021
2 parents 7c56b99 + 99b873e commit 6532f31
Show file tree
Hide file tree
Showing 2 changed files with 83 additions and 68 deletions.
19 changes: 17 additions & 2 deletions packages/onboarding-ui/src/forms/RegisterServerForm/RegisterOptionCard.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,28 @@ const RegisterOptionCard = (): ReactElement => {
</OptionCard.Block>
<Divider />
<OptionCard.Block>
<Box mbe='x8' display='block' color='info' fontScale='c1'>
<Box
mbe='x8'
display='flex'
flexDirection='row'
alignItems='flex-start'
color='info'
fontScale='c1'
lineHeight={20}
>
<CheckBox mie='x8' disabled={!selected} {...register('updates')} />{' '}
<label htmlFor='updates'>
{t('form.serverRegistrationForm.register.includeUpdates')}
</label>
</Box>
<Box color='default' fontScale='c1'>
<Box
display='flex'
flexDirection='row'
alignItems='flex-start'
color='default'
fontScale='c1'
lineHeight={20}
>
<CheckBox
mie='x8'
disabled={!selected}
Expand Down
132 changes: 66 additions & 66 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5274,14 +5274,14 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/css-in-js@^0.27.0, @rocket.chat/css-in-js@workspace:packages/css-in-js":
"@rocket.chat/css-in-js@^0.28.0, @rocket.chat/css-in-js@workspace:packages/css-in-js":
version: 0.0.0-use.local
resolution: "@rocket.chat/css-in-js@workspace:packages/css-in-js"
dependencies:
"@emotion/hash": ^0.8.0
"@rocket.chat/eslint-config-alt": ^0.27.0
"@rocket.chat/memo": ^0.27.0
"@rocket.chat/prettier-config": ^0.27.0
"@rocket.chat/eslint-config-alt": ^0.28.0
"@rocket.chat/memo": ^0.28.0
"@rocket.chat/prettier-config": ^0.28.0
"@rollup/plugin-commonjs": ^19.0.0
"@rollup/plugin-json": ^4.1.0
"@rollup/plugin-node-resolve": ^13.0.0
Expand All @@ -5305,8 +5305,8 @@ __metadata:
version: 0.0.0-use.local
resolution: "@rocket.chat/emitter@workspace:packages/emitter"
dependencies:
"@rocket.chat/eslint-config-alt": ^0.27.0
"@rocket.chat/prettier-config": ^0.27.0
"@rocket.chat/eslint-config-alt": ^0.28.0
"@rocket.chat/prettier-config": ^0.28.0
"@rollup/plugin-commonjs": ^19.0.0
"@rollup/plugin-json": ^4.1.0
"@rollup/plugin-node-resolve": ^13.0.0
Expand All @@ -5326,7 +5326,7 @@ __metadata:
languageName: unknown
linkType: soft

"@rocket.chat/eslint-config-alt@^0.27.0, @rocket.chat/eslint-config-alt@workspace:packages/eslint-config-alt":
"@rocket.chat/eslint-config-alt@^0.28.0, @rocket.chat/eslint-config-alt@workspace:packages/eslint-config-alt":
version: 0.0.0-use.local
resolution: "@rocket.chat/eslint-config-alt@workspace:packages/eslint-config-alt"
dependencies:
Expand Down Expand Up @@ -5362,13 +5362,13 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/fuselage-hooks@^0.27.0, @rocket.chat/fuselage-hooks@workspace:packages/fuselage-hooks":
"@rocket.chat/fuselage-hooks@^0.28.0, @rocket.chat/fuselage-hooks@workspace:packages/fuselage-hooks":
version: 0.0.0-use.local
resolution: "@rocket.chat/fuselage-hooks@workspace:packages/fuselage-hooks"
dependencies:
"@rocket.chat/eslint-config-alt": ^0.27.0
"@rocket.chat/fuselage-tokens": ^0.27.0
"@rocket.chat/prettier-config": ^0.27.0
"@rocket.chat/eslint-config-alt": ^0.28.0
"@rocket.chat/fuselage-tokens": ^0.28.0
"@rocket.chat/prettier-config": ^0.28.0
"@rollup/plugin-commonjs": ^19.0.0
"@rollup/plugin-json": ^4.1.0
"@rollup/plugin-node-resolve": ^13.0.0
Expand Down Expand Up @@ -5399,13 +5399,13 @@ __metadata:
languageName: unknown
linkType: soft

"@rocket.chat/fuselage-polyfills@^0.27.0, @rocket.chat/fuselage-polyfills@workspace:packages/fuselage-polyfills":
"@rocket.chat/fuselage-polyfills@^0.28.0, @rocket.chat/fuselage-polyfills@workspace:packages/fuselage-polyfills":
version: 0.0.0-use.local
resolution: "@rocket.chat/fuselage-polyfills@workspace:packages/fuselage-polyfills"
dependencies:
"@juggle/resize-observer": ^3.3.1
"@rocket.chat/eslint-config-alt": ^0.27.0
"@rocket.chat/prettier-config": ^0.27.0
"@rocket.chat/eslint-config-alt": ^0.28.0
"@rocket.chat/prettier-config": ^0.28.0
clipboard-polyfill: ^3.0.3
element-closest-polyfill: ^1.0.4
eslint: ^7.29.0
Expand All @@ -5417,12 +5417,12 @@ __metadata:
languageName: unknown
linkType: soft

"@rocket.chat/fuselage-tokens@^0.27.0, @rocket.chat/fuselage-tokens@workspace:packages/fuselage-tokens":
"@rocket.chat/fuselage-tokens@^0.28.0, @rocket.chat/fuselage-tokens@workspace:packages/fuselage-tokens":
version: 0.0.0-use.local
resolution: "@rocket.chat/fuselage-tokens@workspace:packages/fuselage-tokens"
dependencies:
"@rocket.chat/eslint-config-alt": ^0.27.0
"@rocket.chat/prettier-config": ^0.27.0
"@rocket.chat/eslint-config-alt": ^0.28.0
"@rocket.chat/prettier-config": ^0.28.0
eslint: ^7.29.0
eslint-config-prettier: ^8.3.0
eslint-plugin-import: ^2.23.4
Expand All @@ -5443,13 +5443,13 @@ __metadata:
"@babel/preset-env": ^7.14.7
"@babel/preset-react": ^7.14.5
"@rocket.chat/apps-engine": ^1.27.1
"@rocket.chat/eslint-config-alt": ^0.27.0
"@rocket.chat/fuselage": ^0.27.0
"@rocket.chat/fuselage-hooks": ^0.27.0
"@rocket.chat/fuselage-polyfills": ^0.27.0
"@rocket.chat/icons": ^0.27.0
"@rocket.chat/prettier-config": ^0.27.0
"@rocket.chat/ui-kit": ^0.27.0
"@rocket.chat/eslint-config-alt": ^0.28.0
"@rocket.chat/fuselage": ^0.28.0
"@rocket.chat/fuselage-hooks": ^0.28.0
"@rocket.chat/fuselage-polyfills": ^0.28.0
"@rocket.chat/icons": ^0.28.0
"@rocket.chat/prettier-config": ^0.28.0
"@rocket.chat/ui-kit": ^0.28.0
"@storybook/addon-essentials": ^6.3.4
"@storybook/addons": ^6.3.4
"@storybook/builder-webpack5": ^6.3.4
Expand Down Expand Up @@ -5482,7 +5482,7 @@ __metadata:
languageName: unknown
linkType: soft

"@rocket.chat/fuselage@^0.27.0, @rocket.chat/fuselage@workspace:packages/fuselage":
"@rocket.chat/fuselage@^0.28.0, @rocket.chat/fuselage@workspace:packages/fuselage":
version: 0.0.0-use.local
resolution: "@rocket.chat/fuselage@workspace:packages/fuselage"
dependencies:
Expand All @@ -5491,15 +5491,15 @@ __metadata:
"@babel/plugin-transform-runtime": ^7.14.5
"@babel/preset-env": ^7.14.7
"@babel/preset-react": ^7.14.5
"@rocket.chat/css-in-js": ^0.27.0
"@rocket.chat/css-in-js": ^0.28.0
"@rocket.chat/eslint-config": ^0.4.0
"@rocket.chat/eslint-config-alt": ^0.27.0
"@rocket.chat/fuselage-hooks": ^0.27.0
"@rocket.chat/fuselage-polyfills": ^0.27.0
"@rocket.chat/fuselage-tokens": ^0.27.0
"@rocket.chat/icons": ^0.27.0
"@rocket.chat/memo": ^0.27.0
"@rocket.chat/prettier-config": ^0.27.0
"@rocket.chat/eslint-config-alt": ^0.28.0
"@rocket.chat/fuselage-hooks": ^0.28.0
"@rocket.chat/fuselage-polyfills": ^0.28.0
"@rocket.chat/fuselage-tokens": ^0.28.0
"@rocket.chat/icons": ^0.28.0
"@rocket.chat/memo": ^0.28.0
"@rocket.chat/prettier-config": ^0.28.0
"@storybook/addon-essentials": ^6.3.4
"@storybook/addon-jest": ^6.3.4
"@storybook/addon-links": ^6.3.4
Expand Down Expand Up @@ -5565,12 +5565,12 @@ __metadata:
languageName: unknown
linkType: soft

"@rocket.chat/icons@^0.27.0, @rocket.chat/icons@workspace:packages/icons":
"@rocket.chat/icons@^0.28.0, @rocket.chat/icons@workspace:packages/icons":
version: 0.0.0-use.local
resolution: "@rocket.chat/icons@workspace:packages/icons"
dependencies:
"@rocket.chat/eslint-config-alt": ^0.27.0
"@rocket.chat/prettier-config": ^0.27.0
"@rocket.chat/eslint-config-alt": ^0.28.0
"@rocket.chat/prettier-config": ^0.28.0
eslint: ^7.29.0
glob: ^7.1.7
lint-staged: ^11.0.0
Expand All @@ -5587,12 +5587,12 @@ __metadata:
languageName: unknown
linkType: soft

"@rocket.chat/memo@^0.27.0, @rocket.chat/memo@workspace:packages/memo":
"@rocket.chat/memo@^0.28.0, @rocket.chat/memo@workspace:packages/memo":
version: 0.0.0-use.local
resolution: "@rocket.chat/memo@workspace:packages/memo"
dependencies:
"@rocket.chat/eslint-config-alt": ^0.27.0
"@rocket.chat/prettier-config": ^0.27.0
"@rocket.chat/eslint-config-alt": ^0.28.0
"@rocket.chat/prettier-config": ^0.28.0
downlevel-dts: ^0.7.0
eslint: ^7.29.0
lint-staged: ^11.0.0
Expand All @@ -5612,9 +5612,9 @@ __metadata:
"@babel/core": ^7.14.6
"@babel/eslint-parser": ^7.14.7
"@babel/preset-env": ^7.14.7
"@rocket.chat/eslint-config-alt": ^0.27.0
"@rocket.chat/peggy-loader": ^0.27.0
"@rocket.chat/prettier-config": ^0.27.0
"@rocket.chat/eslint-config-alt": ^0.28.0
"@rocket.chat/peggy-loader": ^0.28.0
"@rocket.chat/prettier-config": ^0.28.0
"@types/jest": ^26.0.24
"@types/node": ^15.14.1
"@typescript-eslint/parser": ^4.28.2
Expand Down Expand Up @@ -5644,8 +5644,8 @@ __metadata:
"@babel/plugin-transform-runtime": ^7.14.5
"@babel/preset-env": ^7.14.7
"@babel/preset-typescript": ^7.14.5
"@rocket.chat/eslint-config-alt": ^0.27.0
"@rocket.chat/prettier-config": ^0.27.0
"@rocket.chat/eslint-config-alt": ^0.28.0
"@rocket.chat/prettier-config": ^0.28.0
"@rollup/plugin-commonjs": ^19.0.0
"@rollup/plugin-node-resolve": ^13.0.0
"@rollup/plugin-typescript": ^8.2.1
Expand All @@ -5665,14 +5665,14 @@ __metadata:
version: 0.0.0-use.local
resolution: "@rocket.chat/onboarding-ui@workspace:packages/onboarding-ui"
dependencies:
"@rocket.chat/eslint-config-alt": ^0.27.0
"@rocket.chat/fuselage": ^0.27.0
"@rocket.chat/fuselage-hooks": ^0.27.0
"@rocket.chat/fuselage-polyfills": ^0.27.0
"@rocket.chat/fuselage-tokens": ^0.27.0
"@rocket.chat/icons": ^0.27.0
"@rocket.chat/prettier-config": ^0.27.0
"@rocket.chat/styled": ^0.27.0
"@rocket.chat/eslint-config-alt": ^0.28.0
"@rocket.chat/fuselage": ^0.28.0
"@rocket.chat/fuselage-hooks": ^0.28.0
"@rocket.chat/fuselage-polyfills": ^0.28.0
"@rocket.chat/fuselage-tokens": ^0.28.0
"@rocket.chat/icons": ^0.28.0
"@rocket.chat/prettier-config": ^0.28.0
"@rocket.chat/styled": ^0.28.0
"@storybook/addon-essentials": ^6.3.4
"@storybook/addons": ^6.3.4
"@storybook/react": ^6.3.4
Expand Down Expand Up @@ -5706,12 +5706,12 @@ __metadata:
languageName: unknown
linkType: soft

"@rocket.chat/peggy-loader@^0.27.0, @rocket.chat/peggy-loader@workspace:packages/peggy-loader":
"@rocket.chat/peggy-loader@^0.28.0, @rocket.chat/peggy-loader@workspace:packages/peggy-loader":
version: 0.0.0-use.local
resolution: "@rocket.chat/peggy-loader@workspace:packages/peggy-loader"
dependencies:
"@rocket.chat/eslint-config-alt": ^0.27.0
"@rocket.chat/prettier-config": ^0.27.0
"@rocket.chat/eslint-config-alt": ^0.28.0
"@rocket.chat/prettier-config": ^0.28.0
"@types/loader-utils": ^2.0.3
"@types/node": ^15.14.1
downlevel-dts: ^0.7.0
Expand All @@ -5732,7 +5732,7 @@ __metadata:
languageName: unknown
linkType: soft

"@rocket.chat/prettier-config@^0.27.0, @rocket.chat/prettier-config@workspace:packages/prettier-config":
"@rocket.chat/prettier-config@^0.28.0, @rocket.chat/prettier-config@workspace:packages/prettier-config":
version: 0.0.0-use.local
resolution: "@rocket.chat/prettier-config@workspace:packages/prettier-config"
dependencies:
Expand All @@ -5752,8 +5752,8 @@ __metadata:
version: 0.0.0-use.local
resolution: "@rocket.chat/string-helpers@workspace:packages/string-helpers"
dependencies:
"@rocket.chat/eslint-config-alt": ^0.27.0
"@rocket.chat/prettier-config": ^0.27.0
"@rocket.chat/eslint-config-alt": ^0.28.0
"@rocket.chat/prettier-config": ^0.28.0
"@types/jest": ^26.0.24
downlevel-dts: ^0.7.0
eslint: ^7.29.0
Expand All @@ -5769,12 +5769,12 @@ __metadata:
languageName: unknown
linkType: soft

"@rocket.chat/styled@^0.27.0, @rocket.chat/styled@workspace:packages/styled":
"@rocket.chat/styled@^0.28.0, @rocket.chat/styled@workspace:packages/styled":
version: 0.0.0-use.local
resolution: "@rocket.chat/styled@workspace:packages/styled"
dependencies:
"@rocket.chat/eslint-config-alt": ^0.27.0
"@rocket.chat/prettier-config": ^0.27.0
"@rocket.chat/eslint-config-alt": ^0.28.0
"@rocket.chat/prettier-config": ^0.28.0
"@types/jest": ^26.0.24
downlevel-dts: ^0.7.0
eslint: ^7.29.0
Expand All @@ -5790,16 +5790,16 @@ __metadata:
languageName: unknown
linkType: soft

"@rocket.chat/ui-kit@^0.27.0, @rocket.chat/ui-kit@workspace:packages/ui-kit":
"@rocket.chat/ui-kit@^0.28.0, @rocket.chat/ui-kit@workspace:packages/ui-kit":
version: 0.0.0-use.local
resolution: "@rocket.chat/ui-kit@workspace:packages/ui-kit"
dependencies:
"@babel/core": ^7.14.6
"@babel/eslint-parser": ^7.14.7
"@babel/plugin-transform-runtime": ^7.14.5
"@babel/preset-env": ^7.14.7
"@rocket.chat/eslint-config-alt": ^0.27.0
"@rocket.chat/prettier-config": ^0.27.0
"@rocket.chat/eslint-config-alt": ^0.28.0
"@rocket.chat/prettier-config": ^0.28.0
"@types/jest": ^26.0.24
babel-loader: ^8.2.2
downlevel-dts: ^0.7.0
Expand Down Expand Up @@ -23247,8 +23247,8 @@ resolve@^2.0.0-next.3:
version: 0.0.0-use.local
resolution: "scripts@workspace:scripts"
dependencies:
"@rocket.chat/eslint-config-alt": ^0.27.0
"@rocket.chat/prettier-config": ^0.27.0
"@rocket.chat/eslint-config-alt": ^0.28.0
"@rocket.chat/prettier-config": ^0.28.0
"@types/node": ^15.14.1
"@typescript-eslint/parser": ^4.28.2
endent: ^2.1.0
Expand Down

0 comments on commit 6532f31

Please sign in to comment.