Skip to content

Commit f91c03a

Browse files
committed
arreglos finales antes de contactos
1 parent ccd733e commit f91c03a

13 files changed

+47
-36
lines changed

contacto.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</button>
2525
<div class="collapse navbar-collapse" id="navbarSupportedContent">
2626
<ul class="navbar-nav m-auto">
27-
<li class="nav-item active">
27+
<li class="nav-item ">
2828
<a class="nav-link" href="./index.html">INICIO<span class="sr-only">(current)</span></a>
2929
</li>
3030
<li class="nav-item">
@@ -36,7 +36,7 @@
3636
<li class="nav-item">
3737
<a class="nav-link" href="./maquinas.html">MAQUINAS</a>
3838
</li>
39-
<li class="nav-item">
39+
<li class="nav-item active">
4040
<a class="nav-link" href="./contacto.html">CONTACTO</a>
4141
</li>
4242
</ul>

css/styles.css

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

img/gerencia.jpg

-217 KB
Loading

img/ingenieria.jpg

-43.8 KB
Loading

img/pieza0.jpg

-18.8 KB
Loading

img/pieza1.jpg

7.32 KB
Loading

img/tecnicos.jpg

-146 KB
Loading

index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ <h2 class="animate__animated animate__bounceIn animate__delay-2s"><span>Mecaniza
5858
</header>
5959
</div>
6060

61-
<footer id="footer">
61+
<footer id="footer" class="footer-in">
6262
<div class="footer-top">
6363
<div class="container">
6464
<div class="row">

maquinas.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
</button>
2424
<div class="collapse navbar-collapse" id="navbarSupportedContent">
2525
<ul class="navbar-nav m-auto">
26-
<li class="nav-item active"><a class="nav-link" href="./index.html">INICIO<span class="sr-only">(current)</span></a></li>
26+
<li class="nav-item "><a class="nav-link" href="./index.html">INICIO<span class="sr-only">(current)</span></a></li>
2727
<li class="nav-item"><a class="nav-link" href="./nosotros.html">NOSOTROS</a></li>
2828
<li class="nav-item"><a class="nav-link" href="./productos.html">PRODUCTOS</a></li>
29-
<li class="nav-item"><a class="nav-link" href="./maquinas.html">MAQUINAS</a></li>
29+
<li class="nav-item active"><a class="nav-link" href="./maquinas.html">MAQUINAS</a></li>
3030
<li class="nav-item"><a class="nav-link" href="./contacto.html">CONTACTO</a></li>
3131
</ul>
3232
<a class="navbar-brand" href="./index.html">Metal Stretch</a>
@@ -153,7 +153,7 @@ <h6 class="text-center">Especificaciones <span>Tecnicas</span></h6>
153153
</div>
154154
</section>
155155
</div>
156-
<div class="contenedor-seccion">
156+
<div class="container">
157157
<div class="subtitulo">
158158
<h2 class="text-h2">Horno de Sinterizado</h2>
159159
</div>

nosotros.html

+7-11
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
</button>
2727
<div class="collapse navbar-collapse" id="navbarSupportedContent">
2828
<ul class="navbar-nav m-auto">
29-
<li class="nav-item active">
29+
<li class="nav-item ">
3030
<a class="nav-link" href="./index.html">INICIO<span class="sr-only">(current)</span></a>
3131
</li>
32-
<li class="nav-item">
32+
<li class="nav-item active">
3333
<a class="nav-link" href="./nosotros.html">NOSOTROS</a>
3434
</li>
3535
<li class="nav-item">
@@ -154,20 +154,16 @@ <h4 class="member__info--format-h4">Ricardo Rodriguez</h4>
154154
<div class="col-12 col-md-6 we-seek">
155155
<h2 class="animate__animated animate__zoomIn animate__delay-1s">¿Qué <em>Buscamos?</em></h2>
156156
</div>
157-
<div class="col-12 col-md-6 we-seek-r">
157+
<div class="col-12 col-md-4 we-seek-r">
158158
<p class="animate__animated animate__headShake animate__delay-1s">Al momento de iniciar una búsqueda laboral, es decir, al conocer a potenciales empleados, tener en claro qué tipo de perfil estamos evaluando es un paso valioso para garantizar mayor éxito en las futuras contrataciones.</p>
159159
</div>
160160
<div class="col-12 col-md-6 we-offer">
161161
<h2 class="animate__animated animate__zoomIn animate__delay-2s">¿Qué te <em>Ofrecemos?</em></h2>
162162
</div>
163-
<div class="col-12 col-md-6 we-offer-r">
164-
<ol class="animate__animated animate__headShake animate__delay-2s">
165-
<li>Flexibilidad Laboral</li>
166-
<li>Dias extras de vacaciones</li>
167-
<li>Exelente Obra Social</li>
168-
<li>Formacion y Desarollo</li>
169-
<li>Y mucho mas...</li>
170-
</ol>
163+
<div class="col-12 col-md-4 we-offer-r">
164+
<div class="animate__animated animate__headShake animate__delay-2s">
165+
<p>Flexibilidad Laboral. Dias extras de vacaciones. Exelente Obra Social. Formacion y Desarollo personal. Y mucho mas...</p>
166+
</div>
171167
</div>
172168
<div class="col-12 col-md-6 send-us">
173169
<h2 class="animate__animated animate__zoomIn animate__delay-3s">Envianos tu <em>CV</em></h2>

productos.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
</button>
2525
<div class="collapse navbar-collapse" id="navbarSupportedContent">
2626
<ul class="navbar-nav m-auto">
27-
<li class="nav-item active">
27+
<li class="nav-item ">
2828
<a class="nav-link" href="./index.html">INICIO<span class="sr-only">(current)</span></a>
2929
</li>
3030
<li class="nav-item">
3131
<a class="nav-link" href="./nosotros.html">NOSOTROS</a>
3232
</li>
33-
<li class="nav-item">
33+
<li class="nav-item active">
3434
<a class="nav-link" href="./productos.html">PRODUCTOS</a>
3535
</li>
3636
<li class="nav-item">

scss/_body.scss

+15-12
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,35 @@
11
.header-main {
22
padding-top: 80px;
33
}
4-
4+
/*------nosotros.html----*/
55
.team {
66
padding-bottom: 60px;
77

88
.member {
99
overflow: hidden;
1010
border-radius: 4px;
1111
background: $white-text;
12-
box-shadow: -3px -3px 5px $transparente;
13-
animation-duration: 1s;
12+
animation-duration: 3s;
1413
animation-name: members;
14+
}
15+
.member:hover{
16+
box-shadow: -3px -3px 5px $transparente;
17+
}
1518

16-
.member:hover {
19+
.member-img:hover, .member:hover{
1720
.social {
1821
opacity: 1;
1922
bottom: 15px;
2023
}
2124
}
2225

2326
.member__info {
24-
padding: 25px 15px;
25-
}
27+
padding: 25px 15px;}
2628

2729
.member-img {
2830
position: relative;
2931
overflow: hidden;
32+
z-index: 1;
3033
}
3134

3235
.member__info--format-h4 {
@@ -68,22 +71,22 @@
6871
border-radius: 4px;
6972
width: 36px;
7073
height: 36px;
71-
background: $yellow-text;
74+
background: $transparente;
7275
display: inline-block;
7376
transition: ease-in-out 0.3s;
7477
color: $white-text;
7578
}
7679

7780
a:hover {
78-
background: rgba(16, 110, 234, 0.5);
81+
background: $secundario;
7982
}
8083

8184
i {
8285
font-size: 24px;
8386
}
8487
}
8588
}
86-
}
89+
8790

8891
@keyframes members {
8992
0% {
@@ -120,8 +123,6 @@
120123
}
121124
}
122125
}
123-
124-
/*------nosotros.html----*/
125126
.container {
126127

127128
.sumate {
@@ -132,13 +133,15 @@
132133
margin: 50px 0 50px 0;
133134
}
134135
.we-seek-r{
136+
font-weight: 700;
135137
margin-top: 30px;
136138
}
137139
.we-offer{
138140
margin: 50px 0 50px 0;
139141
}
140142
.we-offer-r{
141-
margin-top: 30px;
143+
font-weight: 700;
144+
margin-top: 15px;
142145
}
143146
.send-us {
144147
margin: 70px 0 50px;

scss/_footer.scss

+15-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
/*-------------------SASS 2da ENTREGA ----------mixim con parametros-listas-----------------*/
1+
22
@mixin footer-option($fondo, $letras, $estilo) {
33
background-color: $fondo;
44
color: $letras;
55
font-style: $estilo;
66
}
77
#footer {
8-
@include footer-option(rgba(0, 0, 0, .7), #ffffff, bold);
8+
@include footer-option(rgba(0, 0, 0, .9), #ffffff, bold);
99
text-align: center;
1010
a:hover {
1111
color: $secundario;
@@ -48,4 +48,16 @@
4848
.end-footer {
4949
text-align: center;
5050
padding: 15px;
51-
}
51+
}
52+
53+
.footer-in{
54+
position: absolute;
55+
width: 100%;
56+
height: auto;
57+
bottom: 0px;
58+
}
59+
@media (max-height: 830px){
60+
.footer-in{
61+
position: relative;
62+
}
63+
}

0 commit comments

Comments
 (0)