From 1ef35479a718785ef1824a603643f5695f966bee Mon Sep 17 00:00:00 2001
From: Noe <noe@devnullmail.com>
Date: Tue, 4 Jul 2023 14:38:30 +0200
Subject: [PATCH] new modification

---
 typescript/Frontend/src/App.tsx                     |  4 ++--
 .../src/components/Groups/Tree/GroupTree.tsx        |  2 +-
 .../src/components/Installations/Installation.tsx   |  1 -
 .../components/Installations/InstallationList.tsx   |  1 +
 .../components/Installations/InstallationTabs.tsx   | 13 -------------
 .../components/Installations/Log/CheckboxTree.tsx   |  3 +++
 .../components/Installations/Log/TopologyView.tsx   |  2 +-
 .../src/components/Layout/InnovenergyButton.tsx     |  3 ++-
 .../src/components/Layout/InnovenergyTab.tsx        |  2 +-
 .../Frontend/src/components/Layout/LogoutButton.tsx |  3 ++-
 .../src/components/Layout/NavigationButtons.tsx     |  1 +
 .../Frontend/src/components/Layout/Search.tsx       |  2 +-
 .../Frontend/src/components/Users/UserList.tsx      |  2 ++
 typescript/Frontend/src/util/installation.util.tsx  |  4 ----
 14 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/typescript/Frontend/src/App.tsx b/typescript/Frontend/src/App.tsx
index 248cd4971..522c56e65 100644
--- a/typescript/Frontend/src/App.tsx
+++ b/typescript/Frontend/src/App.tsx
@@ -50,10 +50,10 @@ const App = () => {
               <img
                 src={innovenergyLogo}
                 alt="innovenergy logo"
-                height="75" 
+                height="100" 
               />
             </Grid>
-            <Grid item xs={9} container justifyContent="flex-end">
+            <Grid item xs={9} container justifyContent="flex-end" style={{ height: 30 }}>
               <LanguageSelect language={language} setLanguage={setLanguage} />
               <LogoutButton removeToken={removeToken} />
             </Grid>
diff --git a/typescript/Frontend/src/components/Groups/Tree/GroupTree.tsx b/typescript/Frontend/src/components/Groups/Tree/GroupTree.tsx
index 718237679..b839a2337 100644
--- a/typescript/Frontend/src/components/Groups/Tree/GroupTree.tsx
+++ b/typescript/Frontend/src/components/Groups/Tree/GroupTree.tsx
@@ -54,7 +54,7 @@ const GroupTree = () => {
             label={element.name}
             onClick={() => setCurrentType(element.type)}
             sx={{
-              ".MuiTreeItem-content": { paddingY: "12px" },
+              ".MuiTreeItem-content": { paddingY: "5px" },
               bgcolor: colors.greyDark,
               borderRadius: 2,
             }}
diff --git a/typescript/Frontend/src/components/Installations/Installation.tsx b/typescript/Frontend/src/components/Installations/Installation.tsx
index 18c2248d8..ae6a2973b 100644
--- a/typescript/Frontend/src/components/Installations/Installation.tsx
+++ b/typescript/Frontend/src/components/Installations/Installation.tsx
@@ -17,7 +17,6 @@ const Installation = (props: I_InstallationProps) => {
   const [error, setError] = useState<AxiosError>();
   const theme = useTheme();
 
-
   useEffect(() => {
     setLoading(true);
     axiosConfig
diff --git a/typescript/Frontend/src/components/Installations/InstallationList.tsx b/typescript/Frontend/src/components/Installations/InstallationList.tsx
index 607fa5995..5e7238de2 100644
--- a/typescript/Frontend/src/components/Installations/InstallationList.tsx
+++ b/typescript/Frontend/src/components/Installations/InstallationList.tsx
@@ -95,6 +95,7 @@ const InstallationList = (props: InstallationListProps) => {
                   selected={installation.id === Number(routeMatch?.params.id)}
                   disableRipple
                   sx={{
+                    paddingY: 0.6,
                     mr: "1px",
                     borderStyle: "solid",
                     backgroundColor: theme.palette.primary.dark,
diff --git a/typescript/Frontend/src/components/Installations/InstallationTabs.tsx b/typescript/Frontend/src/components/Installations/InstallationTabs.tsx
index 497f75aa7..67edc068d 100644
--- a/typescript/Frontend/src/components/Installations/InstallationTabs.tsx
+++ b/typescript/Frontend/src/components/Installations/InstallationTabs.tsx
@@ -75,13 +75,6 @@ const InstallationTabs = () => {
               component={Link}
               to={routes.liveView + id}
             />
-
-
-
-
-
-
-
             <InnovenergyTab
               sx={{
                 "&.Mui-selected": {
@@ -100,12 +93,6 @@ const InstallationTabs = () => {
               component={Link}
               to={routes.log + id}
             />
-
-
-
-
-
-
           </InnovenergyTabs>
         </Box>
       </Box>
diff --git a/typescript/Frontend/src/components/Installations/Log/CheckboxTree.tsx b/typescript/Frontend/src/components/Installations/Log/CheckboxTree.tsx
index bace93645..47817885e 100644
--- a/typescript/Frontend/src/components/Installations/Log/CheckboxTree.tsx
+++ b/typescript/Frontend/src/components/Installations/Log/CheckboxTree.tsx
@@ -69,6 +69,9 @@ const CheckboxTree = () => {
                   style ={{
                     color: theme.palette.text.primary   ,
                   }}
+                  sx={{
+                    paddingY:0,
+                  }}
 
                 />
               )}
diff --git a/typescript/Frontend/src/components/Installations/Log/TopologyView.tsx b/typescript/Frontend/src/components/Installations/Log/TopologyView.tsx
index 60812f435..a4adde798 100644
--- a/typescript/Frontend/src/components/Installations/Log/TopologyView.tsx
+++ b/typescript/Frontend/src/components/Installations/Log/TopologyView.tsx
@@ -15,7 +15,7 @@ import { colors } from "../../..";
 import { error } from "console";
 
 const TopologyView = () => {
-  const [values, setValues] = useState<TopologyValues | null>(null);  
+  const [values, setValues] = useState<TopologyValues | null>(null);
 
   useEffect(() => {
     const interval = setInterval(() => {
diff --git a/typescript/Frontend/src/components/Layout/InnovenergyButton.tsx b/typescript/Frontend/src/components/Layout/InnovenergyButton.tsx
index ccb7aeef0..883b56e98 100644
--- a/typescript/Frontend/src/components/Layout/InnovenergyButton.tsx
+++ b/typescript/Frontend/src/components/Layout/InnovenergyButton.tsx
@@ -19,7 +19,8 @@ const InnovenergyButton = (props: I_InnovenergyButtonProps) => {
       variant="contained"
       type={props.type}
       onClick={props.onClick}
-      sx={{...props.sx, 
+      sx={{...props.sx,
+        textTransform: "none",
         bgcolor: theme.palette.secondary.main,
         ":hover":{
           bgcolor: theme.palette.secondary.dark,
diff --git a/typescript/Frontend/src/components/Layout/InnovenergyTab.tsx b/typescript/Frontend/src/components/Layout/InnovenergyTab.tsx
index 8c7b1cdc4..e752d9b5d 100644
--- a/typescript/Frontend/src/components/Layout/InnovenergyTab.tsx
+++ b/typescript/Frontend/src/components/Layout/InnovenergyTab.tsx
@@ -10,9 +10,9 @@ const InnovenergyTab = (props: any) => {
       {...props}
       disableRipple
       sx={{
+        textTransform: "none",
         ...props.sx,
         bottom: 0,
-        textTransform: "uppercase",
         fontWeight: theme.typography.fontWeightRegular,
         fontSize: theme.typography.pxToRem(14),
         marginRight: theme.spacing(1),
diff --git a/typescript/Frontend/src/components/Layout/LogoutButton.tsx b/typescript/Frontend/src/components/Layout/LogoutButton.tsx
index 8765840ba..2304f1514 100644
--- a/typescript/Frontend/src/components/Layout/LogoutButton.tsx
+++ b/typescript/Frontend/src/components/Layout/LogoutButton.tsx
@@ -19,7 +19,8 @@ const LogoutButton = (props: LogoutButtonProps) => {
           props.removeToken();
         });
       }}
-      sx={{ mx: 1, bgcolor: colors.orangeSelected }}
+      sx={{ mx: 1, bgcolor: colors.orangeSelected, textTransform: "none"}}
+
     >
       <FormattedMessage id="logout" defaultMessage="Logout" />
     </InnovenergyButton>
diff --git a/typescript/Frontend/src/components/Layout/NavigationButtons.tsx b/typescript/Frontend/src/components/Layout/NavigationButtons.tsx
index 7969a7b3d..364409c5e 100644
--- a/typescript/Frontend/src/components/Layout/NavigationButtons.tsx
+++ b/typescript/Frontend/src/components/Layout/NavigationButtons.tsx
@@ -17,6 +17,7 @@ const NavigationButtons = () => {
   return (
     <>
       <InnovenergyTabs
+        sx={{paddingTop:0}}
         id="navigation-buttons-tabs"
         value={routeMatch?.pattern?.path}
       >
diff --git a/typescript/Frontend/src/components/Layout/Search.tsx b/typescript/Frontend/src/components/Layout/Search.tsx
index 4d1947c7e..8b510b540 100644
--- a/typescript/Frontend/src/components/Layout/Search.tsx
+++ b/typescript/Frontend/src/components/Layout/Search.tsx
@@ -75,7 +75,7 @@ const SearchSidebar = (props: SearchSidebarProps) => {
       <SearchInputTextfield
         sx={{    
           ".MuiInputLabel-root" :{
-          color: "black"
+          color: colors.black
         }}}
         id={id}
         variant="filled"
diff --git a/typescript/Frontend/src/components/Users/UserList.tsx b/typescript/Frontend/src/components/Users/UserList.tsx
index f3b8bb3f6..65200f2b8 100644
--- a/typescript/Frontend/src/components/Users/UserList.tsx
+++ b/typescript/Frontend/src/components/Users/UserList.tsx
@@ -62,6 +62,8 @@ const UserList = (props: UserListProps) => {
                 <ListItemButton
                   selected={user.id === Number(routeMatch?.params.id)}
                   sx={{
+                    paddingY: 0.6,
+
                     mr: "1px",
                     borderStyle: "solid",
                     backgroundColor: theme.palette.primary.dark,
diff --git a/typescript/Frontend/src/util/installation.util.tsx b/typescript/Frontend/src/util/installation.util.tsx
index 2689cd749..ba2224634 100644
--- a/typescript/Frontend/src/util/installation.util.tsx
+++ b/typescript/Frontend/src/util/installation.util.tsx
@@ -6,7 +6,6 @@ export const StyledTab = styled((props: any) => (
   <Tab disableRipple {...props} />
 ))(({ theme }) => ({
   bottom: -1,
-  textTransform: "uppercase",
   fontWeight: theme.typography.fontWeightRegular,
   fontSize: theme.typography.pxToRem(14),
   marginRight: theme.spacing(1),
@@ -30,7 +29,6 @@ export const StyledTabBlue = styled((props: any) => (
   <Tab disableRipple {...props} />
 ))(({ theme }) => ({
   bottom: -1,
-  textTransform: "uppercase",
   fontWeight: theme.typography.fontWeightRegular,
   fontSize: theme.typography.pxToRem(14),
   marginRight: theme.spacing(1),
@@ -57,7 +55,6 @@ export const StyledTabBig = styled((props: any) => (
 ))(({ theme }) => ({
   bottom: -2,
 
-  textTransform: "uppercase",
   fontWeight: theme.typography.fontWeightRegular,
   fontSize: theme.typography.pxToRem(14),
   marginRight: theme.spacing(1),
@@ -82,7 +79,6 @@ export const StyledTabWhite = styled((props: any) => (
   <Tab disableRipple {...props} />
 ))(({ theme }) => ({
   bottom: -1,
-  textTransform: "uppercase",
   fontWeight: theme.typography.fontWeightRegular,
   fontSize: theme.typography.pxToRem(14),
   marginRight: theme.spacing(1),