Skip to content
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.

Sign up for GitHub

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

Merge Staging #51

Merged
merged 14 commits into from
Jul 24, 2024
Merged

Merge Staging #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
73cda93
Merge from main (#31)
Avelous Mar 2, 2024
83e4e42
Merge pull request #32 from BuidlGuidl/main
Avelous Mar 2, 2024
9d9883a
Fixed sweeping gas handling following EIP-4844 upgrades on optimism (…
Avelous Mar 14, 2024
57bc943
Pk dice updates (#36)
Avelous Mar 19, 2024
eec2a7b
Added admin feature to increase and decrease hidden characters (#38)
Avelous Apr 18, 2024
7855389
Merge branch 'main' into staging
Avelous Apr 18, 2024
61b7c76
set server to live (#40)
Avelous Apr 18, 2024
80311fd
Changed backend to heroku's deployment (#42)
Avelous Jun 3, 2024
57e01ce
backend deployed to fly.io (#44)
Avelous Jun 9, 2024
fd40de5
Merge branch 'main' into staging
Avelous Jun 9, 2024
4551ff9
removed welcome roll condition (#46)
Avelous Jul 24, 2024
7dfbe25
Welcome roll new Ui background (#48)
Avelous Jul 24, 2024
445f071
Merge branch 'main' into staging
Avelous Jul 24, 2024
c64acce
ui updates (#50)
Avelous Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/nextjs/components/dicedemo/WelcomeRoll.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ const WelcomeRoll = () => {
}, [rolledResult]);

return (
<div className="flex justify-center flex-col gap-2">
<div className="flex justify-center flex-col gap-2 bg-white">
<button
className="btn btn-sm btn-primary mx-auto "
onClick={rollTheDice}
Expand Down Expand Up @@ -105,7 +105,7 @@ const WelcomeRoll = () => {
className="w-[95%] h-[95%] overflow-hidden rounded-lg mx-auto flex justify-center items-center"
>
<div className="scale-125">
<Image className="scale-150" src="/rolls-gif/Spin.gif" alt="spinning" width={400} height={400} />
<Image className="scale-150" src="/rolls-gif/Spin.gif" alt="spinning" width={350} height={350} />
</div>
</div>
) : (
Expand All @@ -118,8 +118,8 @@ const WelcomeRoll = () => {
className="scale-150"
src={`/rolls-jpg/${rolls[index]}.jpg`}
alt="rolled"
width={400}
height={400}
width={350}
height={350}
/>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/pages/_app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const ScaffoldEthApp = ({ Component, pageProps }: AppProps) => {
>
<div className="flex flex-col min-h-screen">
<Header />
<main className="relative flex flex-col flex-1 overflow-hidden">
<main>
<Component {...pageProps} />
</main>
<Footer />
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/pages/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const Home: NextPage = () => {
</div> */}

<div>
<div className="mx-auto mt-5 border p-6 rounded-md bg-base-100 shadow-2xl">
<div className="mx-auto mt-5 border p-6 rounded-md bg-base-100 shadow-2xl flex flex-col">
<WelcomeRoll />
<div className="flex justify-center mt-10">
<ul className="menu menu-horizontal justify-center p-2 bg-base-300 rounded-full mb-8 w-fit mx-auto">
Expand Down
Loading