From 3d76c73afe09d0831193f843b9c8405a12f214d0 Mon Sep 17 00:00:00 2001 From: dan63047 Date: Tue, 21 Sep 2021 19:25:31 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A2=D0=B0=D0=B9=D0=BC=D0=B5=D1=80=20=D0=BF?= =?UTF-8?q?=D0=BE=20=D1=86=D0=B5=D0=BD=D1=82=D1=80=D1=83=20=D0=9B=D0=B8?= =?UTF-8?q?=D1=88=D0=BD=D0=B8=D0=B5=20=D1=8D=D0=BB=D0=B5=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D1=82=D1=8B=20=D1=83=D0=B1=D1=80=D0=B0=D0=BD=D1=8B=20=D0=9D?= =?UTF-8?q?=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B5=D0=BD=20=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BE=D0=B3=D0=BE=D0=B4=D0=BD=D0=B8=D0=B9=20=D0=BF=D1=80=D0=B8?= =?UTF-8?q?=D0=BA=D0=BE=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 0 index.html | 27 ++++----------------------- jquery.fireworks.js | 6 +++--- main.css | 8 ++++++-- script.js | 34 ++-------------------------------- 5 files changed, 15 insertions(+), 60 deletions(-) mode change 100644 => 100755 README.md mode change 100644 => 100755 index.html mode change 100644 => 100755 jquery.fireworks.js mode change 100644 => 100755 main.css mode change 100644 => 100755 script.js diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/index.html b/index.html old mode 100644 new mode 100755 index cd2e4b1..28d8778 --- a/index.html +++ b/index.html @@ -13,26 +13,8 @@ +

До нового года осталось:

- -

До нового года осталось:

+
+
@@ -92,10 +75,8 @@
-
- -
+ О странице diff --git a/jquery.fireworks.js b/jquery.fireworks.js old mode 100644 new mode 100755 index 13152da..b256600 --- a/jquery.fireworks.js +++ b/jquery.fireworks.js @@ -257,14 +257,14 @@ TODO: var angle = Math.random() * Math.PI * 2; // emulate 3D effect by using cosine and put more particles in the middle - var speed = Math.cos(Math.random() * Math.PI / 2) * 15; + var speed = Math.cos(Math.random() * Math.PI / 2) * 20; particle.vel.x = Math.cos(angle) * speed; particle.vel.y = Math.sin(angle) * speed; - particle.size = 10; + particle.size = 20; - particle.gravity = 0.2; + particle.gravity = 0.1; particle.resistance = 0.92; particle.shrink = Math.random() * 0.05 + 0.93; diff --git a/main.css b/main.css old mode 100644 new mode 100755 index f807b42..e79d939 --- a/main.css +++ b/main.css @@ -2,13 +2,18 @@ body { text-align: center; font-family: "Open Sans"; font-weight: 100; + display: grid; + height: 100vh; + align-content: center; } .countdown-title { color: #fff; font-weight: 100; font-size: 40px; - margin: 0; + position: absolute; + width: 100%; + margin: 3vh 0 0 0; } .countdown { @@ -18,7 +23,6 @@ body { font-weight: 400; text-align: center; font-size: 30px; - height: 60vh; width: max-content; margin: auto; } diff --git a/script.js b/script.js old mode 100644 new mode 100755 index 38417f5..b09d0d5 --- a/script.js +++ b/script.js @@ -1,30 +1,3 @@ -function DateTime() { - var dateNow = new Date(), - year = dateNow.getFullYear(), - jsmonth = dateNow.getMonth(), - month = [], - day = dateNow.getDate(), - hour = dateNow.getHours(), - minutes = dateNow.getMinutes(), - second = dateNow.getSeconds(), - d = document.getElementById('clocks'); - - month[0] = "января"; - month[1] = "февраля"; - month[2] = "марта"; - month[3] = "апреля"; - month[4] = "мая"; - month[5] = "июня"; - month[6] = "июля"; - month[7] = "августа"; - month[8] = "сентября"; - month[9] = "октября"; - month[10] = "ноября"; - month[11] = "декабря"; - - d.innerHTML = "Сейчас " + day + " " + month[jsmonth] + " " + year + " года, " + hour + ":" + ('0' + minutes).slice(-2) + ":" + ('0' + second).slice(-2); -} - function getTimeRemaining(endtime) { var t = Date.parse(endtime) - Date.now(); var mseconds = t % 1000; @@ -112,8 +85,7 @@ function initializeClock(endtime) { num3.innerHTML = "00"; clearInterval(timeinterval); document.title = "С новым годом!"; - var congrats = document.getElementById("congrats"); - congrats.innerHTML = "C новым годом!!!\nСчасливого " + future_year + " года!"; + document.getElementsByClassName("countdown-title")[0].innerHTML = "C новым годом!!!\nСчасливого " + future_year + " года!"; setTimeout(function() { $('body').fireworks(); }); @@ -132,7 +104,5 @@ let d_for_setting = new Date(); let future_year = (d_for_setting.getMonth() == 0 && d_for_setting.getDate() < 7) ? d_for_setting.getFullYear() : d_for_setting.getFullYear() + 1 document.getElementById("future_year").innerHTML = future_year; initializeClock("Jan 01 " + future_year + " 00:00:00"); -//initializeClock("Aug 15 2021 22:17:00"); -DateTime(); -setInterval(DateTime, 1000/60); +//initializeClock("Sep 22 2021 19:21:00"); setInterval(changeBackgroundColor, 1000/60); \ No newline at end of file