Skip to content

Merge pull request #1504 #1505

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

Merged
Holybasil merged 2 commits into from
Apr 9, 2025
Merged

Merge pull request #1504 #1505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1126d57
fix: use svh
Holybasil Apr 9, 2025
cc41385
Merge pull request #1504 from scroll-tech/layout-unit
Holybasil Apr 9, 2025
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
13 changes: 6 additions & 7 deletions src/app/SCR-sSCR/Header/GetSCRDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ const GetSCRDialog = props => {
"& .MuiDialog-paper": {
width: "54.4rem",
maxWidth: "100%",
padding: "4rem 3.2rem",
borderRadius: "2rem",
},
},
Expand All @@ -33,11 +32,10 @@ const GetSCRDialog = props => {
"& .MuiDialog-paper": {
margin: 0,
borderRadius: 0,
height: "calc(var(--vh, 1vh) * 100)",
height: "100dvh",
maxHeight: "unset",
minWidth: "unset",
width: "100%",
padding: "1.6rem 2rem 2rem",
},
},
}),
Expand All @@ -48,18 +46,18 @@ const GetSCRDialog = props => {
<DialogTitle
sx={{
position: "relative",
height: ["3.2rem", "3.6rem"],
height: ["4.8rem", "7.6rem"],
fontSize: ["2rem", "2.4rem"],
lineHeight: "3.6rem",
fontWeight: 600,
p: 0,
p: ["1.6rem 2rem 0", "4rem 3.2rem 0"],
mb: ["0.8rem", "2.4rem"],
textAlign: "center",
}}
>
<span>Get SCR</span>
<IconButton
sx={{ position: "absolute", right: "-0.8rem", top: ["-0.1rem", "-1.6rem"], "&:hover": { backgroundColor: "unset" } }}
sx={{ position: "absolute", right: ["0.8rem", "1.6rem"], top: ["0.8rem", "1.6rem"], "&:hover": { backgroundColor: "unset" } }}
onClick={onClose}
>
<SvgIcon sx={{ fontSize: "1.8rem" }} component={CloseSvg} inheritViewBox></SvgIcon>
Expand All @@ -68,8 +66,9 @@ const GetSCRDialog = props => {

<DialogContent
sx={{
p: 0,
minHeight: "50rem",
p: ["0 2rem 2rem", "0 3.2rem 3.2rem"],

"&::-webkit-scrollbar-thumb": {
backgroundColor: "rgba(209, 205, 204, 0.6)",
borderRadius: "8px",
Expand Down
1 change: 0 additions & 1 deletion src/app/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ object {
}

:root {
--vh: 100vh;
--theme-bg: #fff8f3;
}

Expand Down
13 changes: 0 additions & 13 deletions src/app/template.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { Box } from "@mui/material"

import Footer from "@/components/Footer"
import Header from "@/components/Header"
import useCheckTheme from "@/components/Header/useCheckTheme"
import useHideFooter from "@/hooks/useHideFooter"
import { isSepolia } from "@/utils"

Expand All @@ -15,18 +14,6 @@ import "./global"
export default function RootTemplate({ children }: { children: ReactNode }) {
const hideFooter = useHideFooter()

// useEffect(() => {
// function setVh() {
// const vh = window.innerHeight * 0.01
// document.documentElement.style.setProperty("--vh", `${vh}px`)
// }
// setVh()
// window.addEventListener("resize", setVh)
// return () => {
// window.removeEventListener("resize", setVh)
// }
// }, [])

return (
<Box sx={{ minHeight: "100vh" }}>
<Header></Header>
Expand Down