dm1sh/dmitriy.icu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove strange captions

Browse Source
This commit is contained in:
Dm1tr1y147 2019-06-22 22:35:51 +05:00 committed by GitHub
parent b0884348b7
commit 69605abffa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
main.js
View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
$(function() { $(function() {
var title = document.title; var title = document.title;
$(window).scroll(function() { $(window).scroll(function() {
@ -37,46 +36,44 @@ $("main img").click(function () {
}); });
}); });
}); });
======= var mywindow = $(window);
var mywindow = $(window); var mypos = mywindow.scrollTop();
var mypos = mywindow.scrollTop(); var up = false;
var up = false; var newscroll;
var newscroll; mywindow.scroll(function () {
mywindow.scroll(function () { newscroll = mywindow.scrollTop();
newscroll = mywindow.scrollTop(); if (newscroll > mypos && !up) {
if (newscroll > mypos && !up) { $('nav').stop().slideToggle();
$('nav').stop().slideToggle(); $('#galactikka').stop().slideToggle();
$('#galactikka').stop().slideToggle(); up = !up;
up = !up; } else if(newscroll < mypos && up) {
} else if(newscroll < mypos && up) { $('nav').stop().slideToggle();
$('nav').stop().slideToggle(); $('#galactikka').stop().slideToggle();
$('#galactikka').stop().slideToggle(); up = !up;
up = !up; }
} mypos = newscroll;
mypos = newscroll; });
});
$(".nav-toggle").click(function() {
$(".nav-toggle").click(function() { $(this).toggleClass("opened");
$(this).toggleClass("opened"); $("nav ul").toggleClass("showen");
$("nav ul").toggleClass("showen"); $("body").toggleClass("overflowhidden");
$("body").toggleClass("overflowhidden"); });
});
$('#totop').click(function(){
$('#totop').click(function(){ $("html,body").animate({
$("html,body").animate({ scrollTop: 0
scrollTop: 0 }, 2000);
}, 2000); });
});
$("main img").click(function () {
$("main img").click(function () { var src = $(this).attr('src');
var src = $(this).attr('src'); $("body").append("<div id='popup'>"+"<div id='popupBg'></div>"+"<img src='"+src+"' id='popupImg' />"+"</div>");
$("body").append("<div id='popup'>"+"<div id='popupBg'></div>"+"<img src='"+src+"' id='popupImg' />"+"</div>"); $("#popup").css("display", "flex").hide().fadeIn(800);
$("#popup").css("display", "flex").hide().fadeIn(800); $("#popup").click(function(){
$("#popup").click(function(){ $("#popup").fadeOut(800);
$("#popup").fadeOut(800); setTimeout(function() {
setTimeout(function() { $("#popup").remove();
$("#popup").remove(); }, 800);
}, 800); });
}); });
});
>>>>>>> c27a4029688d84a604259109737c953b92088855