diff --git a/index.html b/index.html index 1eaa375..c978437 100644 --- a/index.html +++ b/index.html @@ -5,15 +5,18 @@ - + Dashfront - + {returnTo ? ( [b.id, b.name])); @@ -180,7 +183,7 @@ class ArtikelMarkenPage extends PureComponent { return ( - + {brands.length === 0 ? ( diff --git a/src/routes/artikel/merkmale.jsx b/src/routes/artikel/merkmale.jsx index 00245a8..8f532a2 100644 --- a/src/routes/artikel/merkmale.jsx +++ b/src/routes/artikel/merkmale.jsx @@ -24,6 +24,15 @@ import { notifyError } from '../../utils/notify'; import { setLastArticleSku } from '../../automats'; import attributeAutomat, { selectAttributes } from '../../automats/attributeAutomat'; import propertyAutomat, { selectProperties } from '../../automats/propertyAutomat'; +import { + BLUE_PANEL, + ORANGE_PANEL, + PURPLE_PANEL, + SELECT_BG, + SELECT_BG_HOVER, + SELECT_BORDER, + TINT_SUBTLE, +} from '../../colors'; function draftsFrom(items, key = 'name') { return Object.fromEntries((items || []).map((row) => [row.id, row[key]])); @@ -609,16 +618,10 @@ class ArtikelMerkmalePage extends PureComponent { return ( <> {/* SortableJS ghost / chosen styling from /artikel/lager */} - {/* Tile 1: Attribute (Auswahllisten) */} - + @@ -642,11 +645,11 @@ class ArtikelMerkmalePage extends PureComponent { borderRadius: 1.5, alignItems: 'center', cursor: 'pointer', - bgcolor: isSelected ? 'rgba(59, 130, 246, 0.12)' : 'transparent', - border: isSelected ? '1px solid rgba(59, 130, 246, 0.3)' : '1px solid transparent', + bgcolor: isSelected ? SELECT_BG : 'transparent', + border: isSelected ? `1px solid ${SELECT_BORDER}` : '1px solid transparent', transition: 'all 0.15s ease', '&:hover': { - bgcolor: isSelected ? 'rgba(59, 130, 246, 0.16)' : 'rgba(0, 0, 0, 0.04)', + bgcolor: isSelected ? SELECT_BG_HOVER : TINT_SUBTLE, }, }} data-id={a.id} @@ -764,7 +767,7 @@ class ArtikelMerkmalePage extends PureComponent { {/* Tile 2: Werte für das gewählte Attribut */} - + @@ -867,7 +870,7 @@ class ArtikelMerkmalePage extends PureComponent { {/* Tile 3: Merkmale (Freitext) */} - + diff --git a/src/routes/artikel/vorlagen.jsx b/src/routes/artikel/vorlagen.jsx index e46c05d..aab352a 100644 --- a/src/routes/artikel/vorlagen.jsx +++ b/src/routes/artikel/vorlagen.jsx @@ -25,6 +25,10 @@ import { notifyError } from '../../utils/notify'; import { setLastArticleSku } from '../../automats'; import { labeltemplate } from '../../api'; import { enqueueSnackbar } from 'notistack'; +import { + BLUE_BG, + SURFACE_BASE, +} from '../../colors'; const CanvasEditor = lazy(async () => { await import('react-canvas-label-editor/style.css'); @@ -465,7 +469,7 @@ class ArtikelVorlagenPage extends PureComponent { return ( <> - +