Shared: Themes: fix after merge

This commit is contained in:
Viktor Fomin 2024-07-24 15:26:11 +03:00
parent 165f57ea88
commit 28c03fdb6b
3 changed files with 29 additions and 26 deletions

View File

@ -110,6 +110,7 @@ const {
editorGreenColor, editorGreenColor,
editorBlueColor, editorBlueColor,
editorOrangeColor, editorOrangeColor,
editorRedColor,
windowsColor, windowsColor,
linuxColor, linuxColor,
androidColor, androidColor,
@ -1301,7 +1302,7 @@ export const getBaseTheme = () => {
backgroundColor: lightGrayHover, backgroundColor: lightGrayHover,
animation: { animation: {
background: "#4781D1", background: lightBlueMain,
}, },
percent: { percent: {
@ -1855,7 +1856,7 @@ export const getBaseTheme = () => {
closeButtonIcon: white, closeButtonIcon: white,
closeButtonSize: "17px", closeButtonSize: "17px",
nameColor: "#858585", nameColor: grayDark,
links: { links: {
iconColor: lightIcons, iconColor: lightIcons,
@ -2829,7 +2830,7 @@ export const getBaseTheme = () => {
greenBackgroundColor: editorGreenColor, greenBackgroundColor: editorGreenColor,
blueBackgroundColor: editorBlueColor, blueBackgroundColor: editorBlueColor,
orangeBackgroundColor: editorOrangeColor, orangeBackgroundColor: editorOrangeColor,
redBackgroundColor: "#AA5251", redBackgroundColor: editorRedColor,
dataFontColor: white, dataFontColor: white,
dataFontColorBlack: black, dataFontColorBlack: black,
@ -3161,20 +3162,20 @@ export const getBaseTheme = () => {
}, },
oauth: { oauth: {
previewDialog: { previewDialog: {
border: "1px solid #eceef1", border: `1px solid ${grayLightMid}`,
}, },
infoDialog: { infoDialog: {
descLinkColor: "#657077", descLinkColor: lightGrayDark,
blockHeaderColor: "#a3a9ae", blockHeaderColor: gray,
separatorColor: "#333333", separatorColor: black,
}, },
list: { list: {
descriptionColor: "#a3a9ae", descriptionColor: gray,
}, },
clientForm: { clientForm: {
descriptionColor: "#a3a9ae", descriptionColor: gray,
headerBorder: "1px solid #d0d5da", headerBorder: `1px solid ${grayStrong}`,
scopeDesc: "#a3a9ae", scopeDesc: gray,
}, },
}, },
sdkPresets: { sdkPresets: {
@ -3193,8 +3194,8 @@ export const getBaseTheme = () => {
}, },
embeddingPanel: { embeddingPanel: {
descriptionTextColor: "#657077", descriptionTextColor: lightGrayDark,
iconColor: "#657077", iconColor: lightGrayDark,
}, },
completedForm: { completedForm: {

View File

@ -100,6 +100,7 @@ const {
editorGreenColor, editorGreenColor,
editorBlueColor, editorBlueColor,
editorOrangeColor, editorOrangeColor,
editorRedColor,
windowsColor, windowsColor,
linuxColor, linuxColor,
androidColor, androidColor,
@ -1284,7 +1285,7 @@ const Dark: TTheme = {
backgroundColor: grayDark, backgroundColor: grayDark,
animation: { animation: {
background: "#FFFFFF", background: white,
}, },
percent: { percent: {
@ -1840,7 +1841,7 @@ const Dark: TTheme = {
closeButtonIcon: black, closeButtonIcon: black,
closeButtonSize: "12px", closeButtonSize: "12px",
nameColor: "#A3A9AE", nameColor: gray,
links: { links: {
iconColor: grayDark, iconColor: grayDark,
@ -2814,7 +2815,7 @@ const Dark: TTheme = {
greenBackgroundColor: editorGreenColor, greenBackgroundColor: editorGreenColor,
blueBackgroundColor: editorBlueColor, blueBackgroundColor: editorBlueColor,
orangeBackgroundColor: editorOrangeColor, orangeBackgroundColor: editorOrangeColor,
redBackgroundColor: "#AA5251", redBackgroundColor: editorRedColor,
dataFontColor: white, dataFontColor: white,
dataFontColorBlack: white, dataFontColorBlack: white,
@ -3144,20 +3145,20 @@ const Dark: TTheme = {
oauth: { oauth: {
previewDialog: { previewDialog: {
border: "1px solid #242424", border: `1px solid ${grayDarkMid}`,
}, },
infoDialog: { infoDialog: {
descLinkColor: "#adadad", descLinkColor: darkGrayDark,
blockHeaderColor: "#858585", blockHeaderColor: grayDark,
separatorColor: "#474747", separatorColor: grayDarkStrong,
}, },
list: { list: {
descriptionColor: "#858585", descriptionColor: grayDark,
}, },
clientForm: { clientForm: {
descriptionColor: "#858585", descriptionColor: grayDark,
headerBorder: "1px solid #474747", headerBorder: `1px solid ${grayDarkStrong}`,
scopeDesc: "#858585", scopeDesc: grayDark,
}, },
}, },
sdkPresets: { sdkPresets: {
@ -3177,8 +3178,8 @@ const Dark: TTheme = {
}, },
embeddingPanel: { embeddingPanel: {
descriptionTextColor: "#ADADAD", descriptionTextColor: darkGrayDark,
iconColor: "#ADADAD", iconColor: darkGrayDark,
}, },
completedForm: { completedForm: {
linkColor: white, linkColor: white,

View File

@ -108,6 +108,7 @@ export const globalColors = {
editorGreenColor: "#40865C", editorGreenColor: "#40865C",
editorBlueColor: "#446995", editorBlueColor: "#446995",
editorOrangeColor: "#AA5252", editorOrangeColor: "#AA5252",
editorRedColor: "#AA5251",
windowsColor: "#4C83CD", windowsColor: "#4C83CD",
linuxColor: "#F4BB40", linuxColor: "#F4BB40",
androidColor: "#A8D548", androidColor: "#A8D548",