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

This commit is contained in:
Nikita Gopienko 2022-12-07 13:26:53 +03:00
commit 79d710bb88
3 changed files with 15 additions and 5 deletions

View File

@ -30,12 +30,17 @@ const FilesItemTitle = ({
</StyledTitle>
);
const icon =
selection?.isRoom && selection?.logo?.medium
? selection.logo.medium
: selection.icon;
return (
<StyledTitle ref={itemTitleRef}>
<div className="item-icon">
<img
className={`icon ${selection.isRoom && "is-room"}`}
src={selection.icon}
src={icon}
alt="thumbnail-icon"
/>
</div>

View File

@ -4,10 +4,14 @@ import StyledIconWrapper from "@docspace/common/components/Navigation/sub-compon
const getDefaultStyles = ({ $currentColorScheme }) =>
$currentColorScheme &&
css`
svg {
path:nth-child(2) {
svg {
path:nth-child(2) {
fill: ${$currentColorScheme.main.accent};
}
circle {
stroke: ${$currentColorScheme.main.accent};
}
}
`;
`;
export default styled(StyledIconWrapper)(getDefaultStyles);

View File

@ -261,7 +261,8 @@ const StyledCatalogItemImg = styled.div`
svg {
width: ${(props) => props.theme.catalogItem.img.svg.width};
height: ${(props) => props.theme.catalogItem.img.svg.height};
path {
path,
circle {
fill: ${(props) =>
props.isActive
? props.theme.catalogItem.img.svg.isActiveFill