IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Client: fix after merge

Browse Source
This commit is contained in:
Viktor Fomin 2024-07-24 15:31:34 +03:00
parent 14086fc550
commit 3e508950d4
6 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/client/src/pages/PortalSettings/categories/data-import/StyledDataImport.ts
View File

@ -28,7 +28,7 @@ import styled, { css } from "styled-components";
import { tablet, mobile } from "@docspace/shared/utils/device";
import { TableContainer } from "@docspace/shared/components/table";
import { Base } from "@docspace/shared/themes";
import { Base, globalColors } from "@docspace/shared/themes";
export const WorkspacesContainer = styled.div`
max-width: 700px;
@ -78,7 +78,7 @@ export const WorkspacesContainer = styled.div`
cursor: pointer;
&:hover {
border-color: #4781d1;
border-color: ${globalColors.lightBlueMain};
}
&:active {

6
packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/ClientForm.styled.ts
View File

@ -1,7 +1,7 @@
import styled from "styled-components";
import { mobile } from "@docspace/shared/utils/device";
import { Base } from "@docspace/shared/themes";
import { Base, globalColors } from "@docspace/shared/themes";
const StyledContainer = styled.div`
width: 100%;
@ -276,11 +276,11 @@ const StyledInputAddBlock = styled.div`
gap: 4px;
p {
color: #4781d1;
color: ${globalColors.lightBlueMain};
}
svg path {
fill: #4781d1;
fill: ${globalColors.lightBlueMain};
}
}
`;

3
packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/List/RowView/RowContent.tsx
View File

@ -1,5 +1,6 @@
import { Text } from "@docspace/shared/components/text";
import { ToggleButton } from "@docspace/shared/components/toggle-button";
import { globalColors } from "@docspace/shared/themes";
import {
StyledRowContent,
@ -28,7 +29,7 @@ export const RowContent = ({
</Text>
</FlexWrapper>
<Text fontWeight={600} fontSize="12px" color="#A3A9AE">
<Text fontWeight={600} fontSize="12px" color={globalColors.gray}>
{item.description}
</Text>
</ContentWrapper>

12
packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/PreviewDialog.tsx
View File

@ -10,7 +10,7 @@ import { SocialButton } from "@docspace/shared/components/social-button";
import { Text } from "@docspace/shared/components/text";
import { Textarea } from "@docspace/shared/components/textarea";
import { Button, ButtonSize } from "@docspace/shared/components/button";
import { Base } from "@docspace/shared/themes";
import { Base, globalColors } from "@docspace/shared/themes";
import { generatePKCEPair } from "@docspace/shared/utils/oauth";
import { AuthenticationMethod } from "@docspace/shared/enums";
import { SettingsStore } from "@docspace/shared/store/SettingsStore";
@ -106,10 +106,10 @@ const styleBlock = `<style>
border: none;
stroke: none;
background: #ffffff;
background: ${globalColors.white};
box-shadow: rgba(0, 0, 0, 0.24) 0px 1px 1px, rgba(0, 0, 0, 0.12) 0px 0px 1px;
color: rgb(163, 169, 174);
color: ${globalColors.gray};
font-weight: 600;
font-size: 14px;
@ -122,12 +122,12 @@ const styleBlock = `<style>
.docspace-button:hover {
box-shadow: rgba(0, 0, 0, 0.24) 0px 1px 1px, rgba(0, 0, 0, 0.12) 0px 0px 1px;
cursor: pointer;
color: #333333;
color: ${globalColors.black};
}
.docspace-button:active {
background-color: #F8F9F9;
color: #333333;
background-color: ${globalColors.grayLight};
color: ${globalColors.black};
cursor: pointer;
}

5
packages/client/src/pages/Profile/Section/Body/sub-components/authorized-apps/sub-components/RowView/RowContent.tsx
View File

@ -1,5 +1,6 @@
import { Text } from "@docspace/shared/components/text";
import { Link, LinkTarget, LinkType } from "@docspace/shared/components/link";
import { globalColors } from "@docspace/shared/themes";
import {
StyledRowContent,
@ -22,9 +23,9 @@ export const RowContent = ({ sectionWidth, item }: RowContentProps) => {
</Text>
</FlexWrapper>
<Text fontWeight={600} fontSize="12px" color="#A3A9AE">
<Text fontWeight={600} fontSize="12px" color={globalColors.gray}>
<Link
color="#A3A9AE"
color={globalColors.gray}
href={item.websiteUrl}
type={LinkType.page}
target={LinkTarget.blank}

8
packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js
View File

@ -268,8 +268,8 @@ const MainProfile = (props) => {
id="sso-badge-profile"
className="sso-badge"
label={t("Common:SSO")}
color={"#FFFFFF"}
backgroundColor={theme.isBase ? "#22C386" : "#2E5E4C"}
color={globalColors.white}
backgroundColor={globalColors.mainGreen}
fontSize={"9px"}
fontWeight={800}
noHover
@ -287,8 +287,8 @@ const MainProfile = (props) => {
id="ldap-badge-profile"
className="ldap-badge"
label={t("Common:LDAP")}
color={"#FFFFFF"}
backgroundColor={theme.isBase ? "#8570BD" : "#544C6A"}
color={globalColors.white}
backgroundColor={globalColors.secondPurple}
fontSize={"9px"}
fontWeight={800}
noHover