updates after merge

softwareone-platform · Dec 6, 2024 · efa36e8 · efa36e8
1 parent e212463
commit efa36e8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/ngui/ui/src/components/LinearSelector/LinearSelector.tsx b/ngui/ui/src/components/LinearSelector/LinearSelector.tsx
@@ -239,6 +239,7 @@ const PickedItem = ({ name, dataTestId = name, value, type, onDelete, displayedN
       }}
       color="primary"
       size="medium"
+      sx={{ borderRadius: MPT_SPACING_2 }}
       variant="outlined"
       onDelete={onDelete}
     />

diff --git a/ngui/ui/src/components/ThemeProviderWrapper/ThemeProviderWrapper.tsx b/ngui/ui/src/components/ThemeProviderWrapper/ThemeProviderWrapper.tsx
@@ -6,7 +6,7 @@ import { ThemeProvider } from "@mui/material/styles";
 import { TssCacheProvider } from "tss-react";
 import { useThemeSettingsOptions } from "hooks/useThemeSettingsOptions";
 import getTheme from "theme";
-import { MPT_BRAND_GRAY_1 } from "../../utils/layouts";
+import { MPT_GRAY_2 } from "../../utils/layouts";
 
 const muiCache = createCache({
   key: "mui",
@@ -24,18 +24,18 @@ const globalScrollbarStyles = (
         width: "5px"
       },
       "::-webkit-scrollbar-track": {
-        background: MPT_BRAND_GRAY_1
+        background: MPT_GRAY_2
       },
       "::-webkit-scrollbar-thumb": {
         borderRadius: "0",
         backgroundClip: "padding-box",
-        backgroundColor: MPT_BRAND_GRAY_1
+        backgroundColor: MPT_GRAY_2
       },
       "::-webkit-scrollbar-thumb:hover": {
-        backgroundColor: MPT_BRAND_GRAY_1
+        backgroundColor: MPT_GRAY_2
       },
       "*": {
-        scrollbarColor: `${MPT_BRAND_GRAY_1} transparent`,
+        scrollbarColor: `${MPT_GRAY_2} transparent`,
         scrollbarWidth: "thin"
       }
     }}

diff --git a/ngui/ui/src/theme.ts b/ngui/ui/src/theme.ts
@@ -9,7 +9,7 @@ import { isEmpty as isEmptyArray } from "utils/arrays";
 import { customResponsiveFontSizes } from "utils/fonts";
 import { isEmpty as isEmptyObject } from "utils/objects";
 import {
-  MPT_BRAND_GRAY_1,
+  MPT_GRAY_2,
   MPT_GRAY_3,
   MPT_GRAY_4,
   MPT_BRAND_WHITE,
@@ -699,10 +699,10 @@ const getThemeConfig = (settings = {}) => {
               fontSize: "13px"
             },
             "&.MuiTableCell-head": {
-              borderLeft: `1px solid ${MPT_BRAND_GRAY_1}`,
+              borderLeft: `1px solid ${MPT_GRAY_2}`,
               borderBottom: "1px solid black",
               "&:last-of-type": {
-                borderRight: `1px solid ${MPT_BRAND_GRAY_1}`
+                borderRight: `1px solid ${MPT_GRAY_2}`
               }
             },
             "& .MuiIconButton-root": {
@@ -773,7 +773,10 @@ const getThemeConfig = (settings = {}) => {
         },
         styleOverrides: {
           dense: {
-            paddingRight: 0
+            paddingRight: 0,
+            ".MuiButton-root": {
+              fontSize: "14px"
+            }
           }
         }
       },

diff --git a/ngui/ui/src/utils/layouts.ts b/ngui/ui/src/utils/layouts.ts
@@ -10,13 +10,12 @@ export const SPACING_6 = 6;
 export const MPT_BRAND_PRIMARY = "#472AFF";
 
 export const MPT_BRAND_WHITE = "#FFFFFF";
-export const MPT_BRAND_GRAY_1 = "#E0E5E8"; // TODO: replace with MPT_GRAY_2
+export const MPT_BRAND_BLACK = "#000000";
 export const MPT_GRAY_1 = "#F4F6F8";
 export const MPT_GRAY_2 = "#E0E5E8";
 export const MPT_GRAY_3 = "#AEB1B9";
 export const MPT_GRAY_4 = "#6B7180";
 
-export const MPT_BRAND_GRAY_2 = "rgba(107,113,128,0.2)";
 export const MPT_SPACING_1 = "8px";
 export const MPT_SPACING_2 = "16px";
 export const MPT_SPACING_3 = "24px";
@@ -36,7 +35,7 @@ export const MPT_TERTIARY_BLUE_1 = `#CAE4FF`;
 export const MPT_TERTIARY_BLUE_2 = `#4DA6FF`;
 
 export const MPT_BOX_SHADOW = `0 1px ${MPT_SPACING_1} #6b718057`;
-export const MPT_BOX_SHADOW_THIN = `0 1px 3px ${MPT_BRAND_GRAY_2}`;
+export const MPT_BOX_SHADOW_THIN = `0 1px 4px ${MPT_GRAY_3}`;
 export const MPT_BOX_SHADOW_HOVER = `0 0 0 2px ${MPT_ALERTS_INFO_2} inset, 0 1px ${MPT_SPACING_1} #6b718057`;
 
 export const MPT_GRADIENT = "linear-gradient(270deg, #00c9cd, #472aff, #392d9c)";