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
195f90a8
Unverified
Commit
195f90a8
authored
2 years ago
by
Douglas Fabris
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Regression: Missing settings group descriptions (#25639)
parent
31ae30f3
No related branches found
No related tags found
No related merge requests found
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
apps/meteor/client/views/admin/settings/SettingsGroupCard.tsx
+5
-2
5 additions, 2 deletions
.../meteor/client/views/admin/settings/SettingsGroupCard.tsx
apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
+74
-28
74 additions, 28 deletions
apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
with
79 additions
and
30 deletions
apps/meteor/client/views/admin/settings/SettingsGroupCard.tsx
+
5
−
2
View file @
195f90a8
...
...
@@ -6,11 +6,12 @@ import { useRoute, TranslationKey, useTranslation } from '@rocket.chat/ui-contex
import
React
,
{
ReactElement
}
from
'
react
'
;
import
Card
from
'
../../../components/Card
'
;
import
MarkdownText
from
'
../../../components/MarkdownText
'
;
const
clampStyle
=
css
`
display: -webkit-box;
overflow: hidden;
-webkit-line-clamp:
4
;
-webkit-line-clamp:
5
;
-webkit-box-orient: vertical;
`
;
...
...
@@ -38,7 +39,9 @@ const SettingsGroupCard = ({ id, title, description }: SettingsGroupCard): React
<
Box
fontScale
=
'h4'
>
{
t
(
title
)
}
</
Box
>
</
Card
.
Title
>
<
Card
.
Body
height
=
'x88'
>
<
Box
className
=
{
clampStyle
}
>
{
description
&&
t
.
has
(
description
)
&&
t
(
description
)
}
</
Box
>
<
Box
className
=
{
clampStyle
}
>
{
description
&&
t
.
has
(
description
)
&&
<
MarkdownText
variant
=
'inlineWithoutBreaks'
content
=
{
t
(
description
)
}
/>
}
</
Box
>
</
Card
.
Body
>
<
Card
.
Footer
>
<
Button
small
onClick
=
{
handleOpenGroup
}
>
...
...
This diff is collapsed.
Click to expand it.
apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
+
74
−
28
View file @
195f90a8
This diff is collapsed.
Click to expand it.
Git Mirror User
@gitmirror
mentioned in commit
0179e1b5
·
2 years ago
mentioned in commit
0179e1b5
mentioned in commit 0179e1b54557aea885e7c89b8dcb868fc3e9a65f
Toggle commit list
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