diff --git a/OliverBooth.Common/OliverBooth.Common.csproj b/OliverBooth.Common/OliverBooth.Common.csproj index d7e38d1..e9e391c 100644 --- a/OliverBooth.Common/OliverBooth.Common.csproj +++ b/OliverBooth.Common/OliverBooth.Common.csproj @@ -11,11 +11,11 @@ - + - + diff --git a/OliverBooth/OliverBooth.csproj b/OliverBooth/OliverBooth.csproj index 4877e85..eb9b41a 100644 --- a/OliverBooth/OliverBooth.csproj +++ b/OliverBooth/OliverBooth.csproj @@ -31,11 +31,11 @@ - + - - - + + + diff --git a/OliverBooth/Pages/Shared/_Layout.cshtml b/OliverBooth/Pages/Shared/_Layout.cshtml index 16a6a2d..b14f5b0 100644 --- a/OliverBooth/Pages/Shared/_Layout.cshtml +++ b/OliverBooth/Pages/Shared/_Layout.cshtml @@ -118,20 +118,6 @@
-@if (!doAprilFools && DateTimeOffset.UtcNow < new DateTime(2024, 03, 08)) -{ -
-
-
00
-
00
-
00
-
00
-
-
-} - -
-
@if (doAprilFools) { diff --git a/src/scss/app.scss b/src/scss/app.scss index 0542b64..8ffa1b6 100644 --- a/src/scss/app.scss +++ b/src/scss/app.scss @@ -26,6 +26,7 @@ body { main.container { background: #333; padding: 20px; + border-radius: 5px; } a { @@ -109,7 +110,7 @@ nav { ul.site-nav { list-style-type: none; padding: 0; - margin: 0 auto; + margin: 20px auto 0 auto; li { display: inline-block; @@ -120,7 +121,7 @@ nav { } a { - font-size: 24px; + font-size: 20px; &:link, &:visited, &:hover, &:active { text-decoration: none; @@ -142,6 +143,7 @@ nav { article { background: #333333; padding: 20px; + border-radius: 5px; *:last-child { margin-bottom: 0; diff --git a/src/ts/app/UI.ts b/src/ts/app/UI.ts index 34310f8..969fde3 100644 --- a/src/ts/app/UI.ts +++ b/src/ts/app/UI.ts @@ -82,33 +82,6 @@ class UI { UI.updateProjectCards(element); } - public static updateUsaCountdown(element?: Element){ - element = element || document.getElementById("usa-countdown"); - - const daysElement = element.querySelector("#usa-countdown-days"); - const hoursElement = element.querySelector("#usa-countdown-hours"); - const minutesElement = element.querySelector("#usa-countdown-minutes"); - const secondsElement = element.querySelector("#usa-countdown-seconds"); - - const start = new Date().getTime(); - const end = Date.UTC(2024, 2, 7, 13, 20); - const diff = end - start; - let days = Math.floor(diff / (1000 * 60 * 60 * 24)); - let hours = Math.floor((diff % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60)); - let minutes = Math.floor((diff % (1000 * 60 * 60)) / (1000 * 60)); - let seconds = Math.floor((diff % (1000 * 60)) / 1000); - - if (days < 0) days = 0 - if (hours < 0) hours = 0; - if (minutes < 0) minutes = 0; - if (seconds < 0) seconds = 0; - - daysElement.innerHTML = days.toString().padStart(2, '0'); - hoursElement.innerHTML = hours.toString().padStart(2, '0'); - minutesElement.innerHTML = minutes.toString().padStart(2, '0'); - secondsElement.innerHTML = seconds.toString().padStart(2, '0'); - } - /** * Adds Bootstrap tooltips to all elements with a title attribute. * @param element The element to search for elements with a title attribute in. diff --git a/src/ts/app/app.ts b/src/ts/app/app.ts index ac67ee4..bcf9d34 100644 --- a/src/ts/app/app.ts +++ b/src/ts/app/app.ts @@ -98,13 +98,6 @@ declare const Prism: any; UI.updateUI(); - const usaCountdown = document.getElementById("usa-countdown"); - if (usaCountdown) { - usaCountdown.addEventListener("click", () => window.location.href = "/blog/2024/02/19/the-american"); - UI.updateUsaCountdown(usaCountdown); - setInterval(() => UI.updateUsaCountdown(usaCountdown), 1000); - } - let avatarType = 0; const headshot = document.getElementById("index-headshot") as HTMLImageElement; if (headshot) {