Skip to content

Commit

Permalink
Fixed Bug 54013 - Client.Files.Returned the ability to select element…
Browse files Browse the repository at this point in the history
…s on the About program page.
  • Loading branch information
TatianaLopaeva committed Nov 24, 2021
1 parent b35061d commit 465c57b
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ const commonStyles = css`
border-left: none;
-webkit-user-select: none;
.section-wrapper {
${(props) =>
!props.withScroll &&
Expand Down
28 changes: 21 additions & 7 deletions web/ASC.Web.Client/src/components/pages/About/AboutContent.js
Original file line number Diff line number Diff line change
Expand Up @@ -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%;
Expand All @@ -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 }) => {
Expand Down Expand Up @@ -68,7 +76,7 @@ const AboutContent = ({ personal, buildVersionInfo }) => {
>
 ONLYOFFICE App Server 
</Link>
<Text className="row-el" fontSize="13px" fontWeight="600" noSelect>
<Text className="row-el select-el" fontSize="13px" fontWeight="600">
v.{buildVersionInfo.appServer}
</Text>
</div>
Expand All @@ -87,7 +95,7 @@ const AboutContent = ({ personal, buildVersionInfo }) => {
>
&nbsp;ONLYOFFICE Docs&nbsp;
</Link>
<Text className="row-el" fontSize="13px" fontWeight="600" noSelect>
<Text className="row-el select-el" fontSize="13px" fontWeight="600">
v.{buildVersionInfo.documentServer}
</Text>
</div>
Expand All @@ -106,14 +114,20 @@ const AboutContent = ({ personal, buildVersionInfo }) => {
</Text>

<div className="row">
<Text fontSize="13px" noSelect>
{t("AboutCompanyAddressTitle")}: {address}
<Text className="address-title" fontSize="13px" noSelect>
{t("AboutCompanyAddressTitle")}:{" "}
</Text>
<Text className="address-title select-el" fontSize="13px">
{address}
</Text>
</div>

<div className="row">
<Text fontSize="13px" noSelect>
{t("AboutCompanyTelTitle")}: {phone}
<Text className="tel-title" fontSize="13px" noSelect>
{t("AboutCompanyTelTitle")}:{" "}
</Text>
<Text className="tel-title select-el" fontSize="13px">
{phone}
</Text>
</div>

Expand Down

0 comments on commit 465c57b

Please sign in to comment.