Skip to content

Commit

Permalink
Squashed commit adding pr/75
Browse files Browse the repository at this point in the history
commit f0bacbb
Merge: d26bd3f d198b94
Author: Eric Svebakk <[email protected]>
Date:   Thu Oct 17 15:46:05 2024 +0200

    Merge pull request #75 from Borgarsy/feature-halloween-theme

    Temporary Halloween theme

commit d26bd3f
Merge: 0f096c0 c019c46
Author: Eric Svebakk <[email protected]>
Date:   Thu Oct 10 16:54:40 2024 +0200

    Merge pull request #67 from Sebbben/fixNoResultMembershipSearch

    Fix no result membership search

commit c019c46
Author: Sebbben <[email protected]>
Date:   Sat Oct 5 16:20:01 2024 +0200

    Made tables turn to first page when the table content changes with a search

commit 0f096c0
Merge: a1ce2ec 4dfd6f8
Author: Tepohe <[email protected]>
Date:   Thu Oct 10 14:42:19 2024 +0200

    Merge branch 'main' into development

commit d198b94
Author: Borgar <[email protected]>
Date:   Tue Oct 8 15:01:29 2024 +0200

    adds halloween theme.

commit a1ce2ec
Merge: 4f7d813 f06a472
Author: Tepohe <[email protected]>
Date:   Tue Oct 8 13:53:44 2024 +0200

    Merge branch 'pr/53' into development

commit f06a472
Author: Sebbben <[email protected]>
Date:   Mon Oct 7 16:47:03 2024 +0200

    Fixed wrong path for nav bar home from pointing to /home to pointing to /

commit 0d154f5
Author: Sebbben <[email protected]>
Date:   Thu Sep 26 14:40:51 2024 +0200

    Renamed some directories to take advantage of nexts routing for more usable url paths

Co-Authored-By: Borgarsy <[email protected]>
  • Loading branch information
EricSvebakk and Borgarsy committed Oct 17, 2024
1 parent 420e092 commit 3a2cabc
Show file tree
Hide file tree
Showing 3 changed files with 1,440 additions and 242 deletions.
6 changes: 3 additions & 3 deletions app/components/Login/LoginButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { Person } from "@mui/icons-material";
import { cybTheme } from "../themeCYB";
import { useRouter } from "next/navigation";

import { mdiPenguin } from '@mdi/js';
import { mdiGhost } from '@mdi/js';
import Icon from "@mdi/react";
import Link from "next/link";
// import { useEffect, useState } from "react";
Expand Down Expand Up @@ -76,7 +76,7 @@ export default function LoginButton(props) {
{session.status == "authenticated" ? (
<Icon
alt="Image of user"
path={mdiPenguin}
path={mdiGhost}
color={cybTheme.palette.background.main}
/>
) : (
Expand Down Expand Up @@ -124,7 +124,7 @@ export default function LoginButton(props) {
{session.status == "authenticated" ? (
<Avatar alt="Image of user" sx={{ ...avatarProps }}>
<Icon
path={mdiPenguin}
path={mdiGhost}
color={cybTheme.palette.background.main}
/>
</Avatar>
Expand Down
2 changes: 1 addition & 1 deletion app/components/themeCYB.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export const cybTheme = createTheme({
palette: {
mode: "dark",
primary: {
main: "#d2a30e",
main: "#E66C2C",
},
secondary: {
main: "#ac0bce",
Expand Down
Loading

0 comments on commit 3a2cabc

Please sign in to comment.