Skip to content

Hidra #25

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

Open
wants to merge 9 commits into
base: hidra-parrafo-lista
Choose a base branch
from
Open

Hidra #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1204b7f
modifique el archivo css el titulo primario y secundario
rilmarramos Nov 21, 2019
48d7df7
modifique estilos de .boton .boton-secundario .boton-principal e .input
Ezequiiel98 Nov 21, 2019
c26d746
modifique clases de titulo principal y secundario
MilenaViera Nov 25, 2019
3b50a6c
modifique los espacios y agregue text align en los titulos
MilenaViera Nov 25, 2019
eba200a
Merge pull request #14 from jmtov/hidra-parrafo-lista
Ezequiiel98 Nov 25, 2019
d986a99
resolvi conflictos de merge en css
Ezequiiel98 Nov 25, 2019
f477752
Merge pull request #8 from jmtov/hidra-input-botones
Ezequiiel98 Nov 25, 2019
f0267eb
solucione conflicto
MilenaViera Nov 25, 2019
9ffaaf7
Merge pull request #26 from jmtov/hidra-parrafo-lista
MilenaViera Nov 25, 2019
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 index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ <h2 class="titulo-secundario">¿Te interesa participar?</h2>
<form>
<input class="input" placeholder="Nombre" name="name" />
<input class="input" placeholder="Correo" name="email" />
<button class="boton-principal">Limpiar</button>
<button class="boton-secundario">Participar</button>
<button class="boton boton-principal">Limpiar</button>
<button class="boton boton-secundario">Participar</button>
</form>
</div>
<div class="tarjeta">
Expand All @@ -40,8 +40,8 @@ <h2 class="titulo-secundario">¿Quieres recomendar a alguien?</h2>
<form>
<input class="input" placeholder="Nombre" name="name" />
<input class="input" placeholder="Correo" name="email" />
<button class="boton-principal">Limpiar</button>
<button class="boton-secundario">Invitar</button>
<button class="boton boton-principal">Limpiar</button>
<button class="boton boton-secundario">Invitar</button>
</form>
</div>
</section>
Expand Down
40 changes: 40 additions & 0 deletions styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
.input{
padding: 9px;

}
.boton{
padding: 10px;
width: 100px;
color: #ffffff;
border: none;
cursor: pointer;
font-size: 14px;
}
.boton-principal{
background-color: #e22323 ;
}

.boton-secundario{
background-color: #1565c0;
}

.boton-principal:hover{
background-color: #b41f1f;
}

.boton-secundario:hover{
background-color: #0d3e77;
}
.parrafo{
font-size: 20px;
font-style: italic;
Expand All @@ -15,5 +42,18 @@
font-size: 20px;
font-family: Arial;
width: 80px;
}
.titulo-principal {
background-color: rgb(195, 114, 206);
font-size: 80px;
font-style:oblique;
margin-bottom: 10px;
text-align: center;
}


.titulo-secundario {
background-color: blueviolet;
font-size: 25px;
text-align: center;
}