diff --git a/src/json/text.json b/src/json/text.json index dc6ca63346..08b32219b7 100644 --- a/src/json/text.json +++ b/src/json/text.json @@ -1843,7 +1843,7 @@ "toastChatAttachmentsLimitReached": "You can upload only %s %s at a time", "toastWidget": "Widget %s has been added", - "toastJoinSpace": "You have joined the %s", + "toastJoinSpace": "You have joined %s", "textColor-grey": "Grey", "textColor-yellow": "Yellow", diff --git a/src/scss/menu/dataview/create/bookmark.scss b/src/scss/menu/dataview/create/bookmark.scss index 557a90a419..b2b1cef9d7 100644 --- a/src/scss/menu/dataview/create/bookmark.scss +++ b/src/scss/menu/dataview/create/bookmark.scss @@ -16,8 +16,8 @@ .buttons { flex-shrink: 0; color: var(--color-control-active); font-weight: 500; user-select: none; display: flex; gap: 0px 16px; height: 100%; } .buttons { .button { - display: inline-block; vertical-align: top; transition: $transitionAllCommon; color: var(--color-control-active); - background: none; border: 0px; padding: 0px; height: 100%; line-height: 44px; + display: inline-block; vertical-align: top; transition: $transitionAllCommon; background: none; border: 0px; padding: 0px; height: 100%; + line-height: 44px; } .button.hide { display: none; } .button:hover { color: var(--color-text-primary); } diff --git a/src/ts/component/util/label.tsx b/src/ts/component/util/label.tsx index cdfd87e929..7103b7d36c 100644 --- a/src/ts/component/util/label.tsx +++ b/src/ts/component/util/label.tsx @@ -27,6 +27,12 @@ const Label: FC = ({ }) => { const nodeRef = useRef(null); const cn = [ 'label' ]; + const dataProps = { ...dataset }; + + if (className.match(/animation/)) { + dataProps['animation-type'] = I.AnimType.Text; + dataProps.content = text; + }; if (className) { cn.push(className); @@ -51,7 +57,7 @@ const Label: FC = ({ onMouseDown={onMouseDown} onMouseEnter={onMouseEnter} onMouseLeave={onMouseLeave} - {...U.Common.dataProps({ ...dataset, content: text, 'animation-type': I.AnimType.Text })} + {...U.Common.dataProps(dataProps)} /> );