diff --git a/Orloj.otf b/Orloj.otf deleted file mode 100644 index ade1d62..0000000 Binary files a/Orloj.otf and /dev/null differ diff --git a/fonts/EurostileRound-Medium.ttf b/fonts/EurostileRound-Medium.ttf new file mode 100644 index 0000000..750cbac Binary files /dev/null and b/fonts/EurostileRound-Medium.ttf differ diff --git a/fonts/EurostileRoundExtended-Black.ttf b/fonts/EurostileRoundExtended-Black.ttf new file mode 100644 index 0000000..0a39deb Binary files /dev/null and b/fonts/EurostileRoundExtended-Black.ttf differ diff --git a/fonts/EurostileRoundExtended-Regular.ttf b/fonts/EurostileRoundExtended-Regular.ttf new file mode 100644 index 0000000..3175d6c Binary files /dev/null and b/fonts/EurostileRoundExtended-Regular.ttf differ diff --git a/fullscreen-style.css b/fullscreen-style.css index 3f7da15..c8392e0 100644 --- a/fullscreen-style.css +++ b/fullscreen-style.css @@ -1,6 +1,6 @@ @font-face{ font-family: '7Digital'; - src: url('Orloj.otf'); + src: url('DigitalDismay-VAKw.ttf'); font-weight: normal; font-style: monospace; } diff --git a/script.js b/script.js index b76832e..da44635 100644 --- a/script.js +++ b/script.js @@ -17,8 +17,10 @@ var language_user = window.navigator ? (window.navigator.language || window.navigator.userLanguage) : "ru"; language_user = language_user.substr(0, 2).toLowerCase(); language_site = (language_user == "ru" || language_user == "by" || language_user == "ua") ? "ru" : "en"; -var date_to_local = new Intl.DateTimeFormat(language_site, {timeZone: 'UTC', weekday: 'short', year: 'numeric', month: 'short', day: 'numeric', hour: 'numeric', minute: 'numeric', second: 'numeric', timeZoneName: 'short'}); -var relative_to_local = new Intl.RelativeTimeFormat(language_site, {numeric: 'auto', style: 'long'}); +const local_date_settings = {timeZone: 'UTC', weekday: 'short', year: 'numeric', month: 'short', day: 'numeric', hour: 'numeric', minute: 'numeric', second: 'numeric', timeZoneName: 'short'}; +var date_to_local = new Intl.DateTimeFormat(language_site, local_date_settings); +const local_relative_settings = {numeric: 'auto', style: 'long'}; +var relative_to_local = new Intl.RelativeTimeFormat(language_site, local_relative_settings); function ReadableTimerSwitcher(){ readable_timer_mode++ if(readable_timer_mode > 2){readable_timer_mode = 0} @@ -68,8 +70,8 @@ function languageSwitcher(lang_code){ language_site = "en"; break; } - date_to_local = new Intl.DateTimeFormat(language_site, {timeZone: 'UTC', weekday: 'short', year: 'numeric', month: 'short', day: 'numeric', hour: 'numeric', minute: 'numeric', second: 'numeric', timeZoneName: 'short'}); - relative_to_local = new Intl.RelativeTimeFormat(language_site, {numeric: 'auto', style: 'long'}); + date_to_local = new Intl.DateTimeFormat(language_site, local_date_settings); + relative_to_local = new Intl.RelativeTimeFormat(language_site, local_relative_settings); } languageSwitcher(language_site); function msecDisplaySwitcher(){ @@ -99,7 +101,7 @@ function SpawnOtherCounters(){ } catch (e) { date_to = ((element[3] / 60n / 60n / 24n / 365n) + 1970n).toLocaleString(language_site, {style: "unit", unit: "year"}) } - other_counters_html = other_counters_html + '

'+ element[(language_site == "ru") ? 1 : 0] + '

' + other_counters_html = other_counters_html + '

'+ element[(language_site == "ru") ? 1 : 0] + '

' + l.toLocaleString(language_site) + '
' // second argument: {notation: "compact", compactDisplay: "long", style: "unit", unit: "second", unitDisplay: 'long'} + ((timestamp-parseInt(element[2]))/(parseInt(element[3])-parseInt(element[2]))).toLocaleString(language_site, {style: "percent", minimumFractionDigits: 8}) + " · " + date_from + " ‒ " + date_to @@ -180,7 +182,7 @@ function OtherCountersCycle(){ } $("#main_cd_"+counter_id).html(l.toLocaleString(language_site)); $("#othr_progress_"+counter_id).html( - ((timestamp-parseInt(element[2]))/(parseInt(element[3])-parseInt(element[2]))).toLocaleString(language_site, {style: "percent", minimumFractionDigits: 8}) + ((timestamp-parseInt(element[2]))/(parseInt(element[3])-parseInt(element[2]))).toLocaleString(language_site, {style: "percent", minimumFractionDigits: 9}) + " · " + date_from + " ‒ " + date_to + ' · ' + (l / 60n / 60n / 24n / 365n).toLocaleString(language_site, {style: "unit", unit: "year"}) + ' ' + (l / 60n / 60n / 24n % 365n).toLocaleString(language_site, {style: "unit", unit: "day"}) + ' ' + ("0" + (l / 60n / 60n % 24n)).slice(-2) + ':' + ("0" + (l / 60n % 60n)).slice(-2) + ':' + ("0" + (l % 60n)).slice(-2) ); diff --git a/style.css b/style.css index 9548126..fd3c102 100644 --- a/style.css +++ b/style.css @@ -1,13 +1,27 @@ -@font-face{ - font-family: '7Digital'; - src: url('Orloj.otf'); +@font-face { + font-family: 'Eurostile Round'; + src: local('Eurostile Round Medium'), local('EurostileRound-Medium'), url('fonts/EurostileRound-Medium.ttf') format('truetype'); + font-weight: 500; + font-style: normal; +} +@font-face { + font-family: 'Eurostile Round Extended'; + src: local('Eurostile Round Extended Regular'), local('EurostileRoundExtended-Regular'), url('fonts/EurostileRoundExtended-Regular.ttf') format('truetype'); font-weight: normal; - font-style: monospace; + font-style: normal; +} +@font-face { + font-family: 'Eurostile Round Extended'; + src: local('Eurostile Round Extended Black'), local('EurostileRoundExtended-Black'), url('fonts/EurostileRoundExtended-Black.ttf') format('truetype'); + font-weight: 900; + font-style: normal; } body{ background-color: #000; color: #fff; - font-family: 'Heebo', sans-serif; + font-family: 'Eurostile Round'; + font-weight: 500; + font-style: normal; } #prog{ width: 100%; @@ -15,8 +29,10 @@ body{ #time{ text-align: center; font-size: 10em; - font-family: '7Digital'; - cursor: pointer; + font-family: 'Eurostile Round Extended'; + font-weight: 900; + font-style: normal; + cursor: pointer; } #time-left-msec{ font-size: 2rem; @@ -41,6 +57,14 @@ body{ } #title_ru, #title_en{ text-align: center; + font-family: 'Eurostile Round Extended'; + font-weight: 900; + font-style: normal; +} +h3{ + font-family: 'Eurostile Round Extended'; + font-weight: 900; + font-style: normal; } a{ transition: 500ms;