diff --git a/Client/src/Components/BasicTable/index.css b/Client/src/Components/BasicTable/index.css index 47a47439d..208604021 100644 --- a/Client/src/Components/BasicTable/index.css +++ b/Client/src/Components/BasicTable/index.css @@ -5,8 +5,7 @@ white-space: nowrap; } .MuiTable-root .host span { - font-size: var(--env-var-font-size-small); - margin-left: 8px; + font-size: 11px; } .MuiTable-root .label { @@ -180,3 +179,16 @@ body:has(.pagination-dropdown) p:has(+ .MuiTablePagination-root) { body:has(.pagination-dropdown) p:has(+ .MuiTablePagination-root) { font-size: var(--env-var-font-size-small-plus); } + +.monitors .MuiTable-root .MuiTableHead-root .MuiTableCell-root { + text-transform: uppercase; + color: var(--env-var-color-5); + opacity: 0.8; + font-size: var(--env-var-font-size-small-plus); + font-weight: 400; +} +.monitors .MuiTableCell-root:not(:first-of-type):not(:last-of-type), +.monitors .MuiTableCell-root:not(:first-of-type):not(:last-of-type) { + padding-left: var(--env-var-spacing-1); + padding-right: var(--env-var-spacing-1); +} diff --git a/Client/src/Components/BasicTable/index.jsx b/Client/src/Components/BasicTable/index.jsx index bef5bd651..c723d2bec 100644 --- a/Client/src/Components/BasicTable/index.jsx +++ b/Client/src/Components/BasicTable/index.jsx @@ -233,6 +233,7 @@ const BasicTable = ({ data, paginated, reversed, table }) => { direction="row" alignItems="center" justifyContent="space-between" + px={theme.gap.small} > Showing {getRange()} of {data.rows.length} monitor(s) @@ -277,7 +278,10 @@ const BasicTable = ({ data, paginated, reversed, table }) => { }, }, }} - sx={{ mt: theme.gap.medium }} + sx={{ + mt: theme.gap.medium, + color: theme.palette.otherColors.bluishGray, + }} /> )} diff --git a/Client/src/Components/Charts/Servers/ServerStatus.jsx b/Client/src/Components/Charts/Servers/ServerStatus.jsx deleted file mode 100644 index c06d0436b..000000000 --- a/Client/src/Components/Charts/Servers/ServerStatus.jsx +++ /dev/null @@ -1,28 +0,0 @@ -import React from "react"; -import "./serverStatus.css"; -import PropTypes from "prop-types"; - -/** - * @component - * @param {Object} props - * @param {string} props.title - The title text for the server status (required) - * @param {number} props.value - The value text to be displayed (required) - * @param {string} props.state - The state of the server (e.g., "online", "offline", "warning") (required) - * @returns {JSX.Element} - Renders the server status component - */ -const ServerStatus = ({ title, value, state }) => { - return ( -
-
{title}
-
{value}
-
- ); -}; - -ServerStatus.propTypes = { - title: PropTypes.string.isRequired, - value: PropTypes.number.isRequired, - state: PropTypes.string.isRequired, -}; - -export default ServerStatus; diff --git a/Client/src/Components/Charts/Servers/serverStatus.css b/Client/src/Components/Charts/Servers/serverStatus.css deleted file mode 100644 index fcbf470aa..000000000 --- a/Client/src/Components/Charts/Servers/serverStatus.css +++ /dev/null @@ -1,46 +0,0 @@ -:root { - --spacing-general-0: 12px 18px; - --spacing-general-1: 20px; - --color-border-0: #eaecf0; - --border-radius-0: 4px; - --font-size-0: 1rem; - --font-size-2: 36px; - - --color-up: #17b26a; - --color-down: #f04438; - --color-pause: #fdb022; -} - -.server-status-tile { - min-width: 100px; - width: calc(100% - 310px); - padding: var(--spacing-general-0); - border: 1px solid var(--color-border-0); - border-radius: var(--border-radius-0); - background-color: var(--env-var-color-8); -} - -.server-status-tile-title { - font-size: var(--font-size-0); - font-weight: 500; - margin-bottom: calc(var(--spacing-general-1) / 2); - color: var(--env-var-color-5); - opacity: 0.6; -} - -.server-status-tile-value { - font-size: var(--font-size-2); - font-weight: bolder; -} - -.up { - color: var(--color-up); -} - -.down { - color: var(--color-down); -} - -.pause { - color: var(--color-pause); -} diff --git a/Client/src/Components/Sidebar/index.css b/Client/src/Components/Sidebar/index.css index 8ce0089bc..4c253c781 100644 --- a/Client/src/Components/Sidebar/index.css +++ b/Client/src/Components/Sidebar/index.css @@ -15,6 +15,9 @@ aside span.MuiTypography-root { font-size: var(--env-var-font-size-medium); line-height: 1; } +aside .MuiStack-root + span.MuiTypography-root { + font-size: var(--env-var-font-size-medium-plus); +} aside .MuiListSubheader-root { font-size: var(--env-var-font-size-small); font-weight: 500; diff --git a/Client/src/Components/Sidebar/index.jsx b/Client/src/Components/Sidebar/index.jsx index ae6507b69..873ec8212 100644 --- a/Client/src/Components/Sidebar/index.jsx +++ b/Client/src/Components/Sidebar/index.jsx @@ -194,6 +194,7 @@ function Sidebar() { sx={{ pt: theme.gap.small, px: collapsed ? theme.gap.xs : theme.gap.small, + backgroundColor: "transparent" }} > Menu @@ -394,6 +395,7 @@ function Sidebar() { sx={{ pt: theme.gap.small, px: collapsed ? 0 : theme.gap.small, + backgroundColor: "transparent" }} > Other diff --git a/Client/src/Layouts/HomeLayout/index.css b/Client/src/Layouts/HomeLayout/index.css index dcdcf0535..e85a6362b 100644 --- a/Client/src/Layouts/HomeLayout/index.css +++ b/Client/src/Layouts/HomeLayout/index.css @@ -20,7 +20,7 @@ height: calc(100vh - var(--env-var-spacing-2) * 2); max-width: var(--env-var-side-bar-width); - border: 1px solid var(--color-border-0); + border: 1px solid var(--env-var-color-6); border-radius: var(--env-var-radius-1); background-color: var(--env-var-color-8); diff --git a/Client/src/Pages/Monitors/CreateMonitor/index.css b/Client/src/Pages/Monitors/CreateMonitor/index.css index ecb27969c..2a1b5a2a6 100644 --- a/Client/src/Pages/Monitors/CreateMonitor/index.css +++ b/Client/src/Pages/Monitors/CreateMonitor/index.css @@ -1,13 +1,11 @@ .create-monitor h1.MuiTypography-root { font-size: var(--env-var-font-size-large-plus); color: var(--env-var-color-1); -} -.create-monitor h1.MuiTypography-root, -.create-monitor h2.MuiTypography-root { - font-weight: 600; + font-weight: 500; } .create-monitor h2.MuiTypography-root { font-size: var(--env-var-font-size-large); + font-weight: 600; } .create-monitor p.MuiTypography-root, .create-monitor button.MuiButtonBase-root { diff --git a/Client/src/Pages/Monitors/CreateMonitor/index.jsx b/Client/src/Pages/Monitors/CreateMonitor/index.jsx index 28493080a..05e343e77 100644 --- a/Client/src/Pages/Monitors/CreateMonitor/index.jsx +++ b/Client/src/Pages/Monitors/CreateMonitor/index.jsx @@ -157,9 +157,20 @@ const CreateMonitor = () => { noValidate spellCheck="false" gap={theme.gap.large} - mt={theme.gap.mlplus} + mt={theme.gap.medium} > - Create new monitor + + + Create your{" "} + + + monitor + + General settings @@ -389,9 +400,9 @@ const CreateMonitor = () => { /> */}