Merge pull request #91 from shreyas1434shinde/main

Issue #PS-2322 fix: Workspace UI improvements and Fixes
tekdi · Nov 14, 2024 · 3bb8846 · 3bb8846
2 parents 11c2d7c + 69fc9ff
commit 3bb8846
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 9 deletions.
diff --git a/public/delete.png b/public/delete.png
diff --git a/src/components/KaTableComponent.tsx b/src/components/KaTableComponent.tsx
@@ -7,6 +7,7 @@ import "ka-table/style.css";
 import DeleteIcon from "@mui/icons-material/Delete";
 import router from "next/router";
 import { MIME_TYPE } from "@/utils/app.config";
+import Image from "next/image";
 
 interface CustomTableProps {
   data: any[]; // Define a more specific type for your data if needed
@@ -149,9 +150,9 @@ const KaTableComponent: React.FC<CustomTableProps> = ({ data, columns, handleDel
             else if (props.column.key === 'contentAction') {
               if (props.rowData.status === "Draft") {
                 return (
-                  <IconButton
+                  <Box
                     onClick={handleDelete}
-                    color="error"
+
                   >
                     <Box sx={{
                       background: '#FAEEEC',
@@ -163,19 +164,26 @@ const KaTableComponent: React.FC<CustomTableProps> = ({ data, columns, handleDel
                       alignItems: 'center'
                     }}>
 
-                      <DeleteIcon sx={{ fontSize: '18px' }} />
+                      {/* <Image src={'/logo.png'} alt="" /> */}
+                      <img
+                        src={'/delete.png'}
+                        height="25px"
+                        alt="Image"
+
+                      />
+
                     </Box>
-                  </IconButton>
+                  </Box>
                 );
               }
             }
             else if (props.column.key === 'action') {
 
 
               return (
-                <IconButton
+                <Box
                   onClick={handleDelete}
-                  color="error"
+
                 >
                   <Box sx={{
                     background: '#FAEEEC',
@@ -187,9 +195,14 @@ const KaTableComponent: React.FC<CustomTableProps> = ({ data, columns, handleDel
                     alignItems: 'center'
                   }}>
 
-                    <DeleteIcon sx={{ fontSize: '18px' }} />
+                    <img
+                      src={'/delete.png'}
+                      height="25px"
+                      alt="Image"
+
+                    />
                   </Box>
-                </IconButton>
+                </Box>
               );
             }
             return props.children; // Default content for other columns

diff --git a/src/styles/global.css b/src/styles/global.css
@@ -1,3 +1,5 @@
+@import url("https://fonts.googleapis.com/css2?family=Poppins:wght@400;500;600;700&display=swap");
+
 .player-grid {
   height: 100%;
   width: 100%;
@@ -17,7 +19,8 @@ html,
 body {
   margin: 0;
   padding: 0;
-  background: '#F3F5F8';
+  background: 'red';
+  font-family: Poppins, sans-serif !important;
 }
 
 .drawer-select div div {
@@ -51,4 +54,25 @@ body {
 
 .ka-table-wrapper {
   height: 50vh !important;
+}
+
+.css-1bxxajt-MuiInputBase-root-MuiOutlinedInput-root.Mui-focused .MuiOutlinedInput-notchedOutline {
+  border-color: #FDBE16 !important;
+}
+
+/* .delete-icon {
+  background-image: url('../Assets/image/delete.png') !important;
+  height: 18px;
+  width: 18px;
+} */
+
+div h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+span,
+p .css-1ydl6z0-MuiTypography-root {
+  font-family: Poppins, sans-serif !important;
 }