Skip to content
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

Ajustes de interfaz #172

Merged
merged 1 commit into from
Apr 27, 2024
Merged

Ajustes de interfaz #172

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: 5 additions & 3 deletions webapp/src/components/Home.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

.imagenHome{
padding-top: 10vh;
padding-bottom: 10vh;
padding-bottom: 5vh;
}

.row
Expand Down Expand Up @@ -63,6 +63,8 @@
#param > h2
{
text-align: center;
background-color: #fff;
background-color: #ffffff85;
border-radius: 0.5em;
}
font-weight: 800;
font-size: 1.8rem;
}
2 changes: 1 addition & 1 deletion webapp/src/components/Navbar.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ test('renders navbar', () => {
const linkElement = screen.getByText("Home");
expect(linkElement).toBeInTheDocument();

const linkElement2 = screen.getByText("Login");
const linkElement2 = screen.getByText("Ranking");
expect(linkElement2).toBeInTheDocument();
});
10 changes: 5 additions & 5 deletions webapp/src/components/Parameters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function Parameters(){

return (
<Container className='boxHome' maxWidth="xs" id='param'>
<h2>
<h2 className='titulos-menu-home'>
Parámetros Actuales
</h2>
<ul>
Expand All @@ -44,10 +44,10 @@ function Parameters(){
defaultValue={"9|150"}
value={selectedValue}
onChange={cambioPara}>
<FormControlLabel value="9|120" control={<Radio />} label="Predeterminado" id="predeterminado"/>
<FormControlLabel value="4|60" control={<Radio />} label="Partida Corta" id="corta"/>
<FormControlLabel value="11|150" control={<Radio />} label="Partida Media" id="media"/>
<FormControlLabel value="19|240" control={<Radio />} label="Partida Larga" id="larga"/>
<FormControlLabel value="9|120" control={<Radio sx={{color: 'var(--rosa)','&.Mui-checked': {color: 'var(--rosa)',},}} />} label="Predeterminado" id="predeterminado"/>
<FormControlLabel value="4|60" control={<Radio sx={{color: 'var(--rosa)','&.Mui-checked': {color: 'var(--rosa)',},}}/>} label="Partida Corta" id="corta"/>
<FormControlLabel value="11|150" control={<Radio sx={{color: 'var(--rosa)','&.Mui-checked': {color: 'var(--rosa)',},}}/>} label="Partida Media" id="media"/>
<FormControlLabel value="19|240" control={<Radio sx={{color: 'var(--rosa)','&.Mui-checked': {color: 'var(--rosa)',},}}/>} label="Partida Larga" id="larga"/>
</RadioGroup>
</FormControl>
</Container>
Expand Down
3 changes: 2 additions & 1 deletion webapp/src/components/Ranking.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
display: flex;
flex-direction: column;
align-items: center;
height: 100vh;; /* Ocupar toda la altura de la pantalla */
height: 100vh; /* Ocupar toda la altura de la pantalla */
width: 100%; /* Ocupar toda la anchura de la pantalla */
/*linear-gradient(0deg,#f000,#ee0e5173),linear-gradient(0deg,#f000,#ee0e5173); */
background-image: url('./stats4.jpeg');
}

Expand Down
4 changes: 3 additions & 1 deletion webapp/src/components/gameModes/ModeSelection.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@

.modos-container h2{
text-align: center;
background-color: #fff;
background-color: #ffffff85;
border-radius: 0.5em;
font-weight: 800;
font-size: 1.8rem;
}

.modos-list {
Expand Down
9 changes: 5 additions & 4 deletions webapp/src/components/login/Login.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
margin-top: 7px;
height: 0.5em;
border-radius: 9em;
background: var(--primero);
background: var(--rosa);
align-self: center;
}

Expand All @@ -33,11 +33,11 @@
}

.login-container button {
background-color: var(--primero);
background-color: var(--rosa);
}

.login-container button:hover {
background-color: var(--primero-oscuro);
background-color: var(--rosa-oscuro);
}
body {
height: 10vh;
Expand Down Expand Up @@ -65,7 +65,8 @@
}

.boton-registrar{
color:#1976d2!important;
/*#1976d2*/
color: #1976d2!important;
}

.titulo{
Expand Down
6 changes: 3 additions & 3 deletions webapp/src/components/register/AddUser.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
margin-top: 7px;
height: 0.5em;
border-radius: 9px;
background: var(--primero);
background: var(--rosa);
align-self: center;
}

Expand All @@ -32,11 +32,11 @@
}

.register-container button {
background-color: var(--primero);
background-color: var(--rosa);
}

.register-container button:hover {
background-color: var(--primero);
background-color: var(--rosa-oscuro);
}

body {
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/components/register/AddUser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const AddUser = () => {
};

return (
<Container component="main" maxWidth="xs" className='container'>
<Container component="main" maxWidth="xs" className='container-login'>
<div className="register-container" >
<div className='text'>
<Typography variant="h4">
Expand Down
1 change: 1 addition & 0 deletions webapp/src/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ code {

:root {
--rosa: #EE0E51;
--rosa-oscuro: #b6214d;
--primero: #5680e9;
--primero-oscuro: #3f5daa;
--segundo: #CF79DC;
Expand Down