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

Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces

Browse Source
This commit is contained in:
Artem Tarasov 2021-02-26 00:20:24 +03:00
commit f10d8ae11d
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
View File

@ -37,7 +37,15 @@ const StyledTreeMenu = styled(TreeMenu)`
margin-left: 4px; margin-left: 4px;
}*/ }*/
`; `;
const StyledFolderSVG = styled.div`
svg {
width: 100%;
path {
fill: #657077;
}
}
`;
const StyledExpanderDownIcon = styled(ExpanderDownIcon)` const StyledExpanderDownIcon = styled(ExpanderDownIcon)`
${commonIconsStyles} ${commonIconsStyles}
path { path {
@ -85,7 +93,7 @@ class TreeFolders extends React.Component {
iconUrl = "images/catalog.private.react.svg"; iconUrl = "images/catalog.private.react.svg";
break; break;
case FolderType.TRASH: case FolderType.TRASH:
iconUrl = "images/catalog.trash.react.svg"; iconUrl = "/static/images/catalog.trash.react.svg";
break; break;
default: default:
break; break;
@ -128,20 +136,10 @@ class TreeFolders extends React.Component {
break; break;
} }
// return React.createElement(Icons[iconName], {
// size: "scale",
// isfill: true,
// color: "#657077",
// });
return ( return (
<ReactSVG <StyledFolderSVG>
src={iconUrl} <ReactSVG src={iconUrl} />
beforeInjection={(svg) => { </StyledFolderSVG>
svg.setAttribute("style", `width: 24px; height: 24px;`);
svg.setAttribute("fill", "#657077");
}}
/>
); );
}; };

10
products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
View File

@ -807,7 +807,7 @@ class SectionBodyContent extends React.Component {
return { return {
key: option, key: option,
label: t("Preview"), label: t("Preview"),
icon: "static/images/eye.react.svg", icon: "/static/images/eye.react.svg",
onClick: this.onClickLinkEdit, onClick: this.onClickLinkEdit,
disabled: true, disabled: true,
"data-id": item.id, "data-id": item.id,
@ -817,7 +817,7 @@ class SectionBodyContent extends React.Component {
return { return {
key: option, key: option,
label: t("View"), label: t("View"),
icon: "static/images/eye.react.svg", icon: "/static/images/eye.react.svg",
onClick: this.onMediaFileClick, onClick: this.onMediaFileClick,
disabled: false, disabled: false,
}; };
@ -841,7 +841,7 @@ class SectionBodyContent extends React.Component {
return { return {
key: option, key: option,
label: t("Copy"), label: t("Copy"),
icon: "static/images/copy.react.svg", icon: "/static/images/copy.react.svg",
onClick: this.onCopyAction, onClick: this.onCopyAction,
disabled: false, disabled: false,
}; };
@ -849,7 +849,7 @@ class SectionBodyContent extends React.Component {
return { return {
key: option, key: option,
label: t("Duplicate"), label: t("Duplicate"),
icon: "static/images/copy.react.svg", icon: "/static/images/copy.react.svg",
onClick: this.onDuplicate, onClick: this.onDuplicate,
disabled: false, disabled: false,
}; };
@ -876,7 +876,7 @@ class SectionBodyContent extends React.Component {
return { return {
key: option, key: option,
label: isThirdPartyFolder ? t("DeleteThirdParty") : t("Delete"), label: isThirdPartyFolder ? t("DeleteThirdParty") : t("Delete"),
icon: "static/images/catalog.trash.react.svg", icon: "/static/images/catalog.trash.react.svg",
onClick: this.onClickDelete, onClick: this.onClickDelete,
disabled: false, disabled: false,
"data-is-third-party": isThirdPartyFolder ? true : false, "data-is-third-party": isThirdPartyFolder ? true : false,