Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Se elimina contenido duplicado, se agrega loader y boton de subir al inicio #114

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Se elimina contenido duplicado, se agrega loader y boton de subir al inicio #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file added images/loader.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
79 changes: 21 additions & 58 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">

<!-- jQuery -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
<script src="js/parallax.js"></script>
</head>

<body>
<!--loader-->
<div class="facilito-loader"></div>

<!-- Portada -->
<div class="cover">
<div class="content">
Expand Down Expand Up @@ -95,6 +95,8 @@ <h3><a href="#" target="_blank">Pinterest</a></h3>
</article>
</div>
</section>

<!--Fili Santillán Tutor-->
<section class="info-2">
<div class="cajas">
<div class="imagen">
Expand All @@ -110,68 +112,17 @@ <h2>Fili Santillán - Tutor</h2>
<li>Blogger</li>
<li>Platzi Student Ambassador</li>
</ul>
<p>Redes: </p>
<p>Contáctame a través de mis redes: </p>
<a href="https://github.com/FiliMX"><i class="fa fa-github fa-2x"></i></a>
<a href="https://twitter.com/filimx"><i class="fa fa-twitter-square fa-2x"></i></a>
<a href="https://www.facebook.com/FiliSantillanMX"><i class="fa fa-facebook-square fa-2x"></i></a>
<a href="http://filisantillan.com/"><i class="fa fa-plus-circle fa-2x"></i></a>
<a href="mailto:fili06604@gmail.com"><i class="fa fa-envelope fa-2x"></i></a>
<a href="http://filisantillan.com/"><i class="fa fa-plus-circle fa-2x"></i></a>
</div>
<div class="relleno"></div>
</section>
<section class="info">
<h2>Todas las clases</h2>
<p class="hola">
Disfruta de todas las clases desde nuestra plataforma, en la que encontraras miles de alumnos y compañeros. Resolveremos tus dudas atravez del foro y mucho mas. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Molestiae velit animi eum repellat placeat odio deleniti quod voluptates unde, ducimus error nemo neque sapiente a aut ad dolor totam iusto!
</p>
<div class="lista">
<ul>
<li><a href="https://codigofacilito.com/videos/curso_git_introduccion_a_git"><i class="fa fa-play-circle-o"></i> Introduccion a Git</a></li>
<li><a href="https://codigofacilito.com/videos/curso_git_primeros_pasos"><i class="fa fa-play-circle-o"></i> Primeros pasos</a></li>
<li><a href="https://codigofacilito.com/videos/curso_git_nuestro_primer_proyecto"><i class="fa fa-play-circle-o"></i> Nuestro primer proyecto</a></li>
<li><a href="https://codigofacilito.com/videos/curso_git_ramas_y_fusiones"><i class="fa fa-play-circle-o"></i> Ramas y Fusiones</a></li>
<li><a href="https://codigofacilito.com/videos/curso_git_empezando_con_github"><i class="fa fa-play-circle-o"></i> Empezando con GitHub</a></li>
<li><a href="https://codigofacilito.com/videos/curso_git_git_tags"><i class="fa fa-play-circle-o"></i> Git Tags</a></li>
<li><a href="https://codigofacilito.com/videos/curso_git_workflows"><i class="fa fa-play-circle-o"></i> WorkFlows</a></li>
<li><a href="https://codigofacilito.com/videos/curso_git_github_pages"><i class="fa fa-play-circle-o"></i> GitHub Pages</a></li>
<li><a href="https://codigofacilito.com/videos/curso_git_deployment_con_git"><i class="fa fa-play-circle-o"></i> Deployment con Git</a></li>
<li><a href="https://codigofacilito.com/videos/curso_git_git_hooks_final"><i class="fa fa-play-circle-o"></i> Git Hooks (FINAL)</a></li>
</ul>
</div>
</section>

<!-- <article class="block">
<i class="icon-social fa fa-pinterest"></i>
<h3><a href="#">Pinterest</a></h3>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ipsam dolorem rerum nostrum, facilis, harum ad tenetur atque similique ex adipisci. Expedita cumque natus id, vel quod similique sunt, perferendis at!</p>
<a href="#" , class="btn btn-pint">Ver</a>
</article> -->
</div>
</section>
<section class="info-2">
<div class="cajas">
<div class="imagen">
<img src="https://avatars3.githubusercontent.com/u/5623751?v=3&s=460" alt="">
</div>
</div>
<div class="cajas margin-left">
<h2>Fili Santillán - Tutor</h2>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iste ullam praesentium modi dolorum, maxime in magnam delectus error corporis dolore fugiat quam.</p>
<ul>
<li>Co-founder at @SetihTeam</li>
<li>Front-end Developer</li>
<li>Blogger</li>
<li>Platzi Student Ambassador</li>
</ul>
<p>Contacto: </p>
<a href="https://github.com/FiliMX"><i class="fa fa-github fa-2x"></i></a>
<a href="https://twitter.com/filimx"><i class="fa fa-twitter-square fa-2x"></i></a>
<a href="https://www.facebook.com/FiliSantillanMX"><i class="fa fa-facebook-square fa-2x"></i></a>
<a href="mailto:fili06604@gmail.com"><i class="fa fa-envelope fa-2x"></i></a>
<a href="http://filisantillan.com/"><i class="fa fa-plus-circle fa-2x"></i></a>

</div>
<div class="relleno"></div>
</section>
<!--Lista de todas las clases-->
<section class="info">
<h2>Todas las clases</h2>
<p class="hola">
Expand Down Expand Up @@ -207,6 +158,18 @@ <h2>Todas las clases</h2>
</ul>
</div>
</footer>

<div class="gototop js-top">
<a href="#" class="js-gotop"><i class="icon fa fa-arrow-up"></i></a>
</div>

<!-- jQuery -->
<script src="js/jquery.min.js"></script>
<!-- jQuery Easing -->
<script src="js/jquery.easing.1.3.js"></script>
<script src="js/parallax.js"></script>
<!-- Main -->
<script src="js/main.js"></script>
</body>

</html>
205 changes: 205 additions & 0 deletions js/jquery.easing.1.3.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
/*
* jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/
*
* Uses the built in easing capabilities added In jQuery 1.1
* to offer multiple easing options
*
* TERMS OF USE - jQuery Easing
*
* Open source under the BSD License.
*
* Copyright © 2008 George McGinley Smith
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* Neither the name of the author nor the names of contributors may be used to endorse
* or promote products derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/

// t: current time, b: begInnIng value, c: change In value, d: duration
jQuery.easing['jswing'] = jQuery.easing['swing'];

jQuery.extend( jQuery.easing,
{
def: 'easeOutQuad',
swing: function (x, t, b, c, d) {
//alert(jQuery.easing.default);
return jQuery.easing[jQuery.easing.def](x, t, b, c, d);
},
easeInQuad: function (x, t, b, c, d) {
return c*(t/=d)*t + b;
},
easeOutQuad: function (x, t, b, c, d) {
return -c *(t/=d)*(t-2) + b;
},
easeInOutQuad: function (x, t, b, c, d) {
if ((t/=d/2) < 1) return c/2*t*t + b;
return -c/2 * ((--t)*(t-2) - 1) + b;
},
easeInCubic: function (x, t, b, c, d) {
return c*(t/=d)*t*t + b;
},
easeOutCubic: function (x, t, b, c, d) {
return c*((t=t/d-1)*t*t + 1) + b;
},
easeInOutCubic: function (x, t, b, c, d) {
if ((t/=d/2) < 1) return c/2*t*t*t + b;
return c/2*((t-=2)*t*t + 2) + b;
},
easeInQuart: function (x, t, b, c, d) {
return c*(t/=d)*t*t*t + b;
},
easeOutQuart: function (x, t, b, c, d) {
return -c * ((t=t/d-1)*t*t*t - 1) + b;
},
easeInOutQuart: function (x, t, b, c, d) {
if ((t/=d/2) < 1) return c/2*t*t*t*t + b;
return -c/2 * ((t-=2)*t*t*t - 2) + b;
},
easeInQuint: function (x, t, b, c, d) {
return c*(t/=d)*t*t*t*t + b;
},
easeOutQuint: function (x, t, b, c, d) {
return c*((t=t/d-1)*t*t*t*t + 1) + b;
},
easeInOutQuint: function (x, t, b, c, d) {
if ((t/=d/2) < 1) return c/2*t*t*t*t*t + b;
return c/2*((t-=2)*t*t*t*t + 2) + b;
},
easeInSine: function (x, t, b, c, d) {
return -c * Math.cos(t/d * (Math.PI/2)) + c + b;
},
easeOutSine: function (x, t, b, c, d) {
return c * Math.sin(t/d * (Math.PI/2)) + b;
},
easeInOutSine: function (x, t, b, c, d) {
return -c/2 * (Math.cos(Math.PI*t/d) - 1) + b;
},
easeInExpo: function (x, t, b, c, d) {
return (t==0) ? b : c * Math.pow(2, 10 * (t/d - 1)) + b;
},
easeOutExpo: function (x, t, b, c, d) {
return (t==d) ? b+c : c * (-Math.pow(2, -10 * t/d) + 1) + b;
},
easeInOutExpo: function (x, t, b, c, d) {
if (t==0) return b;
if (t==d) return b+c;
if ((t/=d/2) < 1) return c/2 * Math.pow(2, 10 * (t - 1)) + b;
return c/2 * (-Math.pow(2, -10 * --t) + 2) + b;
},
easeInCirc: function (x, t, b, c, d) {
return -c * (Math.sqrt(1 - (t/=d)*t) - 1) + b;
},
easeOutCirc: function (x, t, b, c, d) {
return c * Math.sqrt(1 - (t=t/d-1)*t) + b;
},
easeInOutCirc: function (x, t, b, c, d) {
if ((t/=d/2) < 1) return -c/2 * (Math.sqrt(1 - t*t) - 1) + b;
return c/2 * (Math.sqrt(1 - (t-=2)*t) + 1) + b;
},
easeInElastic: function (x, t, b, c, d) {
var s=1.70158;var p=0;var a=c;
if (t==0) return b; if ((t/=d)==1) return b+c; if (!p) p=d*.3;
if (a < Math.abs(c)) { a=c; var s=p/4; }
else var s = p/(2*Math.PI) * Math.asin (c/a);
return -(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
},
easeOutElastic: function (x, t, b, c, d) {
var s=1.70158;var p=0;var a=c;
if (t==0) return b; if ((t/=d)==1) return b+c; if (!p) p=d*.3;
if (a < Math.abs(c)) { a=c; var s=p/4; }
else var s = p/(2*Math.PI) * Math.asin (c/a);
return a*Math.pow(2,-10*t) * Math.sin( (t*d-s)*(2*Math.PI)/p ) + c + b;
},
easeInOutElastic: function (x, t, b, c, d) {
var s=1.70158;var p=0;var a=c;
if (t==0) return b; if ((t/=d/2)==2) return b+c; if (!p) p=d*(.3*1.5);
if (a < Math.abs(c)) { a=c; var s=p/4; }
else var s = p/(2*Math.PI) * Math.asin (c/a);
if (t < 1) return -.5*(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
return a*Math.pow(2,-10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )*.5 + c + b;
},
easeInBack: function (x, t, b, c, d, s) {
if (s == undefined) s = 1.70158;
return c*(t/=d)*t*((s+1)*t - s) + b;
},
easeOutBack: function (x, t, b, c, d, s) {
if (s == undefined) s = 1.70158;
return c*((t=t/d-1)*t*((s+1)*t + s) + 1) + b;
},
easeInOutBack: function (x, t, b, c, d, s) {
if (s == undefined) s = 1.70158;
if ((t/=d/2) < 1) return c/2*(t*t*(((s*=(1.525))+1)*t - s)) + b;
return c/2*((t-=2)*t*(((s*=(1.525))+1)*t + s) + 2) + b;
},
easeInBounce: function (x, t, b, c, d) {
return c - jQuery.easing.easeOutBounce (x, d-t, 0, c, d) + b;
},
easeOutBounce: function (x, t, b, c, d) {
if ((t/=d) < (1/2.75)) {
return c*(7.5625*t*t) + b;
} else if (t < (2/2.75)) {
return c*(7.5625*(t-=(1.5/2.75))*t + .75) + b;
} else if (t < (2.5/2.75)) {
return c*(7.5625*(t-=(2.25/2.75))*t + .9375) + b;
} else {
return c*(7.5625*(t-=(2.625/2.75))*t + .984375) + b;
}
},
easeInOutBounce: function (x, t, b, c, d) {
if (t < d/2) return jQuery.easing.easeInBounce (x, t*2, 0, c, d) * .5 + b;
return jQuery.easing.easeOutBounce (x, t*2-d, 0, c, d) * .5 + c*.5 + b;
}
});

/*
*
* TERMS OF USE - EASING EQUATIONS
*
* Open source under the BSD License.
*
* Copyright © 2001 Robert Penner
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* Neither the name of the author nor the names of contributors may be used to endorse
* or promote products derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
5 changes: 5 additions & 0 deletions js/jquery.min.js
View file
Open in desktop

Large diffs are not rendered by default.

41 changes: 41 additions & 0 deletions js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
(function () {

//Ir arriba
var goToTop = function() {
console.log("en funcion gototop");
$('.js-gotop').on('click', function(event){

event.preventDefault();

$('html, body').animate({
scrollTop: $('html').offset().top
}, 500, 'easeInOutExpo');

return false;
});

$(window).scroll(function(){

var $win = $(window);
if ($win.scrollTop() > 200) {
$('.js-top').addClass('active');
} else {
$('.js-top').removeClass('active');
}

});

};

// Cargando página
var loaderPage = function() {
$(".facilito-loader").fadeOut("slow");
};

$(function(){
console.log("en funcion principal");
goToTop();
loaderPage();
});

}());
Loading