Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
"scripts": {
"dev": "vite",
"build": "vite build",
"lint": "eslint .",
"preview": "vite preview"
"preview": "vite preview",
"lint": "eslint 'src/**/*.js'",
"lint-diff": "eslint $(git diff --name-only --diff-filter=duxb origin/$BASE origin/$HEAD | grep -E '\\.((j|t)sx?)$' | xargs)"

},
"dependencies": {
"@emotion/react": "^11.13.3",
Expand Down
3 changes: 3 additions & 0 deletions src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ function App() {
return (
<ThemeProvider theme={theme}>
<BrowserRouter>
{/*<NavBar />*/}
<div className="main-content">
<Routes>
<Route path="/" element={<MakingGroupPage />} />
<Route path="/makingGroup" element={<MakingGroupPage />} />
Expand All @@ -22,6 +24,7 @@ function App() {
element={<AnotherCheckPointRecordPage />}
/>
</Routes>
</div>
</BrowserRouter>
</ThemeProvider>
);
Expand Down
81 changes: 20 additions & 61 deletions src/index.css
Original file line number Diff line number Diff line change
@@ -1,70 +1,29 @@
:root {
font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
line-height: 1.5;
font-weight: 400;

color-scheme: light dark;
color: rgba(255, 255, 255, 0.87);
background-color: #242424;

font-synthesis: none;
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}

a {
font-weight: 500;
color: #646cff;
text-decoration: inherit;
}
a:hover {
color: #535bf2;
}

body {
margin: 0;
display: flex;
place-items: center;
align-items: center;
justify-content: center;
min-width: 320px;
color: black;
margin: 0;
padding: 0;
min-height: 100vh;
display: flex;
flex-direction: column;
position: relative;
}

h1 {
font-size: 3.2em;
line-height: 1.1;
.navbar {
position: fixed;
top: 0;
left: 0;
right: 0;
z-index: 10;
height: 80px;
}

button {
border-radius: 8px;
border: 1px solid transparent;
padding: 0.6em 1.2em;
font-size: 1em;
font-weight: 500;
font-family: inherit;
background-color: #1a1a1a;
cursor: pointer;
transition: border-color 0.25s;
}
button:hover {
border-color: #646cff;
}
button:focus,
button:focus-visible {
outline: 4px auto -webkit-focus-ring-color;
.main-content {
display: flex;
justify-content: center;
align-items: center;
position: relative;
width: 100%;
height: calc(100vh - 80px);
}

@media (prefers-color-scheme: light) {
:root {
color: #213547;
background-color: #ffffff;
}
a:hover {
color: #747bff;
}
button {
background-color: #f9f9f9;
}
}