Skip to content
This repository has been archived by the owner on Jan 24, 2023. It is now read-only.

Primer commit #23

Open
wants to merge 54 commits into
base: master
Choose a base branch
from
Open
Changes from 7 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
12fd023
Primer commit
AriellaRogueN Jan 22, 2018
0085450
agregando eslint-gitignore
AriellaRogueN Jan 22, 2018
0077120
Merge pull request #3 from tcltere/Avances
tcltere Jan 23, 2018
1e3368f
Agregando html-imagenes
AriellaRogueN Jan 24, 2018
ac30d97
segundo commit
tcltere Jan 24, 2018
7cf7cf3
agregando archivo app.js
tcltere Jan 24, 2018
f778e4b
Iniciando configuracion testeo
AriellaRogueN Jan 24, 2018
03588c8
Agregando cambios
AriellaRogueN Jan 24, 2018
3381f84
Merge branch 'Avances' of https://github.com/AriellaRogueN/cardify in…
AriellaRogueN Jan 24, 2018
b83c517
Corrigiendo errore
AriellaRogueN Jan 24, 2018
a126486
probando cambios tere
tcltere Jan 24, 2018
8dfff73
Merge pull request #5 from tcltere/Avances
AriellaRogueN Jan 24, 2018
55f2ed2
subiendo readme
tcltere Jan 24, 2018
17f2457
Instalando dependencias mocha-chai, Añadiendo función
AriellaRogueN Jan 25, 2018
abec72d
Instalando dependecias mocha-chai, Agregando función
AriellaRogueN Jan 25, 2018
f04c010
carpeta de test
tcltere Jan 25, 2018
6df2550
Merge branch 'Avances' into Avances
AriellaRogueN Jan 25, 2018
6fbdc9e
Merge pull request #6 from tcltere/Avances
AriellaRogueN Jan 25, 2018
b058e7b
agregando cambios js
AriellaRogueN Jan 25, 2018
bd095ff
agregando cambios js
AriellaRogueN Jan 25, 2018
447350d
funcion de hover
tcltere Jan 30, 2018
59ca3cb
Merge branch 'Avances' into Avances
AriellaRogueN Jan 30, 2018
b71a90f
Merge pull request #7 from tcltere/Avances
AriellaRogueN Jan 30, 2018
f29e8cc
cambio
tcltere Jan 30, 2018
e6f414c
modificando js
AriellaRogueN Jan 30, 2018
3292633
Modificando JSs
AriellaRogueN Jan 30, 2018
1edf635
Modificando Test/Agregando Libreria
AriellaRogueN Jan 31, 2018
5766e00
function nueva
tcltere Feb 1, 2018
85ef91b
nueva fun
tcltere Feb 1, 2018
762632d
subiendo funcion
tcltere Feb 1, 2018
0887353
Merge branch 'Avances' into Avances
AriellaRogueN Feb 1, 2018
2f40f4d
Agregando tests
AriellaRogueN Feb 1, 2018
1da44f4
Merge branch 'master' of https://github.com/AriellaRogueN/cardify int…
AriellaRogueN Feb 1, 2018
a21f5e8
Merge pull request #10 from tcltere/Avances
AriellaRogueN Feb 1, 2018
cbf5291
agregando cambios Js
AriellaRogueN Feb 1, 2018
746f7b8
Modificando html-js
AriellaRogueN Feb 1, 2018
a3e5933
Anadiendo cambios Js
AriellaRogueN Feb 2, 2018
b8ff43f
Agregando Readme Final
AriellaRogueN Feb 2, 2018
9ae5b8d
Añadiendo Librería-TestDomOk-ArreglandoReadMe
AriellaRogueN Feb 2, 2018
e630938
Arreglando readme
AriellaRogueN Feb 2, 2018
0daa15b
modicicando Json
AriellaRogueN Feb 2, 2018
c3608dc
arreglando Readme
AriellaRogueN Feb 3, 2018
eb5d686
agregando ejemplo readme
AriellaRogueN Feb 3, 2018
8c1a5e2
Update README.md
AriellaRogueN Feb 3, 2018
4c7e323
Update README.md
AriellaRogueN Feb 3, 2018
dcaf736
Update README.md
AriellaRogueN Feb 3, 2018
43e69c0
Update README.md
AriellaRogueN Feb 3, 2018
322a490
Update README.md
AriellaRogueN Feb 3, 2018
c425f70
Update README.md
AriellaRogueN Feb 3, 2018
2eb6b04
Update README.md
AriellaRogueN Feb 4, 2018
1cda71a
Update README.md
AriellaRogueN Feb 4, 2018
a1e4369
CAmbios Readme
AriellaRogueN Feb 4, 2018
b49ea49
Cambios Readme
AriellaRogueN Feb 4, 2018
4326c3a
Arreglo Json
AriellaRogueN Feb 4, 2018
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
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ introducciòn:
DESCRIPCION:

Elegimos el proyecto sugerido por Laboratoria Cardify, mediante el cual se realizara una biblioteca
que le permita al usuario obtener un metodo para que sobre sus imagenes aparezca untexto descriptivo.
que le permita al usuario obtener un metodo para que sobre sus imagenes aparezca un texto descriptivo.

AUTORES: Ariella Rodriguez
Teresita Cañete
@@ -26,5 +26,6 @@ introducciòn:
-Ambiente de trabajo
-Distribucion de tareas
-Issus
-
-Funcion


49 changes: 10 additions & 39 deletions assets/css/main.css
Original file line number Diff line number Diff line change
@@ -1,63 +1,34 @@
body{
margin:0;
}
.content{
width:1000px;
margin-top:50px;
min-height:600px;
background:#fff;
margin:0 auto;
padding:20px;
}

.gepic {
border: 3px solid #eee;
float: left;
height: 240px;
margin: 0 9px 9px 0;
overflow: hidden;
position: relative;
width: 310px;
}
.gepic:hover {

/*.imagenes:hover {
border: 3px solid #81d7;
}
.gepic a {
display: block;
position: relative;
}
.gepic a img {
height: 280px;

.imagenes a img {

left: -20px;
position: relative;
top: -20px;
width: 350px;
}

.gepic .negro {
.imagenes {
display: none;
font-size: 2.3em;
font-weight: bold;
height: 100%;
padding-top: 100px;
position: absolute;

text-align: center;
text-decoration: none;
width: 100%;
z-index: 100;
background-color: rgba(15, 15, 15, 0.6);
color: #fff;
text-shadow: #000 0px 0px 20px;
transition:0.2s;

}
.gepic .negro em {
.imagenes{
display: block;
font-size: 1em;
font-weight: bold;
}

#caption{
display: block;
position: absolute;
top:0;
}
<
49 changes: 49 additions & 0 deletions assets/js/index.js
Original file line number Diff line number Diff line change
@@ -1 +1,50 @@

const $ = require('jquery');

$(document).ready(function()
$(".content img").mouseover(function(){

let imagenFifure = $(this).attr("alt");
$(this).each(function(){
$(this).wrap('<figure></figure>')
$('figure').css({
'display': 'inline-block',
'border': '3px solid #eee',
'width': '250px',
'margin':'30px',

})


$('figure').append('<figcaption>' + imagenFifure + '</figcaption>')
$('figcaption').css({'display':'block',
'width':'90%',






});

});

})
$(".content img").mouseout(function(){
$('img').unwrap();
$('figcaption').empty();
});
});













21 changes: 10 additions & 11 deletions index.html
Original file line number Diff line number Diff line change
@@ -12,27 +12,26 @@
<body>
<div class="content">

<div class="gepic">

<div class="imagenes">
<a href="#" title="">
<div class="negro"><span id="texto"><em></em></span></div>
<img class="img-item" src="assets/images/Labrador.jpeg" alt="Labrador"/>
<img class="img-item" src="assets/images/Labrador.jpeg" alt ="labrador"/>
</a>
</div>

<div class="gepic">
<div class="imagenes">
<a href="#" title="">
<div class="negro"><span id="texto"><em>pastor aleman</em></span></div>
<img class="img-item" src="assets/images/pastorA.jpeg" alt="Pastor Alemán"/>
<div class="negro"><span id="texto"><em></em></span></div>
<img class="img-item" src="assets/images/pastorA.jpeg" alt="pastor aleman"/>
</a>
</div>

<div class="gepic">
<div class="imagenes">
<a href="#" title="">
<div class="negro"><span id="texto"><em>corgi</em></span></div>
<img class="img-item" src="assets/images/corgi.jpg" alt="Corgi"/>
</a>
</div>
</div>
<div class="negro"><span id="texto"><em></em></span></div>
<img class="img-item" src="assets/images/corgi.jpg" width="200px" alt="corgi"/>