Skip to content

Commit cc9ec05

Browse files
Superbro525AltSuperbro525Alt
authored
Merge pull request #1 from CurtinFRC/layout
Make main pit display
2 parents b65883a + 38dbb8b commit cc9ec05

File tree

6 files changed

+393
-6
lines changed

6 files changed

+393
-6
lines changed

‎package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"@radix-ui/react-dialog": "^1.0.5",
2121
"@radix-ui/react-dropdown-menu": "^2.0.6",
2222
"@radix-ui/react-hover-card": "^1.0.7",
23+
"@radix-ui/react-icons": "^1.3.0",
2324
"@radix-ui/react-label": "^2.0.2",
2425
"@radix-ui/react-menubar": "^1.0.4",
2526
"@radix-ui/react-navigation-menu": "^1.1.4",
@@ -49,6 +50,7 @@
4950
"react-day-picker": "^8.10.0",
5051
"react-dom": "^18",
5152
"react-hook-form": "^7.50.0",
53+
"react-icons": "^5.0.1",
5254
"react-resizable-panels": "^2.0.3",
5355
"sonner": "^1.4.0",
5456
"tailwind-merge": "^2.2.1",

‎pnpm-lock.yaml

Lines changed: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/app/globals.css

Lines changed: 69 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,79 @@
6565
--ring: 212.7 26.8% 83.9%;
6666
}
6767
}
68-
68+
69+
@layer base {
70+
html {
71+
overflow-y: hidden;
72+
overflow-x: hidden;
73+
}
74+
75+
.cardGrid {
76+
display: grid;
77+
grid-template-columns: repeat(2, 1fr);
78+
gap: 16px; /* Adjust as needed */
79+
}
80+
81+
.mainGrid {
82+
display: grid;
83+
grid-template-columns: repeat(2, 1fr);
84+
gap: 16px;
85+
}
86+
87+
.overallGrid {
88+
display: flex;
89+
flex-direction: column;
90+
91+
overflow-y: hidden;
92+
}
93+
94+
.nav {
95+
overflow-y: hidden;
96+
min-width: 100%;
97+
}
98+
99+
.nav-spacing {
100+
/* make gap relative to screen size so that the items slowly come together as the screen gets smaller */
101+
gap: 10%;
102+
}
103+
104+
.match {
105+
display: grid;
106+
grid-template-columns: repeat(2, 1fr);
107+
gap: 10px;
108+
}
109+
110+
.match-info {
111+
padding: 6px;
112+
}
113+
114+
.red {
115+
background-color: #ff0000; /* Red color */
116+
color: #ffffff; /* White text */
117+
box-shadow: 0 0 10px rgba(0, 0, 0, 0.5); /* Optional box shadow */
118+
}
119+
120+
.blue {
121+
background-color: #0000ff; /* Blue color */
122+
color: #ffffff; /* White text */
123+
box-shadow: 0 0 10px rgba(0, 0, 0, 0.5); /* Optional box shadow */
124+
}
125+
126+
.rankingsGrid {
127+
display: grid;
128+
grid-template-columns: repeat(1, 1fr);
129+
gap: 10px;
130+
131+
overflow-y: hidden;
132+
}
133+
}
134+
69135
@layer base {
70136
* {
71137
@apply border-border;
72138
}
73139
body {
74140
@apply bg-background text-foreground;
75141
}
76-
}
142+
}
143+

‎src/app/layout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export default function RootLayout({
1717
children: React.ReactNode
1818
}) {
1919
return (
20-
<html lang="en" className='dark'>
20+
<html lang="en" className='dark min-h-[100vh]'>
2121
<body className={inter.className}>
2222
{children}
2323
<Toaster/>

0 commit comments

Comments
 (0)