From 9353106f2485d0668409e92ade6aaa84cd7c9673 Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Thu, 14 Apr 2022 00:05:40 -0400 Subject: [PATCH] Fix more css --- css/custom.css | 4 +++ includes/footer.pug | 2 +- includes/head.pug | 16 ++++++++++-- templates/outreach.pug | 56 ++++++++++++++++++++---------------------- templates/teaching.pug | 2 +- 5 files changed, 46 insertions(+), 34 deletions(-) diff --git a/css/custom.css b/css/custom.css index 155c9a8..773be84 100644 --- a/css/custom.css +++ b/css/custom.css @@ -28,3 +28,7 @@ img.big { .table { display: table; } + +.nopadding { + padding: 0; +} diff --git a/includes/footer.pug b/includes/footer.pug index 420d603..fe555d3 100644 --- a/includes/footer.pug +++ b/includes/footer.pug @@ -2,7 +2,7 @@ div.section div.pageitem h2 Get in touch! - div.pageitem + div.pageitem.table div.col // a(href="#") img(src="images/fa.png" alt="Facebook logo") diff --git a/includes/head.pug b/includes/head.pug index c418c28..0dd80ee 100644 --- a/includes/head.pug +++ b/includes/head.pug @@ -53,9 +53,13 @@ body mixin bigimage(src, alt, ryanhawk) figure - img.big(src=src, alt=alt) + // =img_big(src=src, alt=alt) + - var loc = src.replace(/[.].+?$/, ""); + - var ext = src.replace(/^.+[.]/, ""); + a(href=`images/${loc}-full.${ext}`) + img.big(src=`images/${loc}-full.${ext}`, alt=alt) figcaption - p: block + block if ryanhawk +ryanhawk @@ -63,3 +67,11 @@ mixin ryanhawk br | Photo courtesy: a(href="https://ryanhawk.com/") RyanHawk.com + +// mixin img_big(src, alt, href) +// if href +// a(href=href) +// img.big(src=src, alt=alt) +// else +// a(href="#{src}.") +// img.big(src=src, alt=alt) diff --git a/templates/outreach.pug b/templates/outreach.pug index c44c439..9f14d79 100644 --- a/templates/outreach.pug +++ b/templates/outreach.pug @@ -7,51 +7,34 @@ div.section h3 NOAA Teacher at Sea - Scammon Bay, AK - figure - img.big(src="images/Diane_Student_Scammon_Bay-full.png", alt="Diane instructing a student at Scammon Bay, AK") - figcaption - NOAA Teacher at Sea, Mary Cook, invited Diane Stanitski and John Adler to Scammon Bay, AK in 2017 to teach and interact with her indigenous Yup'ik students. See the highlights of their trip at - a(href="https://ryanhawk.com/noaa-teacher-at-sea-mary") https://ryanhawk.com/noaa-teacher-at-sea-mary - include ../includes/hawk.pug + +bigimage("Diane_Student_Scammon_Bay.png", "TODO!", true) + | NOAA Teacher at Sea, Mary Cook, invited Diane Stanitski and John Adler to Scammon Bay, AK in 2017 to teach and interact with her indigenous Yup'ik students. See the highlights of their trip at + a(href="https://ryanhawk.com/noaa-teacher-at-sea-mary") https://ryanhawk.com/noaa-teacher-at-sea-mary // div#slider - // +bigimage("images/Scammon_2017-11-04RHawk206AlaskaNOAA-full.jpg", "TODO!", true) + // +bigimage("Scammon_2017-11-04RHawk206AlaskaNOAA.jpg", "TODO!", true) // | Scammon_2017-11-04RHawk206AlaskaNOAA-full.jpg - // +bigimage("images/Scammon_2017-11-04RHawk334AlaskaNOAA-full.jpg", "TODO!", true) + // +bigimage("Scammon_2017-11-04RHawk334AlaskaNOAA.jpg", "TODO!", true) // | Scammon_2017-11-04RHawk334AlaskaNOAA-full.jpg - // +bigimage("images/Scammon_2017-11-04RHawk366AlaskaNOAA-full.jpg", "TODO!", true) + // +bigimage("Scammon_2017-11-04RHawk366AlaskaNOAA.jpg", "TODO!", true) // | Scammon_2017-11-04RHawk366AlaskaNOAA-full.jpg - // +bigimage("images/Scammon_2017-11-04RHawk414AlaskaNOAA-full.jpg", "TODO!", true) + // +bigimage("Scammon_2017-11-04RHawk414AlaskaNOAA.jpg", "TODO!", true) // | Scammon_2017-11-04RHawk414AlaskaNOAA-full.jpg - // +bigimage("images/Scammon_2017-11-04RHawk423AlaskaNOAA-full.jpg", "TODO!", true) + // +bigimage("Scammon_2017-11-04RHawk423AlaskaNOAA.jpg", "TODO!", true) // | Scammon_2017-11-04RHawk423AlaskaNOAA-full.jpg - +bigimage("images/Scammon_2017-11-04RHawk206AlaskaNOAA-full.jpg", "TODO!", true) + +bigimage("Scammon_2017-11-04RHawk206AlaskaNOAA.jpg", "TODO!", true) | Scammon_2017-11-04RHawk206AlaskaNOAA-full.jpg - +bigimage("images/Scammon_2017-11-04RHawk334AlaskaNOAA-full.jpg", "TODO!", true) + +bigimage("Scammon_2017-11-04RHawk334AlaskaNOAA.jpg", "TODO!", true) | Scammon_2017-11-04RHawk334AlaskaNOAA-full.jpg - +bigimage("images/Scammon_2017-11-04RHawk366AlaskaNOAA-full.jpg", "TODO!", true) + +bigimage("Scammon_2017-11-04RHawk366AlaskaNOAA.jpg", "TODO!", true) | Scammon_2017-11-04RHawk366AlaskaNOAA-full.jpg - +bigimage("images/Scammon_2017-11-04RHawk414AlaskaNOAA-full.jpg", "TODO!", true) + +bigimage("Scammon_2017-11-04RHawk414AlaskaNOAA.jpg", "TODO!", true) | Scammon_2017-11-04RHawk414AlaskaNOAA-full.jpg - +bigimage("images/Scammon_2017-11-04RHawk423AlaskaNOAA-full.jpg", "TODO!", true) + +bigimage("Scammon_2017-11-04RHawk423AlaskaNOAA.jpg", "TODO!", true) | Scammon_2017-11-04RHawk423AlaskaNOAA-full.jpg - - // +bigimage("images/JASON_3D_Climate_Seas_of_Change_Cover-full.png", "TODO!") - // | JASON_3D_Climate_Seas_of_Change_Cover.png - // +bigimage("images/JASON_Learning-_climate_expedition_2-full.png", "TODO!") - // | JASON_Learning-_climate_expedition_2.png - +bigimage("images/JASON_Learning_Climate-Seas_of_Change-Cover-2015-full.png", "TODO!") - | JASON_Learning_Climate-Seas_of_Change-Cover-2015.png - +bigimage("images/Stanitski_Adler_JASON_Argonauts_2-full.png", "TODO!") - | Stanitski_Adler_JASON_Argonauts_2.png - +bigimage("images/Stanitski_Adler_JASON_Argonauts-full.png", "TODO!") - | Stanitski_Adler_JASON_Argonauts.png - +bigimage("images/Stanitski_JASON-full.jpg", "TODO!") - | Stanitski_JASON.jpg - h2: a(href="https://jason.org/") JASON Learning p @@ -77,4 +60,17 @@ div.section a(href="https://www.youtube.com/watch?v=lN-flOgkafk&list=PLwR00vai5XqrdNSj7qI3_FWJrFWicu1Vh&index=64") Watch on YouTube | ) + // +bigimage("JASON_3D_Climate_Seas_of_Change_Cover.png", "TODO!") + // | JASON_3D_Climate_Seas_of_Change_Cover.png + // +bigimage("JASON_Learning-_climate_expedition_2.png", "TODO!") + // | JASON_Learning-_climate_expedition_2.png + +bigimage("JASON_Learning_Climate-Seas_of_Change-Cover-2015.png", "TODO!") + | JASON_Learning_Climate-Seas_of_Change-Cover-2015.png + +bigimage("Stanitski_Adler_JASON_Argonauts_2.png", "TODO!") + | Stanitski_Adler_JASON_Argonauts_2.png + +bigimage("Stanitski_Adler_JASON_Argonauts.png", "TODO!") + | Stanitski_Adler_JASON_Argonauts.png + +bigimage("Stanitski_JASON.jpg", "TODO!") + | Stanitski_JASON.jpg + include ../includes/footer.pug diff --git a/templates/teaching.pug b/templates/teaching.pug index 4eaae5c..7bcebfc 100644 --- a/templates/teaching.pug +++ b/templates/teaching.pug @@ -7,7 +7,7 @@ div.section h3 University-Level Courses Taught - ul.left-align + ul.left-align.nopadding // li // li University of California, Davis – Physical Geography, Analysis of Landforms p University of California, Davis – Physical Geography, Analysis of Landforms