From 86683c96cd31b57bae070a40ef056fd239f2ba02 Mon Sep 17 00:00:00 2001
From: dan63047 <dan63047@gmail.com>
Date: Wed, 22 Sep 2021 13:53:34 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=D0=BE=20=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=88=D0=BD=D0=B5=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html | 96 ++++++++++++++++++++++++------------------------------
 script.js  | 14 ++++----
 2 files changed, 49 insertions(+), 61 deletions(-)
diff --git a/index.html b/index.html
index 28d8778..7b6cb89 100755
--- a/index.html
+++ b/index.html
@@ -14,66 +14,56 @@
 
 <body>
 	<h1 class="countdown-title">До нового <span id="future_year"></span> года осталось:</h1>
-	<div class=".container-fluid">
-		<div class="modal" tabindex="-1" role="dialog" id="about">
-			<div class="modal-dialog" role="document">
-				<div class="modal-content">
-					<div class="modal-header">
-						<h5 class="modal-title">О странице</h5>
-						<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-							<span aria-hidden="true">&times;</span>
-						</button>
-					</div>
-					<div class="modal-body">
-						<p>Данный сайт не сохраняет никакие cookie и использует только время вашего устройства.</p>
-						<p>Автор сайта: <a href="https://t.me/dan63047">dan63047</a></p>
-						<button class="btn btn-primary" type="button" data-toggle="collapse" data-target="#debug"
-							aria-expanded="false" aria-controls="collapseExample">
-							Дебаг информация
-						</button>
-						</p>
-						<div class="collapse" id="debug">
-							<div class="card card-body">
-								<div class="incard_l">
-									Отсчёт до:<br>
-									Осталось миллисекунд:<br>
-									Полный таймер:<br>
-									R:<br>
-									G:<br>
-									B:<br>
-									color_phase:<br>
-									color_var:<br>
-								</div>
-								<div class="incard_r">
-									<a id="endtime"></a><br>
-									<a id="left"></a><br>
-									<a id="fulltimer"></a><br>
-									<a id="color_r"></a><br>
-									<a id="color_g"></a><br>
-									<a id="color_b"></a><br>
-									<a id="color_phase"></a><br>
-									<a id="color_var"></a>
-								</div>
+	<div class="modal" tabindex="-1" role="dialog" id="about">
+		<div class="modal-dialog" role="document">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h5 class="modal-title">О странице</h5>
+					<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+						<span aria-hidden="true">&times;</span>
+					</button>
+				</div>
+				<div class="modal-body">
+					<p>Данный сайт не сохраняет никакие cookie и использует только время вашего устройства.</p>
+					<p>Автор сайта: <a href="https://t.me/dan63047">dan63047</a></p>
+					<button class="btn btn-primary" type="button" data-toggle="collapse" data-target="#debug"
+						aria-expanded="false" aria-controls="collapseExample">
+						Дебаг информация
+					</button>
+					</p>
+					<div class="collapse" id="debug">
+						<div class="card card-body">
+							<div class="incard_l">
+								Отсчёт до:<br>
+								Осталось миллисекунд:<br>
+								Полный таймер:<br>
+								Фон:
+							</div>
+							<div class="incard_r">
+								<a id="endtime"></a><br>
+								<a id="left"></a><br>
+								<a id="fulltimer"></a><br>
+								<a id="color"></a>
 							</div>
 						</div>
 					</div>
 				</div>
 			</div>
 		</div>
+	</div>
+	
+	<div id="countdown" class="countdown">
 		
-		<div id="countdown" class="countdown">
-			
-			<div class="countdown-inner">
-				<span class="didts" id="num1"></span>
-			</div>
-			<div class="countdown-inner"><span id="separator1">:</span></div>
-			<div class="countdown-inner">
-				<span class="didts" id="num2"></span>
-			</div>
-			<div class="countdown-inner"><span id="separator2">:</span></div>
-			<div class="countdown-inner">
-				<span class="didts" id="num3"></span>
-			</div>
+		<div class="countdown-inner">
+			<span class="didts" id="num1"></span>
+		</div>
+		<div class="countdown-inner"><span id="separator1">:</span></div>
+		<div class="countdown-inner">
+			<span class="didts" id="num2"></span>
+		</div>
+		<div class="countdown-inner"><span id="separator2">:</span></div>
+		<div class="countdown-inner">
+			<span class="didts" id="num3"></span>
 		</div>
 	</div>
 	<a class="nav-link" data-toggle="modal" href='#about' style="color: #ffffff; text-decoration: underline; width: 100%; position: absolute; bottom: 0;">О странице</a>
diff --git a/script.js b/script.js
index b09d0d5..f0be4d7 100755
--- a/script.js
+++ b/script.js
@@ -35,11 +35,8 @@ function changeBackgroundColor() {
             currect = colors[0]
     }
     document.getElementsByTagName("body")[0].style.backgroundColor = "#"+("0"+Math.round(currect[0]).toString(16)).slice(-2)+("0"+Math.round(currect[1]).toString(16)).slice(-2)+("0"+Math.round(currect[2]).toString(16)).slice(-2);
-    document.getElementById("color_r").innerHTML = currect[0].toFixed(6)
-    document.getElementById("color_g").innerHTML = currect[1].toFixed(6)
-    document.getElementById("color_b").innerHTML = currect[2].toFixed(6)
-    document.getElementById("color_phase").innerHTML = color_phase.toFixed(6)
-    document.getElementById("color_var").innerHTML = color_var.toFixed(6)
+    var num_f = 3;
+    document.getElementById("color").innerHTML = "R:" + currect[0].toFixed(num_f) + "; G:" + currect[1].toFixed(num_f) + "; B:" + currect[2].toFixed(num_f) + "; P:" + Math.trunc(color_phase) + "; V:" + (color_var*100).toFixed(num_f)+"%";
 }
 
 function initializeClock(endtime) {
@@ -51,12 +48,13 @@ function initializeClock(endtime) {
     var debug1 = document.getElementById('endtime');
     var debug2 = document.getElementById('left');
     var debug3 = document.getElementById('fulltimer');
+    var time_to = new Date(endtime)
     var updateTime = 1000 / 60;
 
     function updateClock() {
         var t = getTimeRemaining(endtime);
         if (t.days > 0) {
-            num1.innerHTML = (t.days > 99) ? t.days : ('0' + t.days).slice(-2);
+            num1.innerHTML = t.days;
             dots1.innerHTML = "д. &#8201&#8201";
             dots1.style.fontSize = "3rem";
             dots1.style.width = dots2.style.width;
@@ -95,7 +93,7 @@ function initializeClock(endtime) {
         debug2.innerHTML = t.total.toLocaleString('ru');
         debug3.innerHTML = t.days + ':' + ('0' + t.hours).slice(-2) + ':' + ('0' + t.minutes).slice(-2) + ':' + ('0' + t.seconds).slice(-2) + '.' + ('00' + t.mseconds).slice(-3);
     }
-    debug1.innerHTML = endtime;
+    debug1.innerHTML = time_to.toLocaleString();
     updateClock();
     var timeinterval = setInterval(updateClock, updateTime);
 }
@@ -104,5 +102,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("Sep 22 2021 19:21:00");
+//initializeClock("Sep 23 2021 13:24:00");
 setInterval(changeBackgroundColor, 1000/60);
\ No newline at end of file
