From 546532c58aceb3300841fec983811891fd5b38c7 Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Tue, 19 Apr 2022 19:10:03 -0400 Subject: [PATCH] Many requested changes made --- README.adoc | 23 +++++++++++++---- css/custom.css | 3 ++- includes/footer.pug | 3 --- includes/head.pug | 2 +- includes/mixins.pug | 6 ++--- templates/community-involvement.pug | 38 +++++++++++++++++++++++++++++ templates/contact.pug | 11 +++++++++ templates/education.pug | 16 ++++++------ templates/outreach.pug | 15 +++++++++--- 9 files changed, 92 insertions(+), 25 deletions(-) create mode 100644 templates/contact.pug diff --git a/README.adoc b/README.adoc index 1bb81ff..125dde2 100644 --- a/README.adoc +++ b/README.adoc @@ -9,11 +9,24 @@ === For Me * [ ] Font? -* [ ] All images with `Hawk` should be attributed +* [x] All images with `Hawk` should be attributed * [x] Remove contact information * [ ] Move email address to to the top -* [ ] The Educational Resources page is almost perfect. The only thing I would recommend is changing the size of the book title at the top to a larger font size, and reducing the size of the words while adding a bit to it as here: "Children's Science Books Authored/Co-authored by Diane" -* [ ] On the Outreach page, can you move the first caption info "See the highlights of their trip at https://ryanhawk.com/noaa-teacher-at-sea-mary " to the next line below so it’s all on the same line? I think that would look a little cleaner. -* [ ] On the Community Involvement site, can you add the following: "Become a member of your local amateur radio club as a licensed ham! Diane is a member of the Indian Peaks Radio Club (IPRC) and serves as secretary for the club. Check out the IPRC website at: https://indianpeaksradioclub.org/." -* [ ] Community Involvement site, can you please add a bullet stating "Offset your carbon footprint by buying climate credits to support greening projects across the globe. One of many organizations you can work with to do this is Climate Stewards at https://climatestewardsusa.org/ ." +* [ ] The Educational Resources - changing the size of the book title at the top to a larger font size, and reducing the size of the words while adding a bit to it as here: "Children's Science Books Authored/Co-authored by Diane" +* [x] On the Outreach page, can you move the first caption info "See the highlights of their trip at https://ryanhawk.com/noaa-teacher-at-sea-mary " to the next line below so it’s all on the same line? I think that would look a little cleaner. +* [x] On the Community Involvement site, can you add the following: "Become a member of your local amateur radio club as a licensed ham! Diane is a member of the Indian Peaks Radio Club (IPRC) and serves as secretary for the club. Check out the IPRC website at: https://indianpeaksradioclub.org/." +* [x] Community Involvement site, can you please add a bullet stating "Offset your carbon footprint by buying climate credits to support greening projects across the globe. One of many organizations you can work with to do this is Climate Stewards at https://climatestewardsusa.org/ ." + +=== For her + +* All Pages +** [ ] `Contact` page? +** [ ] What else should go in contact page? +* Outreach +** [ ] Descriptor above the first picture or below it? +* Community Involvement +** [ ] Keep the "HAM Radio title"? +** [ ] Paragraph ordering? +** [ ] Alt section? +** [ ] Carbon footprint title? diff --git a/css/custom.css b/css/custom.css index 3667608..637ff03 100644 --- a/css/custom.css +++ b/css/custom.css @@ -9,7 +9,8 @@ img.thumbnail { } img.big, picture.big, .big > img { - width: 100%; + /*width: 100%;*/ + max-width: 75%; } .float-right { diff --git a/includes/footer.pug b/includes/footer.pug index 9f67dc3..063dc9f 100644 --- a/includes/footer.pug +++ b/includes/footer.pug @@ -44,6 +44,3 @@ div.section | by MLPdesign // | and // a(href="https://austenadler.com") austenadler.com - - - diff --git a/includes/head.pug b/includes/head.pug index 98159be..3743836 100644 --- a/includes/head.pug +++ b/includes/head.pug @@ -51,7 +51,7 @@ body li: a(href="education.html") Education li: a(href="outreach.html") Outreach li: a(href="community-involvement.html") Community Involvement - // li: a(href="contact.html") Contact + li: a(href="contact.html") Contact mixin bigimage(src, alt, ryanhawk) figure diff --git a/includes/mixins.pug b/includes/mixins.pug index 7331053..d6e6fc1 100644 --- a/includes/mixins.pug +++ b/includes/mixins.pug @@ -1,7 +1,7 @@ mixin email - | dr.diane well hello there ☃ :) - | @ - | geocation.com + | dr.diane + span(style="display: none;") well hello there ☃ :) + | @geocation.com mixin ryanhawk diff --git a/templates/community-involvement.pug b/templates/community-involvement.pug index a405277..aecd2a3 100644 --- a/templates/community-involvement.pug +++ b/templates/community-involvement.pug @@ -1,6 +1,44 @@ - var title = "Community Involvement" include ../includes/head.pug +div.section + div.pageitem + h2= title + h3 HAM Radio + + p + | To help the community communicate during times of wildfires, flooding and other natural disasters as well as in support of community events where radio coordination and communication is needed, Diane earned her amateur radio technician license and serves as the secretary of the Indian Peaks Radio Club in Nederland, CO. + p + | Check out the IPRC website at: + a(href="https://indianpeaksradioclub.org/") https://indianpeaksradioclub.org/ + + p + | Become a member of your local amateur radio club as a licensed ham! + | Diane is a member of the Indian Peaks Radio Club (IPRC) and serves as secretary for the club. + + h3 Citizen Science Projects + + p + | Project BudBurst - + a(href="https://budburst.org/") budburst.org + p + | Globe at Night - + a(href="https://globeatnight.org") globeatnight.org + p + | CoCoRaHS - + a(href="https://www.cocorahs.org/") www.cocorahs.org + + h3 Citizen Science Projects (alt) + + p: a(href="https://budburst.org/") Project BudBurst + p: a(href="https://globeatnight.org") Globe at Night + p: a(href="https://www.cocorahs.org/") CoCoRaHS + + h3 Carbon Footprint + + p + | Offset your carbon footprint by buying climate credits to support greening projects across the globe. One of many organizations you can work with to do this is Climate Stewards at + a(href="https://climatestewardsusa.org/") https://climatestewardsusa.org/ include ../includes/footer.pug diff --git a/templates/contact.pug b/templates/contact.pug new file mode 100644 index 0000000..1e39bbf --- /dev/null +++ b/templates/contact.pug @@ -0,0 +1,11 @@ +- var title = "Contact" +include ../includes/head.pug + +div.section + div.pageitem + h2=title + + p Please email me! + p: +email + +include ../includes/footer.pug diff --git a/templates/education.pug b/templates/education.pug index a0fece5..5add194 100644 --- a/templates/education.pug +++ b/templates/education.pug @@ -5,11 +5,11 @@ div.section div.pageitem h2 Educational Resources - h3 Children's Science Books Authored/Co-authored + h3 Children's Science Books Authored/Co-authored by Diane h4 What in the World is Happening to Our Climate? - img.float-right(src="images/5._Elementary_GLOBE_Climate_Book_Cover-215.jpg", alt="Book cover for 'What in the World is Happening to Our Climate?'") + img.float-right(src="images/5._Elementary_GLOBE_Climate_Book_Cover-215.jpg", alt="Book cover for 'What in the World is Happening to Our Climate?'", style="padding-left: 10px;") p.left-align @@ -21,23 +21,23 @@ div.section a(href="https://www.globe.gov/about") https://www.globe.gov/about | ) - h4 NOAA Teacher at Sea books + h3 NOAA Teacher at Sea books - div(style="display: flex;flex-flow:row;") + div(style="/*display: flex;flex-flow:row;*/") - div(style="padding: 2rem;") + div(style="/*padding: 2rem;*/") img(src="images/1._TAS_Miss_Cook_Book_Cover-215.png") p Teacher at Sea: Miss Cook's Voyage on the Ronald H. Brown - div(style="padding: 2rem;") + div(style="/*padding: 2rem;*/") img(src="images/2._TIA_Book_Cover-215.png") p Teacher in the Air: Dr. Diane's Flight with the NOAA Hurricane Hunters - div(style="padding: 2rem;") + div(style="/*padding: 2rem;*/") img(src="images/3._TAS_Hydrography_Book_Cover-215.png") p Teacher at Sea, Mrs. Armwood's Hydrographic Adventure on the NOAA Ship FAIRWEATHER - div(style="padding: 2rem;") + div(style="/*padding: 2rem;*/") img(src="images/4._TAS_Fisheries_book_Cover-215.png") p Teacher at Sea: Mr. Tanenbaum Explores Atlantic Fisheries on the NOAA Ship Henry B. Bigelow br diff --git a/templates/outreach.pug b/templates/outreach.pug index 9f14d79..a7e0db1 100644 --- a/templates/outreach.pug +++ b/templates/outreach.pug @@ -7,8 +7,15 @@ div.section h3 NOAA Teacher at Sea - Scammon Bay, AK + p 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. + p + | 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 + +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 + | 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. + p + | 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 @@ -35,7 +42,7 @@ div.section +bigimage("Scammon_2017-11-04RHawk423AlaskaNOAA.jpg", "TODO!", true) | Scammon_2017-11-04RHawk423AlaskaNOAA-full.jpg - h2: a(href="https://jason.org/") JASON Learning + h3: a(href="https://jason.org/") JASON Learning p | Diane was a JASON Host Researcher for Expedition 2: Climate Connections — Drift and Flow in the JASON Learning Curriculum, @@ -70,7 +77,7 @@ div.section | 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 + // +bigimage("Stanitski_JASON.jpg", "TODO!") + // | Stanitski_JASON.jpg include ../includes/footer.pug