Skip to content

[fix]css #94

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
merged 1 commit into from
May 14, 2025
Merged

[fix]css #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 frontend/src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React from "react";
import { BrowserRouter, Routes, Route } from "react-router-dom";
import Login from "./Login";
import Home from "./pages/admin/Home";
import Home from "./pages/generation/Home";
import Assignment from "./pages/generation/Assignment";
import Deposit from "./pages/generation/Deposit";
import Intro from "./Intro";
import Admin from "./pages/admin/Admin";
import MagageStudent from "./pages/admin/MagageStudent";
import MagageTask from "./pages/admin/MagageTask";
import MagageStudent from "./pages/admin/ManageStudent.jsx";
import ManageTask from "./pages/admin/ManageTask.jsx";
import AttendanceCode from "./pages/admin/AttendanceCode";
import Attendance from "./pages/generation/Attendance";

Expand All @@ -23,7 +23,7 @@ function App() {
<Route path="/deposit" element={<Deposit />} />
<Route path="/admin" element={<Admin />} />
<Route path="/magagestudent" element={<MagageStudent />} />
<Route path="/magagetask" element={<MagageTask />} />
<Route path="/magagetask" element={<ManageTask />} />
<Route path="/attendancecode" element={<AttendanceCode />} />
</Routes>
</BrowserRouter>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/admin/Admin.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useNavigate } from "react-router-dom";
import styles from "../generation/Home.module.css";
import styles from "./Admin.module.css";

const Admin = () => {
const navigate = useNavigate();
Expand Down
50 changes: 50 additions & 0 deletions frontend/src/pages/admin/Admin.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
.home {
height: 100vh;
display: flex;
flex-direction: column;
align-items: center;
justify-content: flex-start;
overflow: hidden;
font-family: "Akira Expanded";
}
.pirocheck {
margin-top: 84px;
font-size: 1.25rem;
margin-bottom: 103px;
}
.home_container {
background-color: var(--background-black);
color: var(--main-green);
font-family: "Cafe24Moyamoya-Regular-v1.0", sans-serif;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
}
.button {
width: 309px;
height: 81px;
border-radius: 8px;
background-color: var(--border-gray);
color: var(--text-white);
font-family: "Akira Expanded";
font-weight: 400;
font-size: 16px;
border: none;
padding: 29px 103px;
font-weight: bold;
margin-bottom: 26px;
z-index: 1;
display: flex;
justify-content: center;
}
.button p {
text-align: start;
}
.button:hover {
background-color: var(--card-toggle-green);
color: var(--text-white);
}
.home img {
position: relative;
opacity: 0.8;
bottom: 11%;
z-index: 0;
}
10 changes: 5 additions & 5 deletions frontend/src/pages/generation/Home.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
align-items: center;
justify-content: flex-start;
overflow: hidden;
font-family: 'Akira Expanded';
font-family: "Akira Expanded";
}
.pirocheck {
margin-top: 43px;
margin-top: 84px;
font-size: 1.25rem;
margin-bottom: 103px;
}
Expand All @@ -24,10 +24,10 @@
border-radius: 8px;
background-color: var(--border-gray);
color: var(--text-white);
font-family: 'Akira Expanded';
font-family: "Akira Expanded";
font-weight: 400;
font-size: 16px;
border: 1px var(--background-black) solid;
border: none;
padding: 15px;
font-weight: bold;
margin-bottom: 26px;
Expand All @@ -43,6 +43,6 @@
.home img {
position: relative;
opacity: 0.8;
top: -92px;
bottom: -2%;
z-index: 0;
}