diff --git a/packages/asc-web-common/components/Section/sub-components/info-panel.js b/packages/asc-web-common/components/Section/sub-components/info-panel.js index ef7f3d5519..b2314adc2c 100644 --- a/packages/asc-web-common/components/Section/sub-components/info-panel.js +++ b/packages/asc-web-common/components/Section/sub-components/info-panel.js @@ -15,6 +15,7 @@ import { isMobile } from "react-device-detect"; const StyledInfoPanelWrapper = styled.div.attrs(({ id }) => ({ id: id, }))` + user-select: none; height: auto; width: auto; background: rgba(6, 22, 38, 0.2); diff --git a/packages/asc-web-components/link-with-dropdown/styled-link-with-dropdown.js b/packages/asc-web-components/link-with-dropdown/styled-link-with-dropdown.js index 3ba4dc34aa..96e10da4f2 100644 --- a/packages/asc-web-components/link-with-dropdown/styled-link-with-dropdown.js +++ b/packages/asc-web-components/link-with-dropdown/styled-link-with-dropdown.js @@ -84,7 +84,8 @@ const StyledLinkWithDropdown = styled(SimpleLinkWithDropdown)` text-decoration: none; user-select: none; position: relative; - display: inline-grid; + display: flex; + align-items: center; padding-right: ${(props) => props.theme.linkWithDropdown.paddingRight}; diff --git a/products/ASC.Files/Client/src/components/dialogs/DownloadDialog/DownloadContent.js b/products/ASC.Files/Client/src/components/dialogs/DownloadDialog/DownloadContent.js index 56434ba674..d6d70df105 100644 --- a/products/ASC.Files/Client/src/components/dialogs/DownloadDialog/DownloadContent.js +++ b/products/ASC.Files/Client/src/components/dialogs/DownloadDialog/DownloadContent.js @@ -6,12 +6,20 @@ import RowContainer from "@appserver/components/row-container"; import Text from "@appserver/components/text"; import LinkWithDropdown from "@appserver/components/link-with-dropdown"; import styled from "styled-components"; +import { tablet } from "@appserver/components/utils/device"; const StyledDownloadContent = styled.div` .row_content, .row-content_tablet-side-info { overflow: unset; } + + @media (${tablet}) { + .row-content_tablet-side-info { + display: flex; + gap: 5px; + } + } `; const DownloadContent = (props) => { diff --git a/products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js b/products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js index fab23b234c..fda019da23 100644 --- a/products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js +++ b/products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js @@ -12,6 +12,7 @@ import withQuickButtons from "../../../../../HOCs/withQuickButtons"; import ItemIcon from "../../../../../components/ItemIcon"; import marginStyles from "./CommonStyles"; import { Base } from "@appserver/components/themes"; +import { tablet } from "@appserver/components/utils/device"; const checkedStyle = css` background: ${(props) => props.theme.filesSection.rowView.checkedBackground}; @@ -72,6 +73,13 @@ const StyledSimpleFilesRow = styled(Row)` padding-right: 24px; margin-left: -24px; margin-right: -24px; + + @media ${tablet} { + margin-left: -16px; + margin-right: -16px; + padding-left: 16px; + padding-right: 16px; + } `} } @@ -98,8 +106,7 @@ const StyledSimpleFilesRow = styled(Row)` .row_content { ${(props) => - props.sectionWidth > 500 && - `max-width: fit-content;`}//min-width: auto;;;;;;; + props.sectionWidth > 500 && `max-width: fit-content;`}//min-width: auto } .badges { diff --git a/products/ASC.Files/Client/src/store/HotkeyStore.js b/products/ASC.Files/Client/src/store/HotkeyStore.js index 6422a47f98..e4d66e7d56 100644 --- a/products/ASC.Files/Client/src/store/HotkeyStore.js +++ b/products/ASC.Files/Client/src/store/HotkeyStore.js @@ -79,7 +79,9 @@ class HotkeyStore { ) { //console.log("element is visible"); } else { + if (scroll) scroll.style.overflowX = "hidden"; //hack to fix react-custom-scrollbar bug with horizontal scroll el.scrollIntoView({ block: "center" }); + if (scroll) scroll.style.overflowX = null; //console.log("element is not visible"); } }