Skip to content

Commit 2cfbd44

Browse files
taljacob2taljacob2
committed
Reorder Layout CSS And Index CSS
Signed-off-by: Tal Jacob <taljacob2@gmail.com>
1 parent 957d22a commit 2cfbd44

6 files changed

Lines changed: 78 additions & 89 deletions

File tree

‎nextstep-frontend/src/components/Layout.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.layout-container {
2+
margin-top: 10vh;
3+
overflow-y: auto;
4+
}

‎nextstep-frontend/src/components/Layout.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import { Container } from '@mui/material';
22
import React from 'react';
3+
import './Layout.css';
34

45

56
const Layout: React.FC<{ children: React.ReactNode }> = (props: any) => {
67
return (
7-
<Container component="main" sx={{ marginTop: '10vh' }}>
8+
<Container className="layout-container" component="main">
89
{ props.children }
910
</Container>
1011
);

‎nextstep-frontend/src/index.css‎

Lines changed: 72 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,3 @@
1-
:root {
2-
font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
3-
line-height: 1.5;
4-
font-weight: 400;
5-
6-
color-scheme: light dark;
7-
color: rgba(255, 255, 255, 0.87);
8-
background-color: #242424;
9-
10-
font-synthesis: none;
11-
text-rendering: optimizeLegibility;
12-
-webkit-font-smoothing: antialiased;
13-
-moz-osx-font-smoothing: grayscale;
14-
}
15-
16-
a {
17-
font-weight: 500;
18-
color: #646cff;
19-
text-decoration: inherit;
20-
}
21-
a:hover {
22-
color: #535bf2;
23-
}
24-
25-
body {
26-
margin: 0;
27-
display: flex;
28-
place-items: center;
29-
min-width: 320px;
30-
min-height: 100vh;
31-
}
32-
33-
h1 {
34-
font-size: 3.2em;
35-
line-height: 1.1;
36-
}
37-
38-
button {
39-
border-radius: 8px;
40-
border: 1px solid transparent;
41-
padding: 0.6em 1.2em;
42-
font-size: 1em;
43-
font-weight: 500;
44-
font-family: inherit;
45-
background-color: #1a1a1a;
46-
cursor: pointer;
47-
transition: border-color 0.25s;
48-
}
49-
button:hover {
50-
border-color: #646cff;
51-
}
52-
button:focus,
53-
button:focus-visible {
54-
outline: 4px auto -webkit-focus-ring-color;
55-
}
56-
57-
@media (prefers-color-scheme: light) {
58-
:root {
59-
color: #213547;
60-
background-color: #ffffff;
61-
}
62-
a:hover {
63-
color: #747bff;
64-
}
65-
button {
66-
background-color: #f9f9f9;
67-
}
68-
}
69-
701
/* ------------------------------------ Normalize.css --------------------------------- */
712

723
/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
@@ -417,4 +348,75 @@ template {
417348

418349
[hidden] {
419350
display: none;
420-
}
351+
}
352+
353+
/* ------------------------------------ Normalize.css End --------------------------------- */
354+
355+
:root {
356+
font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
357+
line-height: 1.5;
358+
font-weight: 400;
359+
360+
color-scheme: light dark;
361+
color: rgba(255, 255, 255, 0.87);
362+
background-color: #242424;
363+
364+
font-synthesis: none;
365+
text-rendering: optimizeLegibility;
366+
-webkit-font-smoothing: antialiased;
367+
-moz-osx-font-smoothing: grayscale;
368+
}
369+
370+
a {
371+
font-weight: 500;
372+
color: #646cff;
373+
text-decoration: inherit;
374+
}
375+
a:hover {
376+
color: #535bf2;
377+
}
378+
379+
body {
380+
margin: 0;
381+
display: flex;
382+
place-items: center;
383+
min-width: 320px;
384+
min-height: 100vh;
385+
}
386+
387+
h1 {
388+
font-size: 3.2em;
389+
line-height: 1.1;
390+
}
391+
392+
button {
393+
border-radius: 8px;
394+
border: 1px solid transparent;
395+
padding: 0.6em 1.2em;
396+
font-size: 1em;
397+
font-weight: 500;
398+
font-family: inherit;
399+
background-color: #1a1a1a;
400+
cursor: pointer;
401+
transition: border-color 0.25s;
402+
}
403+
button:hover {
404+
border-color: #646cff;
405+
}
406+
button:focus,
407+
button:focus-visible {
408+
outline: 4px auto -webkit-focus-ring-color;
409+
}
410+
411+
@media (prefers-color-scheme: light) {
412+
:root {
413+
color: #213547;
414+
background-color: #ffffff;
415+
}
416+
a:hover {
417+
color: #747bff;
418+
}
419+
button {
420+
background-color: #f9f9f9;
421+
}
422+
}

‎nextstep-frontend/src/pages/Login.css‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
body {
2-
margin: 0;
3-
font-family: Arial, sans-serif;
4-
background-color: var(--color-2);
5-
display: flex;
6-
}
7-
81
.login-container {
92
display: flex;
103
justify-content: center;

‎nextstep-frontend/src/pages/Register.css‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎nextstep-frontend/src/pages/Register.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import React, { useState } from 'react';
22
import axios from 'axios';
33
import { Container, TextField, Button, Typography, Box, Paper, Link, Alert } from '@mui/material';
44
import { Link as RouterLink, useNavigate } from 'react-router-dom';
5-
import './Register.css';
65
import { config } from '../config';
76

87
const Register: React.FC = () => {

0 commit comments

Comments
 (0)