Skip to content

Commit

Permalink
Merge branch 'webapp_interface' of https://github.com/Arquisoft/wiq_es6c
Browse files Browse the repository at this point in the history
 into webapp_interface
  • Loading branch information
alegarman2002 committed Apr 3, 2024
2 parents 611fb43 + d3a45c5 commit fc86f3b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion webapp/src/components/footer/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { AppBar, Toolbar, Typography } from '@mui/material';

export const Footer = () => {
return (
<AppBar component="footer" position="static" sx={{ backgroundColor: "primary", color: "white", bottom: 0, left: 0, width: '100%', zIndex: 1000 }}>
<AppBar component="footer" position="static" sx={{ backgroundColor: "secondary", color: "white", position: 'fixed', bottom: 0, left: 0, width: '100%', zIndex: 1000 }}>
<Toolbar>
<Typography sx={{ margin: 'auto' }}>
© WIQ ES06C
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/components/nav/Nav.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const Nav = () => {
*/

return (
<AppBar position="static">
<AppBar position="static" sx={{ backgroundColor: "secondary", color: "white"}}>
<Toolbar>
<Link to='/home' >
<IconButton size="large" color="inherit" >
Expand Down

0 comments on commit fc86f3b

Please sign in to comment.