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

This commit is contained in:
Timofey Boyko 2022-12-07 13:13:40 +03:00
commit af4544267f
6 changed files with 23 additions and 13 deletions

View File

@ -72,7 +72,8 @@
"Open": "Open",
"OpenLocation": "Open location",
"PersonalEmptyContainerDescription": "Drop files here or create new ones.",
"Pin": "Pin to top",
"PinToTop": "Pin to top",
"Pin": "Pin",
"Presentation": "Presentation",
"PrivateRoomDescriptionEncrypted": "Encrypted editing and real-time collaboration.",
"PrivateRoomDescriptionSafest": "The safest storage for docx, xlsx and pptx.",

View File

@ -637,7 +637,7 @@ class ContextOptionsStore {
{
id: "option_pin-room",
key: "pin-room",
label: t("Pin"),
label: t("PinToTop"),
icon: "/static/images/pin.react.svg",
onClick: (e) => this.onClickPin(e, item.id, t),
disabled: false,
@ -990,7 +990,7 @@ class ContextOptionsStore {
const pinOption = isPinOption
? {
key: "pin-room",
label: t("Pin"),
label: t("PinToTop"),
icon: "/static/images/pin.react.svg",
onClick: pinRooms,
disabled: false,

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

View File

@ -11,7 +11,7 @@ import { isChrome, browserVersion } from "react-device-detect";
const StyledButton = styled(Button)`
border: none;
padding: 0 10px;
padding: 0 12px;
height: 100%;
min-width: fit-content;
@ -78,7 +78,11 @@ const StyledButton = styled(Button)`
.button-content {
@media ${tablet} {
flex-direction: column;
gap: 0px;
gap: 4px;
}
@media ${hugeMobile} {
margin-top: 4px;
}
${isChrome &&

View File

@ -128,8 +128,8 @@ const StyledTableGroupMenu = styled.div`
.table-container_group-menu-separator {
border-right: ${(props) =>
props.theme.tableContainer.groupMenu.borderRight};
width: 2px;
height: 20px;
width: 1px;
height: 21px;
margin: 0 16px 0 20px;
@media ${tablet} {
@ -141,7 +141,7 @@ const StyledTableGroupMenu = styled.div`
height: 36px;
`}
@media ${mobile} {
@media ${hugeMobile} {
height: 20px;
}
@ -158,7 +158,7 @@ const StyledTableGroupMenu = styled.div`
.table-container_group-menu-combobox {
height: 24px;
width: 16px;
margin: 3px 0px 0px 3px;
margin: 7px 2px 0px 9px;
background: transparent;
.combo-button {