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

agregando archivos gitignore y package.json #30

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
0971988
subiendo estructura
LeslyN Jan 27, 2018
e6ebab3
Iniciando estructura
LeslyN Jan 27, 2018
3e17285
añadiendo carpeta assets con imágenes
AraceliGS Jan 27, 2018
1dd4dc5
terminando de añadir la estructura bas de la página
AraceliGS Jan 27, 2018
79ad9dd
añadiendo guìa de estilos
AraceliGS Jan 27, 2018
da3a9e1
añadiendo maquetación de cardify
AraceliGS Jan 27, 2018
8efdbbd
corrigiendo identación, creando archivos package.json y gitignore
LeslyN Jan 28, 2018
ac04be4
Merge remote-tracking branch 'upstreamAraceli/master' into avance1
LeslyN Jan 28, 2018
8b21ab0
añadiendo estilos extra a la maquetaciòn y fuente al encabezado
AraceliGS Jan 28, 2018
dc64ddd
subiendo proyecto actualizado
AraceliGS Jan 28, 2018
7ffbdbb
extrayendo cambios
LeslyN Jan 28, 2018
b004436
Merge pull request #4 from AraceliGS/avance1
LeslyN Jan 28, 2018
9a74c17
extrayendo cambios al master
LeslyN Jan 28, 2018
1182977
archivos creados
LeslyN Jan 28, 2018
b0ada01
actualización de README
LeslyN Jan 28, 2018
2e9d6a4
Merge branch 'master' into master
LeslyN Jan 28, 2018
0916d01
primera actualización readme
LeslyN Jan 28, 2018
d3ef26d
corrigiendo estructura
LeslyN Jan 28, 2018
fd60147
corrigiendo estructura
LeslyN Jan 28, 2018
a8157cc
añadiendo avances del plugin cardify
AraceliGS Jan 29, 2018
dba2eb0
añadiendo avances del plugin cardify
LeslyN Jan 29, 2018
8c73fcc
De rama a master
LeslyN Jan 29, 2018
97ea35d
añadiendo avances
AraceliGS Jan 29, 2018
bd7c3e0
Merge branch 'avance1' of https://github.com/AraceliGS/cardify into a…
AraceliGS Jan 29, 2018
d051d7f
optimizando funcionalidad de plugin cardify
AraceliGS Jan 29, 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
Prev Previous commit
Next Next commit
archivos creados
  • Loading branch information
LeslyN committed Jan 28, 2018
commit 1182977b48fd46a1b62bf6fe0c8fc729eb8c9795
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/node_modules
36 changes: 36 additions & 0 deletions css/main.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/* Estilos generales */
* {
box-sizing: border-box;
}

body {
background-color: #faebd7;
}

.container {
margin-top: 5em;
}

/* Estilos a las imágenes */

img.responsive-img, video.responsive-video {
width: 400px;
}

@media (min-width: 993px) {
.container {
width: 80%;
}

img.responsive-img, video.responsive-video {
max-height: 600px;
height: 300px;
width: auto;
}
}

@media only screen and (min-width: 1201px) {
.container {
width: 70%;
}
}
86 changes: 76 additions & 10 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,17 +1,83 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Document</title>
<link rel="stylesheet" href="vendors/materialize/css/materialize.min.css">
<link rel="stylesheet" href="css/main.css">
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Document</title>
<link rel="stylesheet" href="vendors/materialize/css/materialize.min.css">
<link rel="stylesheet" href="css/main.css">
</head>
<body>
<script src="vendors/jquery/jquery-3.2.1.min.js"></script>
<script src="vendors/materialize/js/materialize.min.js"></script>
<script src="src/index.js"></script>
<script src="src/app.js"></script>
<!-- Encabezado -->
<header>
<nav>
<div class="nav-wrapper">
<a href="#" class="brand-logo center">Elizabeth</a>
</div>
</nav>
</header>
<!-- Contenedor de imágenes -->
<section>
<div class="container">
<div class="row">
<div class="col s12 l4">
<figure class="center-align">
<img class="responsive-img image" src="assets/images/image1.jpg" alt="Imagen 1">
</figure>
</div>
<div class="col s12 l4">
<figure class="center-align">
<img class="responsive-img image" src="assets/images/image5.jpg" alt="Imagen 2">
</figure>
</div>
<div class="col s12 l4">
<figure class="center-align">
<img class="responsive-img image" src="assets/images/image14.jpg" alt="Imagen 3">
</figure>
</div>
</div>

<div class="row">
<div class="col s12 l4">
<figure class="center-align">
<img class="responsive-img image" src="assets/images/image4.jpg" alt="Imagen 4">
</figure>
</div>
<div class="col s12 l4">
<figure class="center-align">
<img class="responsive-img image" src="assets/images/image7.jpg" alt="Imagen 5">
</figure>
</div>
<div class="col s12 l4">
<figure class="center-align">
<img class="responsive-img image" src="assets/images/image10.jpg" alt="Imagen 6">
</figure>
</div>
</div>

<div class="row">
<div class="col s12 l4">
<figure class="center-align">
<img class="responsive-img image" src="assets/images/image2.jpg" alt="Imagen 7">
</figure>
</div>
<div class="col s12 l4">
<figure class="center-align">
<img class="responsive-img image" src="assets/images/image3.jpg" alt="Imagen 8">
</figure>
</div>
<div class="col s12 l4">
<figure class="center-align">
<img class="responsive-img image" src="assets/images/image8.jpg" alt="Imagen 9">
</figure>
</div>
</div>
</div>
</section>
<script src="vendors/jquery/jquery-3.2.1.min.js"></script>
<script src="vendors/materialize/js/materialize.min.js"></script>
<script src="src/index.js"></script>
<script src="src/app.js"></script>
</body>
</html>
22 changes: 22 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"name": "cardify",
"version": "1.0.0",
"description": "Reto 2 Cardify",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "git+https://github.com/LeslyN/cardify.git"
},
"keywords": [
"images"
],
"author": "Araceli Gutarra & Lesly Nomberto",
"license": "ISC",
"bugs": {
"url": "https://github.com/LeslyN/cardify/issues"
},
"homepage": "https://github.com/LeslyN/cardify#readme"
}