Merge branch 'release/v2.0.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.0.0
This commit is contained in:
commit
37821a0ba8
@ -6,23 +6,23 @@
|
||||
},
|
||||
{
|
||||
"name": "🚀 @docspace/client",
|
||||
"path": "packages\\client"
|
||||
"path": "packages/client"
|
||||
},
|
||||
{
|
||||
"name": "🔑 @docspace/login",
|
||||
"path": "packages\\login"
|
||||
"path": "packages/login"
|
||||
},
|
||||
{
|
||||
"name": "📄 @docspace/editor",
|
||||
"path": "packages\\editor"
|
||||
"path": "packages/editor"
|
||||
},
|
||||
{
|
||||
"name": "📦 @docspace/common",
|
||||
"path": "packages\\common"
|
||||
"path": "packages/common"
|
||||
},
|
||||
{
|
||||
"name": "📦 @docspace/components",
|
||||
"path": "packages\\components"
|
||||
"path": "packages/components"
|
||||
}
|
||||
],
|
||||
"settings": {
|
||||
|
@ -1,53 +0,0 @@
|
||||
{
|
||||
"folders": [
|
||||
{
|
||||
"name": "🌐 root",
|
||||
"path": "."
|
||||
},
|
||||
{
|
||||
"name": "🚀 @docspace/client",
|
||||
"path": "packages/client"
|
||||
},
|
||||
{
|
||||
"name": "🔑 @docspace/login",
|
||||
"path": "packages/login"
|
||||
},
|
||||
{
|
||||
"name": "📄 @docspace/editor",
|
||||
"path": "packages/editor"
|
||||
},
|
||||
{
|
||||
"name": "📦 @docspace/common",
|
||||
"path": "packages/common"
|
||||
},
|
||||
{
|
||||
"name": "📦 @docspace/components",
|
||||
"path": "packages/components"
|
||||
}
|
||||
],
|
||||
"settings": {
|
||||
"window.zoomLevel": 0,
|
||||
"editor.formatOnSave": true,
|
||||
"editor.defaultFormatter": "esbenp.prettier-vscode",
|
||||
"liveServer.settings.multiRootWorkspaceName": "✨ docspace",
|
||||
"cSpell.words": ["docspace", "browserslist", "debuginfo", "doceditor"],
|
||||
"jest.autoRun": {},
|
||||
"jest.disabledWorkspaceFolders": [
|
||||
"🌐 root",
|
||||
"🔑 @docspace/login",
|
||||
"🚀 @docspace/client",
|
||||
"📄 @docspace/editor",
|
||||
"📦 @docspace/common"
|
||||
],
|
||||
"[javascript]": {
|
||||
"editor.defaultFormatter": "esbenp.prettier-vscode"
|
||||
}
|
||||
},
|
||||
"extensions": {
|
||||
"recommendations": [
|
||||
"folke.vscode-monorepo-workspace",
|
||||
"orta.vscode-jest",
|
||||
"firsttris.vscode-jest-runner"
|
||||
]
|
||||
}
|
||||
}
|
@ -59,7 +59,12 @@ const HotkeyPanel = ({
|
||||
isAside={true}
|
||||
zIndex={210}
|
||||
/>
|
||||
<Aside className="hotkeys-panel" visible={visible} onClose={onClose}>
|
||||
<Aside
|
||||
className="hotkeys-panel"
|
||||
visible={visible}
|
||||
onClose={onClose}
|
||||
withoutBodyScroll={true}
|
||||
>
|
||||
<div className="hotkeys_header">
|
||||
<Heading className="hotkeys_heading">{t("Common:Hotkeys")}</Heading>
|
||||
</div>
|
||||
@ -145,11 +150,8 @@ const HotkeyPanel = ({
|
||||
HotkeyPanel.defaultProps = { theme: Base };
|
||||
|
||||
export default inject(({ auth, publicRoomStore }) => {
|
||||
const {
|
||||
hotkeyPanelVisible,
|
||||
setHotkeyPanelVisible,
|
||||
theme,
|
||||
} = auth.settingsStore;
|
||||
const { hotkeyPanelVisible, setHotkeyPanelVisible, theme } =
|
||||
auth.settingsStore;
|
||||
|
||||
return {
|
||||
visible: hotkeyPanelVisible,
|
||||
|
@ -9,7 +9,6 @@ import Button from "@docspace/components/button";
|
||||
import HelpButton from "@docspace/components/help-button";
|
||||
import Link from "@docspace/components/link";
|
||||
import ToggleButton from "@docspace/components/toggle-button";
|
||||
import { isMobileOnly, isTablet } from "react-device-detect";
|
||||
import { mobile } from "@docspace/components/utils/device";
|
||||
import CheckIcon from "PUBLIC_DIR/images/check.edit.react.svg";
|
||||
import CrossIcon from "PUBLIC_DIR/images/cross.edit.react.svg";
|
||||
@ -75,9 +74,7 @@ const StyledInvitePanel = styled.div`
|
||||
css`
|
||||
.trackYVisible {
|
||||
.scroller {
|
||||
margin-right: ${isMobileOnly || isTablet
|
||||
? `-20px !important`
|
||||
: `-17px !important`};
|
||||
margin-right: -20px !important;
|
||||
}
|
||||
}
|
||||
`}
|
||||
|
@ -4,7 +4,7 @@ import { withTranslation } from "react-i18next";
|
||||
import DragAndDrop from "@docspace/components/drag-and-drop";
|
||||
import Row from "@docspace/components/row";
|
||||
import FilesRowContent from "./FilesRowContent";
|
||||
import { isMobile } from "react-device-detect";
|
||||
import { isMobile, isMobileOnly } from "react-device-detect";
|
||||
|
||||
import withFileActions from "../../../../../HOCs/withFileActions";
|
||||
import withQuickButtons from "../../../../../HOCs/withQuickButtons";
|
||||
@ -185,6 +185,15 @@ const StyledSimpleFilesRow = styled(Row)`
|
||||
|
||||
.row-copy-link {
|
||||
display: block;
|
||||
|
||||
${isMobileOnly &&
|
||||
css`
|
||||
:hover {
|
||||
svg path {
|
||||
fill: ${({ theme }) => theme.iconButton.color};
|
||||
}
|
||||
}
|
||||
`}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user