Skip to content

Commit

Permalink
se subieron las iamgenes al fondo de los divs en el index
Browse files Browse the repository at this point in the history
  • Loading branch information
emanuelsandries committed Jul 7, 2021
1 parent 3e07dbb commit 6b2be18
Show file tree
Hide file tree
Showing 9 changed files with 77 additions and 28 deletions.
22 changes: 20 additions & 2 deletions css/master.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion css/master.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added images/index-taller.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/index-taller1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/index-taller3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 30 additions & 20 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,30 +25,40 @@
</svg>
</a>
<a href="">
<img src="./images/platzi-logo.jpeg" alt="">
<img src="./images/platzi-logo.jpeg" alt="" />
</a>
</header>
<main >
<h2 class="indextitle">En este sitio web podras probar todos los talleres del curso practico de javascritp de platzi</h2>
<main>
<h2 class="indextitle">
En este sitio web podras probar todos los talleres del curso practico de
javascritp de platzi
</h2>
<div class="indexgrid">
<div class="taller taller1"><a href="./taller1.html">
<h2">Taller 1</h2>
<p>Calculadora de areas y perimetros</p>
</a>
</div>
<div class="taller taller2"><a href="./taller2.html"><h2>Taller 2</h2><p>Calculadora de descuentos</p></a>

</div>
<div class="taller taller3">
<a href="./taller2.html"><h2>Taller 3</h2><p>Calculadora de descuentos</p></a>

</div>
<div class="taller taller4">
<a href="./taller2.html"><h2>Taller 4</h2><p>Calculadora de descuentos</p></a>

</div>
<div class="taller taller1">
<a href="./taller1.html">
<h2>Taller 1</h2>
<p>Calculadora de areas y perimetros</p>
</a>
</div>
<div class="taller taller2">
<a href="./taller2.html"
><h2>Taller 2</h2>
<p>Calculadora de descuentos</p></a
>
</div>
<div class="taller taller3">
<a href="./taller2.html"
><h2>Taller 3</h2>
<p>Calculadora de descuentos</p></a
>
</div>
<div class="taller taller4">
<a href="./taller2.html"
><h2>Taller 4</h2>
<p>Calculadora de descuentos</p></a
>
</div>
</div>

</main>
This website is bouilding
<footer class="footer index">
Expand Down
9 changes: 7 additions & 2 deletions javascript/taller3/estadistica.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,14 @@ function formulaMediaAritmetica(lista){
}

function calcularMediaAritmetica(){
let resultSelect = document.getElementById("resultEstadistica");

let inputSelect = document.getElementById("datos");
let value = inputSelect.value;
const promedio = formulaMediaAritmetica([value]);
console.log(value)
let valueArray = Array.from(value.split(','),Number)
console.log(valueArray)
let promedio = formulaMediaAritmetica(valueArray);

console.log(promedio);
resultSelect.innerText = "El promedio de los datos ingresados es: " + promedio;
}
20 changes: 18 additions & 2 deletions src/layout/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,35 @@
align-items: center;
height: 100%;
min-height: 150px;
background-size: cover;
background-repeat: no-repeat;
a {
text-decoration: none;
color: white;
text-align: center;
h2 {
font: $headline5;
font: $headline4;
}
p {
font: $body2;
font: $body1;
}
}
}

.taller1 {
background-image: url("../../images/index-taller1.png");
}
.taller2 {
background-image: url("../../images/index-taller.png");
}

.taller3 {
background-image: url("../../images/index-taller3.png");
}
.taller4 {
background-image: url("../../images/thumbnail-talle1.png");
}

@include for-phone-only {
.indexgrid {
height: 60%;
Expand Down
2 changes: 1 addition & 1 deletion taller3.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ <h2>Calcula el promedio, media y moda con un click</h2>
</div>
<p class="card--form__subtitle">Resultado:</p>
<div class="card--form__result">
<p class="text-result" id="resultDescuento"></p>
<p class="text-result" id="resultEstadistica"></p>
</div>
</form>
</div>
Expand Down

0 comments on commit 6b2be18

Please sign in to comment.