new modification
This commit is contained in:
parent
ce5ef9b77c
commit
1ef35479a7
|
@ -50,10 +50,10 @@ const App = () => {
|
||||||
<img
|
<img
|
||||||
src={innovenergyLogo}
|
src={innovenergyLogo}
|
||||||
alt="innovenergy logo"
|
alt="innovenergy logo"
|
||||||
height="75"
|
height="100"
|
||||||
/>
|
/>
|
||||||
</Grid>
|
</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} />
|
<LanguageSelect language={language} setLanguage={setLanguage} />
|
||||||
<LogoutButton removeToken={removeToken} />
|
<LogoutButton removeToken={removeToken} />
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
|
@ -54,7 +54,7 @@ const GroupTree = () => {
|
||||||
label={element.name}
|
label={element.name}
|
||||||
onClick={() => setCurrentType(element.type)}
|
onClick={() => setCurrentType(element.type)}
|
||||||
sx={{
|
sx={{
|
||||||
".MuiTreeItem-content": { paddingY: "12px" },
|
".MuiTreeItem-content": { paddingY: "5px" },
|
||||||
bgcolor: colors.greyDark,
|
bgcolor: colors.greyDark,
|
||||||
borderRadius: 2,
|
borderRadius: 2,
|
||||||
}}
|
}}
|
||||||
|
|
|
@ -17,7 +17,6 @@ const Installation = (props: I_InstallationProps) => {
|
||||||
const [error, setError] = useState<AxiosError>();
|
const [error, setError] = useState<AxiosError>();
|
||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
axiosConfig
|
axiosConfig
|
||||||
|
|
|
@ -95,6 +95,7 @@ const InstallationList = (props: InstallationListProps) => {
|
||||||
selected={installation.id === Number(routeMatch?.params.id)}
|
selected={installation.id === Number(routeMatch?.params.id)}
|
||||||
disableRipple
|
disableRipple
|
||||||
sx={{
|
sx={{
|
||||||
|
paddingY: 0.6,
|
||||||
mr: "1px",
|
mr: "1px",
|
||||||
borderStyle: "solid",
|
borderStyle: "solid",
|
||||||
backgroundColor: theme.palette.primary.dark,
|
backgroundColor: theme.palette.primary.dark,
|
||||||
|
|
|
@ -75,13 +75,6 @@ const InstallationTabs = () => {
|
||||||
component={Link}
|
component={Link}
|
||||||
to={routes.liveView + id}
|
to={routes.liveView + id}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<InnovenergyTab
|
<InnovenergyTab
|
||||||
sx={{
|
sx={{
|
||||||
"&.Mui-selected": {
|
"&.Mui-selected": {
|
||||||
|
@ -100,12 +93,6 @@ const InstallationTabs = () => {
|
||||||
component={Link}
|
component={Link}
|
||||||
to={routes.log + id}
|
to={routes.log + id}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</InnovenergyTabs>
|
</InnovenergyTabs>
|
||||||
</Box>
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
|
|
|
@ -69,6 +69,9 @@ const CheckboxTree = () => {
|
||||||
style ={{
|
style ={{
|
||||||
color: theme.palette.text.primary ,
|
color: theme.palette.text.primary ,
|
||||||
}}
|
}}
|
||||||
|
sx={{
|
||||||
|
paddingY:0,
|
||||||
|
}}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
|
@ -20,6 +20,7 @@ const InnovenergyButton = (props: I_InnovenergyButtonProps) => {
|
||||||
type={props.type}
|
type={props.type}
|
||||||
onClick={props.onClick}
|
onClick={props.onClick}
|
||||||
sx={{...props.sx,
|
sx={{...props.sx,
|
||||||
|
textTransform: "none",
|
||||||
bgcolor: theme.palette.secondary.main,
|
bgcolor: theme.palette.secondary.main,
|
||||||
":hover":{
|
":hover":{
|
||||||
bgcolor: theme.palette.secondary.dark,
|
bgcolor: theme.palette.secondary.dark,
|
||||||
|
|
|
@ -10,9 +10,9 @@ const InnovenergyTab = (props: any) => {
|
||||||
{...props}
|
{...props}
|
||||||
disableRipple
|
disableRipple
|
||||||
sx={{
|
sx={{
|
||||||
|
textTransform: "none",
|
||||||
...props.sx,
|
...props.sx,
|
||||||
bottom: 0,
|
bottom: 0,
|
||||||
textTransform: "uppercase",
|
|
||||||
fontWeight: theme.typography.fontWeightRegular,
|
fontWeight: theme.typography.fontWeightRegular,
|
||||||
fontSize: theme.typography.pxToRem(14),
|
fontSize: theme.typography.pxToRem(14),
|
||||||
marginRight: theme.spacing(1),
|
marginRight: theme.spacing(1),
|
||||||
|
|
|
@ -19,7 +19,8 @@ const LogoutButton = (props: LogoutButtonProps) => {
|
||||||
props.removeToken();
|
props.removeToken();
|
||||||
});
|
});
|
||||||
}}
|
}}
|
||||||
sx={{ mx: 1, bgcolor: colors.orangeSelected }}
|
sx={{ mx: 1, bgcolor: colors.orangeSelected, textTransform: "none"}}
|
||||||
|
|
||||||
>
|
>
|
||||||
<FormattedMessage id="logout" defaultMessage="Logout" />
|
<FormattedMessage id="logout" defaultMessage="Logout" />
|
||||||
</InnovenergyButton>
|
</InnovenergyButton>
|
||||||
|
|
|
@ -17,6 +17,7 @@ const NavigationButtons = () => {
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<InnovenergyTabs
|
<InnovenergyTabs
|
||||||
|
sx={{paddingTop:0}}
|
||||||
id="navigation-buttons-tabs"
|
id="navigation-buttons-tabs"
|
||||||
value={routeMatch?.pattern?.path}
|
value={routeMatch?.pattern?.path}
|
||||||
>
|
>
|
||||||
|
|
|
@ -75,7 +75,7 @@ const SearchSidebar = (props: SearchSidebarProps) => {
|
||||||
<SearchInputTextfield
|
<SearchInputTextfield
|
||||||
sx={{
|
sx={{
|
||||||
".MuiInputLabel-root" :{
|
".MuiInputLabel-root" :{
|
||||||
color: "black"
|
color: colors.black
|
||||||
}}}
|
}}}
|
||||||
id={id}
|
id={id}
|
||||||
variant="filled"
|
variant="filled"
|
||||||
|
|
|
@ -62,6 +62,8 @@ const UserList = (props: UserListProps) => {
|
||||||
<ListItemButton
|
<ListItemButton
|
||||||
selected={user.id === Number(routeMatch?.params.id)}
|
selected={user.id === Number(routeMatch?.params.id)}
|
||||||
sx={{
|
sx={{
|
||||||
|
paddingY: 0.6,
|
||||||
|
|
||||||
mr: "1px",
|
mr: "1px",
|
||||||
borderStyle: "solid",
|
borderStyle: "solid",
|
||||||
backgroundColor: theme.palette.primary.dark,
|
backgroundColor: theme.palette.primary.dark,
|
||||||
|
|
|
@ -6,7 +6,6 @@ export const StyledTab = styled((props: any) => (
|
||||||
<Tab disableRipple {...props} />
|
<Tab disableRipple {...props} />
|
||||||
))(({ theme }) => ({
|
))(({ theme }) => ({
|
||||||
bottom: -1,
|
bottom: -1,
|
||||||
textTransform: "uppercase",
|
|
||||||
fontWeight: theme.typography.fontWeightRegular,
|
fontWeight: theme.typography.fontWeightRegular,
|
||||||
fontSize: theme.typography.pxToRem(14),
|
fontSize: theme.typography.pxToRem(14),
|
||||||
marginRight: theme.spacing(1),
|
marginRight: theme.spacing(1),
|
||||||
|
@ -30,7 +29,6 @@ export const StyledTabBlue = styled((props: any) => (
|
||||||
<Tab disableRipple {...props} />
|
<Tab disableRipple {...props} />
|
||||||
))(({ theme }) => ({
|
))(({ theme }) => ({
|
||||||
bottom: -1,
|
bottom: -1,
|
||||||
textTransform: "uppercase",
|
|
||||||
fontWeight: theme.typography.fontWeightRegular,
|
fontWeight: theme.typography.fontWeightRegular,
|
||||||
fontSize: theme.typography.pxToRem(14),
|
fontSize: theme.typography.pxToRem(14),
|
||||||
marginRight: theme.spacing(1),
|
marginRight: theme.spacing(1),
|
||||||
|
@ -57,7 +55,6 @@ export const StyledTabBig = styled((props: any) => (
|
||||||
))(({ theme }) => ({
|
))(({ theme }) => ({
|
||||||
bottom: -2,
|
bottom: -2,
|
||||||
|
|
||||||
textTransform: "uppercase",
|
|
||||||
fontWeight: theme.typography.fontWeightRegular,
|
fontWeight: theme.typography.fontWeightRegular,
|
||||||
fontSize: theme.typography.pxToRem(14),
|
fontSize: theme.typography.pxToRem(14),
|
||||||
marginRight: theme.spacing(1),
|
marginRight: theme.spacing(1),
|
||||||
|
@ -82,7 +79,6 @@ export const StyledTabWhite = styled((props: any) => (
|
||||||
<Tab disableRipple {...props} />
|
<Tab disableRipple {...props} />
|
||||||
))(({ theme }) => ({
|
))(({ theme }) => ({
|
||||||
bottom: -1,
|
bottom: -1,
|
||||||
textTransform: "uppercase",
|
|
||||||
fontWeight: theme.typography.fontWeightRegular,
|
fontWeight: theme.typography.fontWeightRegular,
|
||||||
fontSize: theme.typography.pxToRem(14),
|
fontSize: theme.typography.pxToRem(14),
|
||||||
marginRight: theme.spacing(1),
|
marginRight: theme.spacing(1),
|
||||||
|
|
Loading…
Reference in New Issue