IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0

Browse Source
This commit is contained in:
Timofey Boyko 2022-12-09 11:11:48 +03:00
commit a041401910
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js
View File

@ -49,7 +49,7 @@ const StyledSubHeader = styled(Heading)`
font-size: 16px;
padding-left: 16px;
padding-right: 16px;
margin: 20px 0;
margin: 16px 0;
${(props) =>
props.inline &&

10
packages/client/src/pages/VersionHistory/Section/Body/StyledVersionHistory.js
View File

@ -282,23 +282,23 @@ StyledVersionRow.defaultProps = { theme: Base };
const StyledVersionSvg = styled(VersionSvg)`
path {
fill: ${(props) =>
!props.isVersion
!props.$isVersion
? props.theme.filesVersionHistory.badge.defaultFill
: props.index === 0
? props.theme.filesVersionHistory.badge.fill
: props.theme.filesVersionHistory.badge.badgeFill};
stroke: ${(props) =>
!props.isVersion
!props.$isVersion
? props.theme.filesVersionHistory.badge.stroke
: props.index === 0
? props.theme.filesVersionHistory.badge.fill
: props.theme.filesVersionHistory.badge.badgeFill};
stroke-dasharray: ${(props) => (props.isVersion ? "2 0" : "3 1")};
stroke-linejoin: ${(props) => (props.isVersion ? "unset" : "round")};
stroke-dasharray: ${(props) => (props.$isVersion ? "2 0" : "3 1")};
stroke-linejoin: ${(props) => (props.$isVersion ? "unset" : "round")};
${(props) =>
props.isVersion &&
props.$isVersion &&
css`
stroke-width: 2;
`}

2
packages/client/src/pages/VersionHistory/Section/Body/VersionBadge.js
View File

@ -22,7 +22,7 @@ const VersionBadge = ({
index={index}
{...rest}
>
<StyledVersionSvg isVersion={isVersion} theme={theme} index={index} />
<StyledVersionSvg $isVersion={isVersion} theme={theme} index={index} />
<Text
className="version_badge-text"