From 465c57b8f66d5528a29acdacecd315a7dcf1326f Mon Sep 17 00:00:00 2001 From: Tatiana Lopaeva Date: Wed, 24 Nov 2021 11:09:52 +0300 Subject: [PATCH] Fixed Bug 54013 - Client.Files.Returned the ability to select elements on the About program page. --- .../PageLayout/sub-components/section-body.js | 2 -- .../components/pages/About/AboutContent.js | 28 ++++++++++++++----- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/packages/asc-web-common/components/PageLayout/sub-components/section-body.js b/packages/asc-web-common/components/PageLayout/sub-components/section-body.js index 2a2dbbcfaee..41f493f995a 100644 --- a/packages/asc-web-common/components/PageLayout/sub-components/section-body.js +++ b/packages/asc-web-common/components/PageLayout/sub-components/section-body.js @@ -23,8 +23,6 @@ const commonStyles = css` border-left: none; - -webkit-user-select: none; - .section-wrapper { ${(props) => !props.withScroll && diff --git a/web/ASC.Web.Client/src/components/pages/About/AboutContent.js b/web/ASC.Web.Client/src/components/pages/About/AboutContent.js index 26fab6a7d6a..c27600fa71a 100644 --- a/web/ASC.Web.Client/src/components/pages/About/AboutContent.js +++ b/web/ASC.Web.Client/src/components/pages/About/AboutContent.js @@ -5,7 +5,7 @@ import NoUserSelect from "@appserver/components/utils/commonStyles"; import { useTranslation } from "react-i18next"; import styled from "styled-components"; import { ReactSVG } from "react-svg"; -import { isDesktop } from "react-device-detect"; +import { isDesktop, isMobile } from "react-device-detect"; const StyledAboutBody = styled.div` width: 100%; @@ -25,6 +25,14 @@ const StyledAboutBody = styled.div` .no-select { ${NoUserSelect} } + + .tel-title, + .address-title { + display: inline; + } + .select-el { + ${isMobile && `user-select: text`}; + } `; const AboutContent = ({ personal, buildVersionInfo }) => { @@ -68,7 +76,7 @@ const AboutContent = ({ personal, buildVersionInfo }) => { >  ONLYOFFICE App Server  - + v.{buildVersionInfo.appServer} @@ -87,7 +95,7 @@ const AboutContent = ({ personal, buildVersionInfo }) => { >  ONLYOFFICE Docs  - + v.{buildVersionInfo.documentServer} @@ -106,14 +114,20 @@ const AboutContent = ({ personal, buildVersionInfo }) => {
- - {t("AboutCompanyAddressTitle")}: {address} + + {t("AboutCompanyAddressTitle")}:{" "} + + + {address}
- - {t("AboutCompanyTelTitle")}: {phone} + + {t("AboutCompanyTelTitle")}:{" "} + + + {phone}