Merge pull request #151 from rahulg1254/admin-master

Task #223692 feat: Matched the figma for admin
tekdi · Aug 22, 2024 · 5abea0a · 5abea0a
2 parents 5708637 + b2794fc
commit 5abea0a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/src/components/layouts/FullLayout.tsx b/src/components/layouts/FullLayout.tsx
@@ -136,7 +136,8 @@ const FullLayout = ({ children }: any) => {
       <Header
         sx={{
           paddingLeft: isSidebarOpen && lgUp ? "265px" : "",
-          backgroundColor: "#4d4639",
+          backgroundColor: "#FFFFFF",
+          boxshow: "0px 4px 4px rgba(0, 0, 0, 0.25)",
         }}
         toggleMobileSidebar={() => setMobileSidebarOpen(true)}
       />

diff --git a/src/components/layouts/header/Profile.tsx b/src/components/layouts/header/Profile.tsx
@@ -219,8 +219,9 @@ const Profile = () => {
         aria-controls="profile-menu"
         aria-haspopup="true"
         onClick={handleClick4}
+        sx={{ border: "none" }}
       >
-        <Box display="flex" alignItems="center" color="white">
+        <Box display="flex" alignItems="center" color="#1F1B13">
           <AccountCircleIcon />
           <Box
             sx={{
@@ -238,7 +239,7 @@ const Profile = () => {
             </Typography>
             <Typography
               variant="body1"
-              fontWeight="700"
+              fontWeight="400"
               sx={{
                 ml: 1,
                 maxWidth: "200px",

diff --git a/src/pages/block.tsx b/src/pages/block.tsx
@@ -516,6 +516,7 @@ const Block: React.FC = () => {
               <FormControl
                 sx={{
                   width: "25%",
+                  marginLeft: 2,
                   "@media (max-width: 580px)": {
                     width: "100%",
                   },
@@ -543,7 +544,7 @@ const Block: React.FC = () => {
                 }}
               >
                 <InputLabel
-                  sx={{ backgroundColor: "#F7F7F7", padding: "2px 8px" }}
+                  sx={{ backgroundColor: "white", padding: "2px 8px" }}
                   id="district-select-label"
                 >
                   {t("MASTER.DISTRICTS")}

diff --git a/src/pages/district.tsx b/src/pages/district.tsx
@@ -389,7 +389,7 @@ const District: React.FC = () => {
             <Box display="flex" gap={2}>
               <FormControl
                 variant="outlined"
-                sx={{ minWidth: 220, marginTop: 2 }}
+                sx={{ minWidth: 220, marginTop: 1, mb: 2, marginLeft: 2 }}
               >
                 <InputLabel id="state-select-label">{stateValue}</InputLabel>
                 <Select labelId="state-select-label" id="state-select" disabled>