github/InvokeAI
1
1
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI.git synced 2026-04-23 03:00:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed merge conflicts

Browse Source
This commit is contained in:
Jennifer Player
2023-09-20 10:00:11 -04:00
parent d7ebe3f048 1c38cce16d
commit 7a3b467ce0
334 changed files with 13464 additions and 4184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
invokeai/frontend/web/src/theme/colors/colors.ts
View File

@@ -3,15 +3,11 @@ import { generateColorPalette } from 'theme/util/generateColorPalette';
const BASE = { H: 220, S: 16 };
const ACCENT = { H: 250, S: 42 };
// const ACCENT = { H: 250, S: 52 };
const WORKING = { H: 47, S: 42 };
// const WORKING = { H: 47, S: 50 };
const GOLD = { H: 40, S: 70 };
const WARNING = { H: 28, S: 42 };
// const WARNING = { H: 28, S: 50 };
const OK = { H: 113, S: 42 };
// const OK = { H: 113, S: 50 };
const ERROR = { H: 0, S: 42 };
// const ERROR = { H: 0, S: 50 };
export const InvokeAIColors: InvokeAIThemeColors = {
base: generateColorPalette(BASE.H, BASE.S),
@@ -20,6 +16,8 @@ export const InvokeAIColors: InvokeAIThemeColors = {
accentAlpha: generateColorPalette(ACCENT.H, ACCENT.S, true),
working: generateColorPalette(WORKING.H, WORKING.S),
workingAlpha: generateColorPalette(WORKING.H, WORKING.S, true),
gold: generateColorPalette(GOLD.H, GOLD.S),
goldAlpha: generateColorPalette(GOLD.H, GOLD.S, true),
warning: generateColorPalette(WARNING.H, WARNING.S),
warningAlpha: generateColorPalette(WARNING.H, WARNING.S, true),
ok: generateColorPalette(OK.H, OK.S),

22
invokeai/frontend/web/src/theme/components/button.ts
View File

@@ -10,7 +10,7 @@ const invokeAI = defineStyle((props) => {
bg: mode('base.150', 'base.700')(props),
color: mode('base.300', 'base.500')(props),
svg: {
fill: mode('base.500', 'base.500')(props),
fill: mode('base.300', 'base.500')(props),
},
opacity: 1,
};
@@ -45,25 +45,14 @@ const invokeAI = defineStyle((props) => {
}
const _disabled = {
bg: mode(`${c}.250`, `${c}.700`)(props),
color: mode(`${c}.50`, `${c}.500`)(props),
bg: mode(`${c}.400`, `${c}.700`)(props),
color: mode(`${c}.600`, `${c}.500`)(props),
svg: {
fill: mode(`${c}.50`, `${c}.500`)(props),
filter: 'unset',
},
opacity: 1,
filter: mode(undefined, 'saturate(65%)')(props),
};
const data_progress = {
// bg: 'none',
color: mode(`${c}.50`, `${c}.500`)(props),
svg: {
fill: mode(`${c}.50`, `${c}.500`)(props),
fill: mode(`${c}.600`, `${c}.500`)(props),
filter: 'unset',
},
opacity: 0.7,
filter: mode(undefined, 'saturate(65%)')(props),
filter: 'saturate(65%)',
};
return {
@@ -82,7 +71,6 @@ const invokeAI = defineStyle((props) => {
},
_disabled,
},
'&[data-progress="true"]': { ...data_progress, _hover: data_progress },
};
});

0
invokeai/frontend/web/src/theme/components/table.ts Normal file
View File

2
invokeai/frontend/web/src/theme/themeTypes.d.ts vendored
View File

@@ -3,6 +3,8 @@ export type InvokeAIThemeColors = {
baseAlpha: Partial<InvokeAIPaletteSteps>;
accent: Partial<InvokeAIPaletteSteps>;
accentAlpha: Partial<InvokeAIPaletteSteps>;
gold: Partial<InvokeAIPaletteSteps>;
goldAlpha: Partial<InvokeAIPaletteSteps>;
working: Partial<InvokeAIPaletteSteps>;
workingAlpha: Partial<InvokeAIPaletteSteps>;
warning: Partial<InvokeAIPaletteSteps>;