From 69605abffa0f1d6b9cba7b7fce6fd237082f895b Mon Sep 17 00:00:00 2001
From: Dm1tr1y147 <39243579+Dm1tr1y147@users.noreply.github.com>
Date: Sat, 22 Jun 2019 22:35:51 +0500
Subject: [PATCH] Remove strange captions
---
main.js | 85 ++++++++++++++++++++++++++++-----------------------------
1 file changed, 41 insertions(+), 44 deletions(-)
diff --git a/main.js b/main.js
index 6ea78c9..d07ebd9 100755
--- a/main.js
+++ b/main.js
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
$(function() {
var title = document.title;
$(window).scroll(function() {
@@ -37,46 +36,44 @@ $("main img").click(function () {
});
});
});
-=======
-var mywindow = $(window);
-var mypos = mywindow.scrollTop();
-var up = false;
-var newscroll;
-mywindow.scroll(function () {
- newscroll = mywindow.scrollTop();
- if (newscroll > mypos && !up) {
- $('nav').stop().slideToggle();
- $('#galactikka').stop().slideToggle();
- up = !up;
- } else if(newscroll < mypos && up) {
- $('nav').stop().slideToggle();
- $('#galactikka').stop().slideToggle();
- up = !up;
- }
- mypos = newscroll;
-});
-
-$(".nav-toggle").click(function() {
- $(this).toggleClass("opened");
- $("nav ul").toggleClass("showen");
- $("body").toggleClass("overflowhidden");
-});
-
-$('#totop').click(function(){
- $("html,body").animate({
- scrollTop: 0
- }, 2000);
-});
-
-$("main img").click(function () {
- var src = $(this).attr('src');
- $("body").append("<div id='popup'>"+"<div id='popupBg'></div>"+"<img src='"+src+"' id='popupImg' />"+"</div>");
- $("#popup").css("display", "flex").hide().fadeIn(800);
- $("#popup").click(function(){
- $("#popup").fadeOut(800);
- setTimeout(function() {
- $("#popup").remove();
- }, 800);
- });
-});
->>>>>>> c27a4029688d84a604259109737c953b92088855
+var mywindow = $(window);
+var mypos = mywindow.scrollTop();
+var up = false;
+var newscroll;
+mywindow.scroll(function () {
+ newscroll = mywindow.scrollTop();
+ if (newscroll > mypos && !up) {
+ $('nav').stop().slideToggle();
+ $('#galactikka').stop().slideToggle();
+ up = !up;
+ } else if(newscroll < mypos && up) {
+ $('nav').stop().slideToggle();
+ $('#galactikka').stop().slideToggle();
+ up = !up;
+ }
+ mypos = newscroll;
+});
+
+$(".nav-toggle").click(function() {
+ $(this).toggleClass("opened");
+ $("nav ul").toggleClass("showen");
+ $("body").toggleClass("overflowhidden");
+});
+
+$('#totop').click(function(){
+ $("html,body").animate({
+ scrollTop: 0
+ }, 2000);
+});
+
+$("main img").click(function () {
+ var src = $(this).attr('src');
+ $("body").append("<div id='popup'>"+"<div id='popupBg'></div>"+"<img src='"+src+"' id='popupImg' />"+"</div>");
+ $("#popup").css("display", "flex").hide().fadeIn(800);
+ $("#popup").click(function(){
+ $("#popup").fadeOut(800);
+ setTimeout(function() {
+ $("#popup").remove();
+ }, 800);
+ });
+});