From c8d29fe57ff9c4918d24110ca91f2791cee7deba Mon Sep 17 00:00:00 2001 From: "s.teleshev" Date: Fri, 1 Dec 2023 19:07:28 +0100 Subject: [PATCH] CB-3963 removed reshadow from VersionInfo --- .../core-blocks/src/Slide/SlideOverlay.tsx | 1 - .../src/VersionInfo.m.css | 10 +++++++ .../src/VersionInfo.tsx | 26 +++++-------------- 3 files changed, 17 insertions(+), 20 deletions(-) create mode 100644 webapp/packages/plugin-version-update-administration/src/VersionInfo.m.css diff --git a/webapp/packages/core-blocks/src/Slide/SlideOverlay.tsx b/webapp/packages/core-blocks/src/Slide/SlideOverlay.tsx index e3c01e15b9..59f14ccff7 100644 --- a/webapp/packages/core-blocks/src/Slide/SlideOverlay.tsx +++ b/webapp/packages/core-blocks/src/Slide/SlideOverlay.tsx @@ -6,7 +6,6 @@ * you may not use this file except in compliance with the License. */ import { observer } from 'mobx-react-lite'; -import styled, { css } from 'reshadow'; import { Icon } from '../Icon'; import { s } from '../s'; diff --git a/webapp/packages/plugin-version-update-administration/src/VersionInfo.m.css b/webapp/packages/plugin-version-update-administration/src/VersionInfo.m.css new file mode 100644 index 0000000000..d1feb88d47 --- /dev/null +++ b/webapp/packages/plugin-version-update-administration/src/VersionInfo.m.css @@ -0,0 +1,10 @@ +.group { + list-style-position: inside; + height: 100%; + max-height: 300px; +} + +.reactMarkdown > * { + margin: 0; + padding: 0; +} \ No newline at end of file diff --git a/webapp/packages/plugin-version-update-administration/src/VersionInfo.tsx b/webapp/packages/plugin-version-update-administration/src/VersionInfo.tsx index cdfb7d8384..1133a47609 100644 --- a/webapp/packages/plugin-version-update-administration/src/VersionInfo.tsx +++ b/webapp/packages/plugin-version-update-administration/src/VersionInfo.tsx @@ -7,44 +7,32 @@ */ import { observer } from 'mobx-react-lite'; import ReactMarkdown from 'react-markdown'; -import styled, { css } from 'reshadow'; -import { Container, Group, GroupItem, GroupTitle, useResource, useStyles, useTranslate } from '@cloudbeaver/core-blocks'; +import { Container, Group, GroupItem, GroupTitle, s, useResource, useS, useTranslate } from '@cloudbeaver/core-blocks'; import { VersionResource } from '@cloudbeaver/core-version'; +import styles from './VersionInfo.m.css'; interface Props { item: string; } -const style = css` - Group { - list-style-position: inside; - height: 100%; - max-height: 300px; - } - ReactMarkdown > * { - margin: 0; - padding: 0; - } -`; - export const VersionInfo = observer(function VersionInfo({ item }) { const translate = useTranslate(); - const styles = useStyles(style); + const style = useS(styles); const versionResource = useResource(VersionInfo, VersionResource, item); const version = versionResource.tryGetData; - return styled(styles)( + return ( - + {version ? `Release notes ${version.number} - ${version.date}` : translate('version_update_version_no_info')} {version && ( - {version.releaseNotes} + {version.releaseNotes} )} - , + ); });