Merge pull request #2 from PazAutumn/cardify

obteniendo cambios
PazAutumn · Feb 1, 2018 · 0f1ca8c · 0f1ca8c
2 parents dc1fcb4 + c1a4f65
commit 0f1ca8c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
 language: node_js
-node_js: 
-  - "stable"
-script : 
+node_js:
+  - 'stable'
+script:
diff --git a/index.html b/index.html
@@ -3,16 +3,17 @@
 <head>
   <meta charset="UTF-8">
   <title>Cardify</title>
-  <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
+  <link href="https://fonts.googleapis.com/css?family=Pacifico" rel="stylesheet"> 
 </head>
 <body style="background-color: #704010">
     <div class="cardify" align="center">
-      <h2  style="font-family: Roboto, sans-serif; font-size:40px; color: white">CARDIFY</h2>
+      <h2  style="font-family: Pacifico, cursive; font-size:70px; color: white">Cardify</h2>
       <hr width="90%">
       <img src="https://pbs.twimg.com/media/ClFixn2UoAA85OZ.jpg" style="border:white 1px dotted" alt="Osito"  >
       <img src="https://78.media.tumblr.com/7abd3b7ae58a290dbf509e9c39427f47/tumblr_mjgkiuTCQJ1s7mg7ko5_500.gif" style="border:white 1px dotted" alt="León">
       <img src="http://japonpop.japonshop.com/wp-content/uploads/2014/10/arte-latte-japon-gatos-japonshop03.png" style="border:white 1px dotted" alt="Gato">
     </div>
+    <hr width="90%">
 <script src="lib/main.js"></script>
 </body>
 </html>
diff --git a/lib/cardify.js b/lib/cardify.js
@@ -30,7 +30,7 @@ $(document).ready(function () {
         function estilos() {
             $('figure').css({
                 'position': 'relative',
-                'float': 'left',
+                'display': 'inline-block',
                 'width': '300px',
                 'height': 'auto'
             });

diff --git a/lib/main.js b/lib/main.js
@@ -10395,7 +10395,7 @@ $(document).ready(function() {
         function estilos() {
             $('figure').css({
                 'position': 'relative',
-                'float': 'left',
+                'display': 'inline-block',
                 'width': '300px',
                 'height': 'auto'
             });
@@ -10430,7 +10430,7 @@ $(document).ready(function() {
 
 //testing
 
-const cardifyimg = {};
+let cardifyimg = {};
 cardifyimg.extension = function(img) {
     const imagen = $("img");
     const archivo = $("img").attr('src');