Skip to content

Commit

Permalink
Add holiday decorations
Browse files Browse the repository at this point in the history
  • Loading branch information
eltoder committed Dec 6, 2024
1 parent b6540f0 commit 1a36f65
Show file tree
Hide file tree
Showing 6 changed files with 1,612 additions and 1,569 deletions.
Binary file added src/assets/hat.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/snow-dark.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/snow.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions src/components/Navbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import UserColorDialog from "./UserColorDialog";
import ColorChoiceDialog from "./ColorChoiceDialog";
import KeyboardLayoutDialog from "./KeyboardLayoutDialog";
import AccountOptionsDialog from "./AccountOptionsDialog";
import hatImage from "../assets/hat.png";

function Navbar({
themeType,
Expand Down Expand Up @@ -73,9 +74,29 @@ function Navbar({
<AppBar position="relative" color="transparent" elevation={0}>
<Toolbar variant="dense">
<Typography variant="h6" style={{ flexGrow: 1, whiteSpace: "nowrap" }}>
<img
style={{
height: "0.5em",
verticalAlign: "text-top",
marginRight: "-0.5em",
position: "relative",
zIndex: 1,
}}
alt="Santa Hat"
src={hatImage}
/>
<InternalLink underline="none" color="inherit" to="/">
Set with Friends
</InternalLink>
<span
style={{
verticalAlign: "text-bottom",
fontSize: "smaller",
marginLeft: "-0.2em",
}}
>
🎄
</span>
</Typography>
<Typography
variant="subtitle1"
Expand Down
22 changes: 22 additions & 0 deletions src/themes.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { createTheme } from "@material-ui/core/styles";
import { red } from "@material-ui/core/colors";
import snowLightImage from "./assets/snow.jpg";
import snowDarkImage from "./assets/snow-dark.jpg";

export const darkTheme = createTheme({
palette: {
Expand Down Expand Up @@ -51,6 +53,16 @@ export const darkTheme = createTheme({
row: "#282828",
},
setFoundEntry: "rgba(130, 170, 100, 0.15)",
overrides: {
MuiCssBaseline: {
"@global": {
body: {
backgroundImage: `url("${snowDarkImage}")`,
backgroundSize: "25%",
},
},
},
},
});

export const lightTheme = createTheme({
Expand Down Expand Up @@ -90,4 +102,14 @@ export const lightTheme = createTheme({
row: "#fff",
},
setFoundEntry: "rgba(130, 170, 100, 0.15)",
overrides: {
MuiCssBaseline: {
"@global": {
body: {
backgroundImage: `url("${snowLightImage}")`,
backgroundSize: "25%",
},
},
},
},
});
Loading

0 comments on commit 1a36f65

Please sign in to comment.