Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/confirm-redesign

packages/asc-web-components/themes/base.js

@@ -1958,6 +1958,11 @@ const Base = {
     expanderColor: "dimgray",
     downloadAppList: {
       color: "#83888d",
+      winHoverColor: "#3785D3",
+      macHoverColor: black,
+      linuxHoverColor: "#FFB800",
+      androidHoverColor: "#9BD71C",
+      iosHoverColor: black,
     },
     thirdPartyList: {
       color: "#818b91",

packages/asc-web-components/themes/dark.js

@@ -1109,7 +1109,7 @@ const Dark = {
 
     slider: {
       width: "100%",
-      margin: "8px 0",
+      margin: "24px 0",
       backgroundColor: "transparent",
 
       runnableTrack: {
@@ -1961,6 +1961,11 @@ const Dark = {
 
     downloadAppList: {
       color: "#C4C4C4",
+      winHoverColor: "#3785D3",
+      macHoverColor: white,
+      linuxHoverColor: "#FFB800",
+      androidHoverColor: "#9BD71C",
+      iosHoverColor: white,
     },
 
     thirdPartyList: {

products/ASC.Files/Client/src/components/Article/Body/DownloadAppList.js

@@ -26,7 +26,7 @@ const StyledDownloadAppList = styled.div`
 
 StyledDownloadAppList.defaultProps = { theme: Base };
 
-const DownloadAppListContainer = React.memo(({ t }) => {
+const DownloadAppListContainer = React.memo(({ t, theme }) => {
   const desktopLink = "https://www.onlyoffice.com/desktop.aspx";
   const androidLink = "https://www.onlyoffice.com/office-for-android.aspx";
   const iosLink = "https://www.onlyoffice.com/office-for-ios.aspx";
@@ -43,7 +43,7 @@ const DownloadAppListContainer = React.memo(({ t }) => {
           iconName="/static/images/windows.react.svg"
           size="25"
           isfill={true}
-          hoverColor="#3785D3"
+          hoverColor={theme.filesArticleBody.downloadAppList.winHoverColor}
           title={t("Translations:MobileWin")}
         />
         <IconButton
@@ -52,7 +52,7 @@ const DownloadAppListContainer = React.memo(({ t }) => {
           iconName="/static/images/macOS.react.svg"
           size="25"
           isfill={true}
-          hoverColor="#000000"
+          hoverColor={theme.filesArticleBody.downloadAppList.macHoverColor}
           title={t("Translations:MobileMac")}
         />
         <IconButton
@@ -61,7 +61,7 @@ const DownloadAppListContainer = React.memo(({ t }) => {
           iconName="/static/images/linux.react.svg"
           size="25"
           isfill={true}
-          hoverColor="#FFB800"
+          hoverColor={theme.filesArticleBody.downloadAppList.linuxHoverColor}
           title={t("Translations:MobileLinux")}
         />
         <IconButton
@@ -70,7 +70,7 @@ const DownloadAppListContainer = React.memo(({ t }) => {
           iconName="/static/images/android.react.svg"
           size="25"
           isfill={true}
-          hoverColor="#9BD71C"
+          hoverColor={theme.filesArticleBody.downloadAppList.androidHoverColor}
           title={t("Translations:MobileAndroid")}
         />
         <IconButton
@@ -79,7 +79,7 @@ const DownloadAppListContainer = React.memo(({ t }) => {
           iconName="/static/images/iOS.react.svg"
           size="25"
           isfill={true}
-          hoverColor="#000000"
+          hoverColor={theme.filesArticleBody.downloadAppList.iosHoverColor}
           title={t("Translations:MobileIos")}
         />
       </div>
@@ -87,6 +87,8 @@ const DownloadAppListContainer = React.memo(({ t }) => {
   );
 });
 
+DownloadAppListContainer.defaultProps = { theme: Base };
+
 const DownloadAppList = withTranslation(["Translations"])(
   DownloadAppListContainer
 );

products/ASC.Files/Client/src/components/Article/Body/index.js

@@ -35,6 +35,7 @@ const ArticleBodyContent = (props) => {
     isVisitor,
     FirebaseHelper,
     isArticleLoading,
+    theme,
   } = props;
 
   const campaigns = (localStorage.getItem("campaigns") || "")
@@ -103,7 +104,7 @@ const ArticleBodyContent = (props) => {
       {!isDesktopClient && showText && (
         <StyledBlock showText={showText}>
           {enableThirdParty && !isVisitor && <ThirdPartyList />}
-          <DownloadAppList />
+          <DownloadAppList theme={theme} />
           {(isDesktop || isTablet) &&
             personal &&
             !firstLoad &&
@@ -144,6 +145,7 @@ export default inject(
       hideArticle,
       isDesktopClient,
       FirebaseHelper,
+      theme,
     } = auth.settingsStore;
 
     const selectedFolderTitle = selectedFolderStore.title;
@@ -173,6 +175,7 @@ export default inject(
       firstLoad,
       isDesktopClient,
       FirebaseHelper,
+      theme,
     };
   }
 )(observer(withRouter(ArticleBodyContent)));

products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js

@@ -38,7 +38,7 @@ const checkedStyle = css`
 `;
 
 const bottomFileBorder = css`
-  border: ${(props) => props.theme.filesSection.tilesView.tile.border};
+  border-top: ${(props) => props.theme.filesSection.tilesView.tile.border};
   border-radius: 0 0 6px 6px;
 `;