From 06f4dbbfb70b55a7e874a93e2569a9dcc424cfef Mon Sep 17 00:00:00 2001 From: Jason Lengstorf Date: Sun, 24 Oct 2021 17:55:24 -0700 Subject: [PATCH 1/2] feat: Jamstack Conf overlays --- src/components/boop-drop.js | 2 +- src/components/socket-studio-overlays.js | 2 +- src/pages/index.js | 4 ++-- static/styles/content.css | 10 ++++++---- static/styles/global.css | 2 +- static/styles/lower-third.css | 3 ++- static/styles/socket-studio-overlays.css | 6 +++--- 7 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/components/boop-drop.js b/src/components/boop-drop.js index 7a44e1c..8428f2d 100644 --- a/src/components/boop-drop.js +++ b/src/components/boop-drop.js @@ -27,7 +27,7 @@ export function BoopDrop() { - +
diff --git a/src/pages/index.js b/src/pages/index.js index 87674c1..2b99ef8 100644 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -24,7 +24,7 @@ export default () => {
-
+ {/*
*/} {isBrowser ? ( @@ -32,7 +32,7 @@ export default () => { ) : null} -
+ {/*
*/}
diff --git a/static/styles/content.css b/static/styles/content.css index dc529ea..0d37dbb 100644 --- a/static/styles/content.css +++ b/static/styles/content.css @@ -3,6 +3,7 @@ background-size: cover; display: grid; grid-template-columns: 1fr 280px; + height: calc(100vh - 140px); } .videos { @@ -56,9 +57,10 @@ } .content.interview { - background-image: url('https://res.cloudinary.com/jlengstorf/image/upload/f_auto,q_auto/v1596392767/lwj/interview-overlay.webp'); - grid-template-columns: 1fr 480px 80px 480px 1fr; - grid-template-rows: 56px 462px 1fr; + background-image: url('https://res.cloudinary.com/jlengstorf/image/upload/v1635121778/f_auto,q_auto/lwj/jamstack-conf-2021-interview.webp'); + grid-template-columns: 120px 481px 76px 482px 1fr; + grid-template-rows: 69px 462px 1fr; + background-size: 1280px; } .content.connecting-the-dots { @@ -98,5 +100,5 @@ .connecting-the-dots h2::after, .interview h2::after, .monologue h2::after { - background: transparent; + height: 18px; } diff --git a/static/styles/global.css b/static/styles/global.css index f3f92b4..4634f7e 100644 --- a/static/styles/global.css +++ b/static/styles/global.css @@ -5,7 +5,7 @@ --blue: #a6fffa; --light-gray: #e0e0e0; --dark-gray: #1a2a3b; - --black: #011627; + --black: #161a2b; --black-transparent: #01162700; --font-family: mallory, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', diff --git a/static/styles/lower-third.css b/static/styles/lower-third.css index 4c1f6c4..351b25f 100644 --- a/static/styles/lower-third.css +++ b/static/styles/lower-third.css @@ -4,7 +4,8 @@ background: var(--black); display: grid; grid-template-columns: 280px 1fr 380px; - position: relative; + position: absolute; + bottom: 0; z-index: 100; } diff --git a/static/styles/socket-studio-overlays.css b/static/styles/socket-studio-overlays.css index 10f5721..b90ee65 100644 --- a/static/styles/socket-studio-overlays.css +++ b/static/styles/socket-studio-overlays.css @@ -1,5 +1,5 @@ .socket-studio-overlays { - bottom: 150px; + bottom: 140px; left: 0; position: absolute; right: 0; @@ -300,7 +300,7 @@ width: 100px; heigth: auto; top: calc(100% - 30px); - left: calc(100% - 100px); + left: 91%; transition: all 300ms ease-in-out; - transform: scaleX(1); + transform: scaleX(-1); } From 2d162bf555c6cc9d1bb7a22431af16da16d73e7c Mon Sep 17 00:00:00 2001 From: Jason Lengstorf Date: Mon, 25 Oct 2021 11:50:12 -0700 Subject: [PATCH 2/2] hotfix: hardcode schedule index --- src/hooks/use-current-lwj-episode.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hooks/use-current-lwj-episode.js b/src/hooks/use-current-lwj-episode.js index ee80a71..e2a0b7b 100644 --- a/src/hooks/use-current-lwj-episode.js +++ b/src/hooks/use-current-lwj-episode.js @@ -10,10 +10,10 @@ export function useCurrentLWJEpisode() { if (!loading || episode) return; // if an episode is in progress, we still want to show it. - const nowMinus3Hours = new Date().getTime() - 180 * 60 * 1000; + const nowMinus3Hours = new Date().getTime() - 70 * 60 * 1000; const episode = await fetch('https://www.learnwithjason.dev/api/schedule') .then((res) => res.json()) - .then((episodes) => episodes[0]) + .then((episodes) => episodes[2]) .catch((err) => { setError(err); setLoading(false);