From 18613e9d50dd79a3fab5f2c178d6093b6fdcb885 Mon Sep 17 00:00:00 2001 From: Darya Umrikhina Date: Mon, 24 Jun 2024 16:39:17 +0700 Subject: [PATCH 01/31] Shared:Themes: change text color for tabs --- packages/shared/themes/dark.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/shared/themes/dark.ts b/packages/shared/themes/dark.ts index 0ed9cc7567..54f4046657 100644 --- a/packages/shared/themes/dark.ts +++ b/packages/shared/themes/dark.ts @@ -992,7 +992,7 @@ const Dark: TTheme = { border: "none", }, }, - + fieldContainer: { horizontal: { margin: "0 0 16px 0", @@ -3154,7 +3154,7 @@ const Dark: TTheme = { gradientColor: black, lineColor: "#474747", - textColorPrimary: "#657077", + textColorPrimary: "#ADADAD", activeTextColorPrimary: white, hoverTextColorPrimary: white, pressedTextColorPrimary: "#CCCCCC", From 6fb70a70a7e81212c5a205eef18465c342deb497 Mon Sep 17 00:00:00 2001 From: Darya Umrikhina Date: Mon, 24 Jun 2024 16:40:32 +0700 Subject: [PATCH 02/31] Shared:Components:Tabs: change color for border --- packages/shared/components/tabs/Tabs.styled.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/shared/components/tabs/Tabs.styled.ts b/packages/shared/components/tabs/Tabs.styled.ts index da5bf0a795..d799254585 100644 --- a/packages/shared/components/tabs/Tabs.styled.ts +++ b/packages/shared/components/tabs/Tabs.styled.ts @@ -209,6 +209,11 @@ export const Tab = styled.div<{ props.$type === TabsTypes.Secondary && !props.isActive && props.theme.tabs.hoverBackgroundColorSecondary}; + + border: ${(props) => + props.$type === TabsTypes.Secondary && + !props.isActive && + css`1px solid ${props.theme.tabs.hoverBackgroundColorSecondary}`}; }; &:active { @@ -224,6 +229,11 @@ export const Tab = styled.div<{ props.$type === TabsTypes.Secondary && !props.isActive && props.theme.tabs.pressedBackgroundColorSecondary}; + + border: ${(props) => + props.$type === TabsTypes.Secondary && + !props.isActive && + css`1px solid ${props.theme.tabs.pressedBackgroundColorSecondary}`}; }; `; From b8e66bf844d07453c646b65cbfda921907d2a2e5 Mon Sep 17 00:00:00 2001 From: Darya Umrikhina Date: Mon, 1 Jul 2024 23:05:39 +0700 Subject: [PATCH 03/31] Shared:Components:Tabs: change colors in active tabs --- packages/shared/components/tabs/Tabs.styled.ts | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/packages/shared/components/tabs/Tabs.styled.ts b/packages/shared/components/tabs/Tabs.styled.ts index d799254585..d9526bd0f2 100644 --- a/packages/shared/components/tabs/Tabs.styled.ts +++ b/packages/shared/components/tabs/Tabs.styled.ts @@ -161,7 +161,7 @@ export const Tab = styled.div<{ line-height: 20px; cursor: pointer; opacity: ${(props) => (props.isDisabled && props.$type === TabsTypes.Secondary ? 0.6 : 1)}; - pointer-events: ${(props) => props.isDisabled && props.$type === TabsTypes.Secondary && "none"}; + pointer-events: ${(props) => ((props.isDisabled && props.$type === TabsTypes.Secondary) || props.isActive) && "none"}; user-select: none; padding: ${(props) => @@ -202,9 +202,6 @@ export const Tab = styled.div<{ !props.isActive && props.theme.tabs.hoverTextColorPrimary}; - opacity: ${(props) => - props.$type === TabsTypes.Primary && props.isActive && 0.85}; - background-color: ${(props) => props.$type === TabsTypes.Secondary && !props.isActive && @@ -222,9 +219,6 @@ export const Tab = styled.div<{ !props.isActive && props.theme.tabs.pressedTextColorPrimary}; - opacity: ${(props) => - props.$type === TabsTypes.Primary && props.isActive && 1}; - background-color: ${(props) => props.$type === TabsTypes.Secondary && !props.isActive && From e0c293113ac8a280c7e66831d862127a9dc93171 Mon Sep 17 00:00:00 2001 From: Timofey Boyko Date: Thu, 4 Jul 2024 10:56:07 +0300 Subject: [PATCH 04/31] =?UTF-8?q?Fixed=20Bug=2068059=20-=20Files.Quota.=20?= =?UTF-8?q?Error=20=E2=80=98Sorry,=20the=20resource=20cannot=20be=20found.?= =?UTF-8?q?=E2=80=99=20when=20Create=20new=20from=20the=20editor=20if=20th?= =?UTF-8?q?e=20user=20quota=20is=20exceeded.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/doceditor/src/app/(root)/page.tsx | 5 ++++- packages/doceditor/src/types/index.ts | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/doceditor/src/app/(root)/page.tsx b/packages/doceditor/src/app/(root)/page.tsx index 9b406f8e21..3dbc881ac5 100644 --- a/packages/doceditor/src/app/(root)/page.tsx +++ b/packages/doceditor/src/app/(root)/page.tsx @@ -48,7 +48,7 @@ export const metadata: Metadata = { }; async function Page({ searchParams }: RootPageProps) { - const { fileId, fileid, version, doc, action, share, editorType } = + const { fileId, fileid, version, doc, action, share, editorType, error } = searchParams ?? initialSearchParams; const startDate = new Date(); @@ -64,6 +64,9 @@ async function Page({ searchParams }: RootPageProps) { const timer = new Date().getTime() - startDate.getTime(); + if (data.error?.status === "not-found" && error) { + data.error.message = error; + } return ; } diff --git a/packages/doceditor/src/types/index.ts b/packages/doceditor/src/types/index.ts index 846085d4bf..ccdf60007f 100644 --- a/packages/doceditor/src/types/index.ts +++ b/packages/doceditor/src/types/index.ts @@ -68,6 +68,7 @@ export type RootPageProps = { action: ActionType; share: string; editorType: string; + error?: string; }>; }; export type TDocumentInfo = { From c557119f8a9570f551c76d1e79b5471364780b37 Mon Sep 17 00:00:00 2001 From: Tatiana Lopaeva Date: Thu, 4 Jul 2024 10:58:32 +0300 Subject: [PATCH 05/31] Fix Bug 68583 - Mobile. Low quality of screenshots in Javascript SDK settings. --- .../JavascriptSDK/sub-components/PresetTile.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/sub-components/PresetTile.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/sub-components/PresetTile.js index 4b6fffe202..c05c7a6645 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/sub-components/PresetTile.js +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/sub-components/PresetTile.js @@ -26,6 +26,7 @@ import React from "react"; import styled, { css } from "styled-components"; +import { ReactSVG } from "react-svg"; import { Base } from "@docspace/shared/themes"; @@ -90,9 +91,10 @@ const PresetTile = (props) => { {title} - {title} + {description} +