Skip to content

Commit 576e946

Browse files
committed
πŸ¦”πŸ¦™ ↝ [SGV2-141 GP-16]: Some more merge fixes
2 parents f252145 + 2c0fdec commit 576e946

File tree

5 files changed

+46
-1
lines changed

5 files changed

+46
-1
lines changed

β€Ž.DS_Store

18 KB
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import React from "react";
2+
3+
export default function AlchemyUI() {
4+
return (
5+
<div className="container mx-auto flex flex-col items-center">
6+
<div className="mb-8 mt-4">
7+
<canvas id="game-canvas" className="border border-gray-400" style={{ width: '80vw', height: '80vh' }}></canvas>
8+
</div>
9+
<div className="flex flex-row space-x-4">
10+
<div className="bg-blue-500 w-12 h-12 rounded-full"></div>
11+
<div className="bg-green-500 w-12 h-12 rounded-full"></div>
12+
<div className="bg-red-500 w-12 h-12 rounded-full"></div>
13+
<div className="bg-yellow-500 w-12 h-12 rounded-full"></div>
14+
</div>
15+
</div>
16+
);
17+
};

β€Žcomponents/Modals/rover-interface.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -769,4 +769,4 @@ function ZoomOutIcon(props) {
769769
<line x1="8" x2="14" y1="11" y2="11" />
770770
</svg>
771771
)
772-
}
772+
};

β€Žpages/explore/play.tsx

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import React from "react";
2+
import AlchemyUI from "../../components/Gameplay/Sandbox/AlchemyUI";
3+
import Navigation from "../../components/_Core/Section/Navbar";
4+
5+
export default function AlchemyPage() {
6+
return (
7+
<>
8+
<style jsx global>
9+
{`
10+
body {
11+
background: url('garden.png') center/cover;
12+
}
13+
14+
@media only screen and (max-width: 767px) {
15+
.planet-heading {
16+
color: white;
17+
font-size: 24px;
18+
text-align: center;
19+
margin-bottom: 10px;
20+
}
21+
}
22+
`}
23+
</style>
24+
<Navigation />
25+
<AlchemyUI />
26+
</>
27+
);
28+
};
Loading

0 commit comments

Comments
Β (0)