generated from acm-ucr/acm-ucr-website
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
background lanterns 404 #70
Merged
Merged
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
a52b269
background lanterns 404
exitcy ebd9d12
fixed positioning
exitcy 1aa1e82
Merge branch 'dev' of https://github.com/acm-ucr/csa-website into exi…
exitcy cea36db
pull from dv
exitcy c12c8c8
Merge branch 'dev' of https://github.com/acm-ucr/csa-website into exi…
exitcy 53ae200
fixed not-found.tsx
exitcy b19a334
fixed comments
exitcy cc2b377
merged code
exitcy d3ebee6
fixed
exitcy 57fc44c
fixed
exitcy cd0f4f3
Merge branch 'dev' of https://github.com/acm-ucr/csa-website into exi…
exitcy 96cacd5
used tailwind z index and cropped image
exitcy f7f7847
Merge branch 'dev' of https://github.com/acm-ucr/csa-website into exi…
exitcy 6423bf5
tailwind + h-screen
exitcy 596323d
clean up repo
stanleylew5 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,12 @@ | ||
import Lantern from "@/components/404Lanterns"; | ||
|
||
const NotFound = () => { | ||
return <div>404 Page Not Found</div>; | ||
return ( | ||
<div> | ||
404 Page Not Found | ||
<Lantern /> | ||
</div> | ||
); | ||
}; | ||
|
||
export default NotFound; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
import React from "react"; | ||
import Image from "next/image"; | ||
import Lantern from "@/public/notfound/lantern404.webp"; | ||
|
||
const LanternBackground = () => { | ||
return ( | ||
<div> | ||
<Image | ||
src={Lantern} | ||
alt="Lantern background" | ||
className="w-70 absolute right-20 top-28" | ||
/> | ||
</div> | ||
); | ||
}; | ||
|
||
export default LanternBackground; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
use vw/vh units instead of 20, 28, 70 for width and right/top values. I'll have you merge this code into brenda's once I merge her pr in