cleaned up styling
This commit is contained in:
1 parent
2db116ad9b
commit
8d804add13
25 files changed
+259
-186
No files matched your search
+27
-17
@@ -11,29 +11,39 @@ export const {
|
||||
ThemeProvider,
|
||||
useTheme,
|
||||
} = createTheming(createContext({
|
||||
primary: '#111111',
|
||||
secondary: '#1c1c1c',
|
||||
primaryAccent: '#bbbbbb',
|
||||
secondaryAccent: '#929191',
|
||||
primary: 'var(--primary)',
|
||||
primaryLight: 'var(--primary-light)',
|
||||
primaryLightOpaque: 'var(--primary-light-opaque)',
|
||||
secondary: 'var(--secondary)',
|
||||
secondaryOpaque: 'var(--secondary-opaque)',
|
||||
primaryAccent: 'var(--primary-acccent)',
|
||||
primaryAccentLight: 'var(--primary-acccent-light)',
|
||||
secondaryAccent: 'var(--secondary-accent)',
|
||||
condition: {
|
||||
primaryColor: '#4f4f77',
|
||||
primaryColor: 'var(--condition-primary)',
|
||||
primaryAccent: 'var(--condition-accent)',
|
||||
primaryColorOpaque: 'var(--condition-primary-opaque)'
|
||||
},
|
||||
red: '#ed0c0c',
|
||||
redAccent: '#9f3a3a',
|
||||
green: 'var(--green)',
|
||||
greenLight: 'var(--green-light)',
|
||||
greenOpaque: 'var(--green-opaque)',
|
||||
red: 'var(--error)',
|
||||
redOpaque: 'var(--error-opaque)',
|
||||
redAccent: 'var(--error-accent)',
|
||||
}));
|
||||
|
||||
export type GetThemeType<C extends Context<any>> = C extends Context<infer T> ? T : unknown;
|
||||
export type GetThemeType<C extends Context<any>> = C extends Context<infer T> ? T : unknown;
|
||||
export type ClassNamesOfStyle<F extends (...args: any) => any> = Record<keyof ReturnType<F>, string>;
|
||||
export type AppTheme = GetThemeType<typeof ThemeContext>;
|
||||
export const createAppUseStyles = <
|
||||
Props extends {} = {},
|
||||
C extends string = string,
|
||||
>(f: (theme: AppTheme) => Styles<C, Props, AppTheme>) => (props: Props): {
|
||||
classes: Classes<keyof Styles<C, Props, AppTheme>>,
|
||||
theme: AppTheme,
|
||||
} => {
|
||||
const theme = useTheme();
|
||||
const useStyles = createUseStyles<C,Props,AppTheme>(f as any)
|
||||
const classes = useStyles({...props, theme}) as Classes<keyof Styles<C, Props, AppTheme>>;
|
||||
return {classes, theme};
|
||||
}
|
||||
>(f: (theme: AppTheme) => Styles<C, Props, AppTheme>) => (props: Props): {
|
||||
classes: Classes<keyof Styles<C, Props, AppTheme>>,
|
||||
theme: AppTheme,
|
||||
} => {
|
||||
const theme = useTheme();
|
||||
const useStyles = createUseStyles<C, Props, AppTheme>(f as any)
|
||||
const classes = useStyles({ ...props, theme }) as Classes<keyof Styles<C, Props, AppTheme>>;
|
||||
return { classes, theme };
|
||||
}
|
||||
Reference in new issue
Block a user