Merge branch 'develop' into bugfix/login-confirm-style

This commit is contained in:
Viktor Fomin 2023-02-14 23:31:57 +03:00
commit 96e63bf056

View File

@ -126,7 +126,7 @@ const AboutContent = (props) => {
</div>
<div className="row">
<Text className="row-el" fontSize="13px" noSelect>
<Text className="row-el" fontSize="13px">
{t("DocumentManagement")}:
</Text>
<ColorTheme
@ -138,6 +138,7 @@ const AboutContent = (props) => {
fontWeight="600"
href={linkRepo}
target="_blank"
enableUserSelect
>
&nbsp;ONLYOFFICE DocSpace&nbsp;
</ColorTheme>
@ -148,7 +149,7 @@ const AboutContent = (props) => {
</div>
<div className="row">
<Text className="row-el" fontSize="13px" noSelect>
<Text className="row-el" fontSize="13px">
{t("OnlineEditors")}:
</Text>
<ColorTheme
@ -160,6 +161,7 @@ const AboutContent = (props) => {
fontWeight="600"
href={linkDocs}
target="_blank"
enableUserSelect
>
&nbsp;ONLYOFFICE Docs&nbsp;
</ColorTheme>
@ -169,20 +171,20 @@ const AboutContent = (props) => {
</div>
<div className="row">
<Text className="row-el" fontSize="13px" noSelect>
<Text className="row-el" fontSize="13px">
{t("SoftwareLicense")}:{" "}
</Text>
<Text className="row-el" fontSize="13px" fontWeight="600" noSelect>
<Text className="row-el" fontSize="13px" fontWeight="600">
&nbsp;{license}
</Text>
</div>
<Text className="copyright" fontSize="14px" fontWeight="600" noSelect>
<Text className="copyright" fontSize="14px" fontWeight="600">
© {companyName}
</Text>
<div className="row">
<Text className="address-title" fontSize="13px" noSelect>
<Text className="address-title" fontSize="13px">
{t("AboutCompanyAddressTitle")}:{" "}
</Text>
<Text className="address-title select-el" fontSize="13px">
@ -191,7 +193,7 @@ const AboutContent = (props) => {
</div>
<div className="row">
<Text className="tel-title" fontSize="13px" noSelect>
<Text className="tel-title" fontSize="13px">
{t("Common:Phone")}:{" "}
</Text>
<Text className="tel-title select-el" fontSize="13px">
@ -200,7 +202,7 @@ const AboutContent = (props) => {
</div>
<div className="row">
<Text className="row-el" fontSize="13px" noSelect>
<Text className="row-el" fontSize="13px">
{t("AboutCompanyEmailTitle")}:
</Text>
@ -212,13 +214,14 @@ const AboutContent = (props) => {
fontSize="13px"
fontWeight="600"
href={`mailto:${companyInfoSettingsData.email}`}
enableUserSelect
>
&nbsp;{email}
</ColorTheme>
</div>
<div className="row">
<Text className="row-el" fontSize="13px" noSelect>
<Text className="row-el" fontSize="13px">
{t("Site")}:
</Text>
@ -231,6 +234,7 @@ const AboutContent = (props) => {
fontWeight="600"
target="_blank"
href={site}
enableUserSelect
>
&nbsp;{site.replace(/^https?\:\/\//i, "")}
</ColorTheme>