using more of mui colors

This commit is contained in:
ari committed 2022-07-04 22:38:55 -04:00
1 parent d50674c8fe
commit 905a5ac4d7
21 files changed
+150 -132

No files matched your search

@@ -28,7 +28,7 @@
.automation-editor--info-box--tags {
padding: 0.25em 0.75em 1em 0.75em;
border-color: var(--primary-accent);
border-color: var(--mui-grey-400);
border-width: 1px;
border-style: ridge;
border-radius: 5px;
@@ -34,8 +34,8 @@
}
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--toolbar * {
border-color: var(--change);
color: var(--change)
border-color: var(--mui-success-light);
color: var(--mui-success-light)
}
@@ -47,12 +47,12 @@
}
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--flow {
border-color: var(--change);
border-color: var(--mui-success-light);
}
.automation-editor--flow-wrapper--flow {
flex: 1;
border: 1px solid var(--secondary-accent);
border: 1px solid var(--mui-grey-700);
margin: 0 0 0.5em 0;
z-index: 1;
}
@@ -25,15 +25,15 @@
padding-bottom: 0.5em;
border-width: 1px;
border-bottom-style: solid;
border-color: var(--primary-accent);
border-color: var(--mui-grey-400);
}
.automation-list-box--body--group.other {
border-color: var(--green);
border-color: var(--mui-success-main);
}
.automation-list-box--body--group.other>b {
color: var(--change);
color: var(--mui-success-light);
}
.automation-list-box--body--group>.automation-list-box--body--group {
@@ -51,8 +51,8 @@
.automation-list-box--body--group>b:hover,
.automation-list-box--body--group.selected>b {
background-color: var(--secondary-accent);
color: var(--secondary);
background-color: var(--mui-grey-700);
color: var(--mui-secondary-contrastText);
}
@@ -67,6 +67,6 @@
.automation-list-box--bottom>button {
background-color: #070;
color: var(--primary-accent);
color: var(--mui-grey-400);
padding: 0.5em 2em;
}
@@ -1,18 +1,18 @@
.automation-list-box--body--item:hover, .automation-list-box--body--item.selected {
outline-color: var(--primary-accent);
outline-color: var(--mui-grey-400);
outline-style: solid;
outline-width: 1px;
background-color: var(--secondary);
background-color: var(--mui-secondary-contrastText);
}
.automation-list-box--body--item:hover>.automation-list-box--body--item--tags>span {
border-color: var(--primary);
border-color: var(--mui-common-black);
}
.automation-list-box--body--item--tags--add:hover {
border-color: var(--primary);
color: var(--primary-accent);
background-color: var(--secondary);
border-color: var(--mui-common-black);
color: var(--mui-grey-400);
background-color: var(--mui-secondary-contrastText);
}
.automation-list-box--body--item {
@@ -42,9 +42,9 @@
}
.automation-list-box--body--item--buttons .save {
color: var(--green-light)
color: var(--mui-success-light)
}
.automation-list-box--body--item--buttons .save:hover {
color: var(--green)
color: var(--mui-success-main)
}
@@ -27,7 +27,7 @@
}
.automation-list-box--body--item--tags>span {
border-color: var(--primary-accent);
border-color: var(--mui-grey-400);
border-style: solid;
border-width: 1px;
border-radius: 0.5em;
@@ -63,7 +63,7 @@
padding: 0;
min-width: 6em;
max-width: 10em;
background-color: var(--primary);
background-color: var(--mui-common-black);
}
.automation-list-box--body--item--tags--item>.text .icon {
@@ -74,10 +74,10 @@
}
.automation-list-box--body--item--tags--item>.text .icon:hover {
background-color: var(--primary-accent);
background-color: var(--mui-grey-400);
border-radius: 20px;
}
.automation-list-box--body--item--tags--item>.text .icon:hover svg {
fill: var(--primary);
fill: var(--mui-common-black);
}
@@ -35,7 +35,7 @@
.automation-list--root.mobile .automation-editor--info-box--icon {
left: 0.5em;
bottom: 0em;
background-color: var(--primary);
background-color: var(--mui-common-black);
transform: rotate(90deg);
}
@@ -23,8 +23,8 @@
justify-content: center;
min-height: calc(100% - 1px);
max-height: calc(100% - 1px);
background-color: var(--secondary);
border-color: var(--secondary-accent);
background-color: var(--mui-secondary-contrastText);
border-color: var(--mui-grey-700);
border-bottom-style: solid;
border-width: 1px;
}
@@ -49,7 +49,7 @@
.condition-node-base.is-edited>.condition-node-base--body {
max-height: calc(100%-2px-1em);
max-width: calc(100vw-2px-1em);
border-color: var(--green);
border-color: var(--mui-success-main);
border-style: solid;
border-width: 1px;
margin: 0.25em;
@@ -62,5 +62,5 @@
justify-content: center;
align-items: center;
padding: 0.5em;
background-color: var(--secondary);
background-color: var(--mui-secondary-contrastText);
}
@@ -39,5 +39,5 @@
}
.condition-node--settings .speed-dial--button:hover button {
background-color: var(--secondary-accent);
background-color: var(--mui-grey-700);
}
@@ -23,7 +23,7 @@
gap: 0.5em;
/* shape */
background-color: var(--error-dark);
background-color: var(--mui-error-dark);
border-radius: 1em;
height: 100%;
max-height: 100%;
@@ -34,18 +34,18 @@
border-top-style: solid;
border-top-left-radius: 10px;
border-top-right-radius: 10px;
border-top-color: var(--error);
border-top-color: var(--mui-error-main);
}
.dagnode-error--inner:hover {
background-color: var(--error-accent);
background-color: var(--mui-error-contrastText);
cursor: default;
}
.dagnode-error--inner--edit-icon:hover {
transform: rotate(180deg);
cursor: pointer;
background-color: var(--error);
background-color: var(--mui-error-main);
padding: 0.5em;
border-radius: 10px;
height: 0.25em;
+43 -21
View File
@@ -1,34 +1,56 @@
import "./DAGErrorNode.css";
import { Handle, Position } from 'react-flow-renderer';
import { FC } from 'react';
import { InfoIcon, PencilIcon } from 'components/Icons';
import { Handle, Position } from "react-flow-renderer";
import { FC } from "react";
import { InfoIcon, PencilIcon } from "components/Icons";
export interface DAGErrorNodeProps {
height: number;
width: number;
flipped: boolean;
hasInput?: boolean;
error?: any,
error?: any;
onEdit: () => void;
}
export const DAGErrorNode: FC<DAGErrorNodeProps> = ({
height, width, hasInput, error, onEdit, flipped
height,
width,
hasInput,
error,
onEdit,
flipped,
}) => {
// render
return <>
{hasInput && <Handle type="target" position={flipped ? Position.Top : Position.Left} />}
<Handle type="source" position={flipped ? Position.Bottom : Position.Right} />
<div className={["dagnode-error"].join(' ')} style={{
height,
width,
maxHeight: height,
maxWidth: width,
}}>
<div className={"dagnode-error--inner"} title={String(error)}>
<InfoIcon color="var(--error-light)" size={1.25} />
Invalid Node
<PencilIcon className="dagnode-error--inner--edit-icon" size={1.25} onClick={onEdit} />
return (
<>
{hasInput && (
<Handle
type="target"
position={flipped ? Position.Top : Position.Left}
/>
)}
<Handle
type="source"
position={flipped ? Position.Bottom : Position.Right}
/>
<div
className={["dagnode-error"].join(" ")}
style={{
height,
width,
maxHeight: height,
maxWidth: width,
}}
>
<div className={"dagnode-error--inner"} title={String(error)}>
<InfoIcon color="var(--mui-error-light)" size={1.25} />
Invalid Node
<PencilIcon
className="dagnode-error--inner--edit-icon"
size={1.25}
onClick={onEdit}
/>
</div>
</div>
</div>
</>
}
</>
);
};
+4 -4
View File
@@ -48,16 +48,16 @@
position: absolute;
top: -1em;
left: -1em;
background-color: var(--primary);
border-color: var(--primary-accent);
background-color: var(--mui-common-black);
border-color: var(--mui-grey-400);
border-style: solid;
border-width: 0.5px;
border-radius: 20px;
}
.open>.dagnode--actions-btn, .dagnode--actions-btn:hover {
color: var(--primary);
background-color: var(--primary-accent);
color: var(--mui-common-black);
background-color: var(--mui-grey-400);
border-radius: 20px;
}
+1 -1
View File
@@ -33,7 +33,7 @@
position: absolute;
left: 2em;
top: 2.5em;
color: var(--primary-accent);
color: var(--mui-grey-400);
}
.input-yaml .MuiButtonBase-root.icon-button[type="button"].icon-button {
@@ -17,7 +17,7 @@ const Template: ComponentStory<typeof SearchItem> = (args) => {
style={{
width: "15em",
height: "3em",
border: "1px solid var(--primary-accent)",
border: "1px solid var(--mui-grey-400)",
}}
>
<SearchItem {...args} />
@@ -235,7 +235,7 @@ const computeInvalidYaml = (
node,
isErrored: true,
invalidManualYaml: (
<ul key={"error"} className="node-editor--error">
<ul key={"error"} className="node-editor--mui-error-main">
{errors.map(({ message, path }, i) => (
<li key={i}>
<b>{path}</b>: {message}
+7 -7
View File
@@ -9,24 +9,24 @@
}
.node-editor--root.disabled {
background-color: var(--secondary);
background-color: var(--mui-secondary-contrastText);
}
.node-editor--root.disabled .enabled-flag {
color: var(--secondary-accent);
color: var(--mui-grey-700);
}
.node-editor--root.modded {
border: 1px solid var(--change);
border: 1px solid var(--mui-success-light);
border-radius: 5px;
}
.node-editor--root.modded * {
border-color: var(--change);
border-color: var(--mui-success-light);
}
.node-editor--root.not-ready .node-editor--footer--save {
color: var(--error)
color: var(--mui-error-main)
}
.node-editor--body-title {
@@ -67,7 +67,7 @@
min-width: 25vw;
}
.node-editor--error {
.node-editor--mui-error-main {
max-width: 30em;
overflow: auto;
max-height: 10em;
@@ -78,7 +78,7 @@
margin: 0;
}
.node-editor--error>li {
.node-editor--mui-error-main>li {
text-align: left;
}
+2 -2
View File
@@ -11,8 +11,8 @@
/* font */
font-size: 16px;
font-family: Tahoma, Geneva, sans-serif;
/* color : var(--primary-accent); */
/* color : var(--mui-grey-400); */
/* background */
/* background-color: var(--primary); */
/* background-color: var(--mui-common-black); */
}
@@ -3,11 +3,11 @@
flex-direction: column;
padding: 0.5em 0.25em;
margin: 0.5em 0.25em;
border-color: var(--primary-accent);
border-color: var(--mui-grey-400);
border-width: 1px;
border-style: solid;
border-radius: 5px;
background-color: var(--secondary);
background-color: var(--mui-secondary-contrastText);
}
.service-editor hr {
+1 -1
View File
@@ -23,7 +23,7 @@
.speed-dial--list {
position: absolute;
background: var(--secondary);
background: var(--mui-secondary-contrastText);
z-index: 10;
height: fit-content;
padding: 0.1em;
+1 -1
View File
@@ -108,7 +108,7 @@ const Test: FC = () => {
serviceEditElm = (
<div
style={{
border: "1px solid var(--primary-accent)",
border: "1px solid var(--mui-grey-400)",
maxWidth: "100vw",
padding: "2.5em",
margin: "2.5em",
+3 -19
View File
@@ -2,25 +2,9 @@
@import url(https://fonts.googleapis.com/icon?family=Material+Icons);
:root {
--primary: #111;
--primary-light: #333;
--primary-light-opaque: #3335;
--secondary-opaque: #1c1c1c;
--secondary: #1c1c1c;
--primary-accent: #bbb;
--primary-accent-light: #eee;
--secondary-accent: #929191;
--green: #1f1;
--green-opaque: #1f15;
--green-light: #6f5;
--error: #c55;
--error-light: #f77;
--error-dark: #5c2323;
--error-opaque: #c555;
--error-accent: #9f3a3a;
--change: #0f9;
--condition-primary: #447;
--condition-accent: #8af;
--condition-primary-opaque: #4476;
touch-action: pan-x pan-y;
height: 100%;
@@ -48,17 +32,17 @@ body,
/* Track */
::-webkit-scrollbar-track {
background: var(--secondary);
background: var(--mui-secondary-contrastText);
}
/* Handle */
::-webkit-scrollbar-thumb {
background: var(--secondary-accent);
background: var(--mui-grey-700);
}
/* Handle on hover */
::-webkit-scrollbar-thumb:hover {
background: var(--primary-accent);
background: var(--mui-grey-400);
}
* {
+51 -39
View File
@@ -1,49 +1,61 @@
import "styles/root.css";
import { Classes } from "jss";
import { Context, createContext } from "react"
import { Context, createContext } from "react";
import { createUseStyles, Styles } from "react-jss";
import { createTheming } from "theming"
import { createTheming } from "theming";
export const {
context: ThemeContext,
ThemeProvider,
useTheme,
} = createTheming(createContext({
primary: 'var(--primary)',
primaryLight: 'var(--primary-light)',
primaryLightOpaque: 'var(--primary-light-opaque)',
secondary: 'var(--secondary)',
secondaryOpaque: 'var(--secondary-opaque)',
primaryAccent: 'var(--primary-accent)',
primaryAccentLight: 'var(--primary-accent-light)',
secondaryAccent: 'var(--secondary-accent)',
context: ThemeContext,
ThemeProvider,
useTheme,
} = createTheming(
createContext({
primary: "var(--mui-common-black)",
primaryLight: "var(--mui-grey-600)",
primaryLightOpaque: "var(--primary-light-opaque)",
secondary: "var(--mui-secondary-contrastText)",
secondaryOpaque: "var(--mui-secondary-contrastText)",
primaryAccent: "var(--mui-grey-400)",
primaryAccentLight: "var(--mui-grey-200)",
secondaryAccent: "var(--mui-grey-700)",
condition: {
primaryColor: 'var(--condition-primary)',
primaryAccent: 'var(--condition-accent)',
primaryColorOpaque: 'var(--condition-primary-opaque)'
primaryColor: "var(--mui-info-dark)",
primaryAccent: "var(--mui-info-light)",
primaryColorOpaque: "var(--condition-primary-opaque)",
},
green: 'var(--green)',
greenLight: 'var(--green-light)',
greenOpaque: 'var(--green-opaque)',
red: 'var(--error)',
redOpaque: 'var(--error-opaque)',
redAccent: 'var(--error-accent)',
redLight: 'var(--error-light)',
}));
green: "var(--mui-success-main)",
greenLight: "var(--mui-success-light)",
greenOpaque: "var(--green-opaque)",
red: "var(--mui-error-main)",
redOpaque: "var(--error-opaque)",
redAccent: "var(--mui-error-contrastText)",
redLight: "var(--mui-error-light)",
})
);
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 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 };
}
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 };
};