From 0fa8a2594eea109ee727c63161d8eb4572b5902d Mon Sep 17 00:00:00 2001 From: alberto-abarzua Date: Mon, 6 Nov 2023 20:08:16 -0300 Subject: [PATCH] feat: update action colors and side nav --- frontend/src/components/actions/ActionSet.jsx | 4 ++-- frontend/src/components/actions/BaseAction.jsx | 4 ++-- frontend/src/components/controls/ArmStatus.jsx | 2 +- frontend/src/components/general/layout/SideNav.jsx | 10 ++++------ frontend/src/views/MainView.jsx | 4 ++-- frontend/tailwind.config.js | 12 ++++++------ 6 files changed, 17 insertions(+), 19 deletions(-) diff --git a/frontend/src/components/actions/ActionSet.jsx b/frontend/src/components/actions/ActionSet.jsx index d2ce9b36..456dc342 100644 --- a/frontend/src/components/actions/ActionSet.jsx +++ b/frontend/src/components/actions/ActionSet.jsx @@ -51,7 +51,7 @@ const ActionSet = ({ action, ...props }) => { ) : (
- + Sub Actions @@ -63,7 +63,7 @@ const ActionSet = ({ action, ...props }) => { ); return ( } action={action} {...props} diff --git a/frontend/src/components/actions/BaseAction.jsx b/frontend/src/components/actions/BaseAction.jsx index fc7f29e1..166af3e5 100644 --- a/frontend/src/components/actions/BaseAction.jsx +++ b/frontend/src/components/actions/BaseAction.jsx @@ -73,8 +73,8 @@ const BaseAction = ({ icon, children, className, action, ...props }) => { running ? ( ) : ( -
e.stopPropagation()} ref={drag}> - +
e.stopPropagation()} ref={drag}> +
) ) : ( diff --git a/frontend/src/components/controls/ArmStatus.jsx b/frontend/src/components/controls/ArmStatus.jsx index 23d280f1..ad70856b 100644 --- a/frontend/src/components/controls/ArmStatus.jsx +++ b/frontend/src/components/controls/ArmStatus.jsx @@ -31,7 +31,7 @@ const ArmStatus = () => { status.icon = AddHomeIcon; } else { status.label = 'Ready'; - status.color = 'bg-green-200'; + status.color = 'bg-green-300'; status.icon = DoneAllIcon; } } else if (armStatus === ControllerStatus.STOPPED) { diff --git a/frontend/src/components/general/layout/SideNav.jsx b/frontend/src/components/general/layout/SideNav.jsx index a7e8fdb5..0d247f79 100644 --- a/frontend/src/components/general/layout/SideNav.jsx +++ b/frontend/src/components/general/layout/SideNav.jsx @@ -3,15 +3,13 @@ import PrecisionManufacturingIcon from '@mui/icons-material/PrecisionManufacturi import SettingsIcon from '@mui/icons-material/Settings'; const SideNav = () => { return ( -
-
-
- -
+
+
+
- +
diff --git a/frontend/src/views/MainView.jsx b/frontend/src/views/MainView.jsx index 11b08508..08d1dd93 100644 --- a/frontend/src/views/MainView.jsx +++ b/frontend/src/views/MainView.jsx @@ -9,11 +9,11 @@ export default function Home() { return (
-
+
-
+
diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js index 828f0067..a245ae96 100644 --- a/frontend/tailwind.config.js +++ b/frontend/tailwind.config.js @@ -59,18 +59,18 @@ module.exports = { 'action-tool-hover': colors.amber[600], 'action-sleep': { ...colors.indigo, - DEFAULT: colors.indigo[700], + DEFAULT: colors.sky[700], }, - 'action-sleep-hover': colors.indigo[800], + 'action-sleep-hover': colors.sky[800], 'action-set': { - ...colors.red, - DEFAULT: colors.red[500], + ...colors.pink, + DEFAULT: colors.pink[700], }, - 'action-set-hover': colors.red[600], + 'action-set-hover': colors.pink[800], - 'action-data': colors.slate[100], + 'action-data': colors.sky[50], }, borderRadius: { lg: 'var(--radius)',