From 25a1014d3029da844056a2494df4f061c7cf72df Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Sun, 17 Apr 2022 19:35:41 -0400 Subject: [PATCH] Separate mixins --- README.adoc | 9 +++-- includes/footer.pug | 80 +++++++++++++++++++++++++-------------------- includes/hawk.pug | 3 -- includes/head.pug | 15 ++------- includes/mixins.pug | 18 ++++++++++ 5 files changed, 72 insertions(+), 53 deletions(-) delete mode 100644 includes/hawk.pug create mode 100644 includes/mixins.pug diff --git a/README.adoc b/README.adoc index 5f94f2e..1bb81ff 100644 --- a/README.adoc +++ b/README.adoc @@ -8,7 +8,12 @@ === For Me -* [ ] Figure out contact info * [ ] Font? -* [ ] Make it so links are underlined when not hovered * [ ] 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/ ." diff --git a/includes/footer.pug b/includes/footer.pug index fe555d3..9f67dc3 100644 --- a/includes/footer.pug +++ b/includes/footer.pug @@ -1,39 +1,49 @@ -div.section - div.pageitem - h2 Get in touch! +include ../includes/mixins.pug - div.pageitem.table - div.col - // a(href="#") - img(src="images/fa.png" alt="Facebook logo") - p Email. - | dr.diane well hello there ☃ :) - | @ - | geocation.com - div.col - a(href="#") - img(src="images/tw.png" alt="Twitter logo") - p Follow. - | We are on Twitter - br - | twitter.com/foo-template - div.col - a(href="#") - img(src="images/in.png" alt="Instagram logo") - p Like. - | We are on Instagram - br - | instagram.com/foo-template - div.col - a(href="#") - img(src="images/go.png" alt="Google Plus logo") - p +1. - | We are on Google+ - br - | plus.google.com/foo-template +// div.section +// div.pageitem +// h2 Get in touch! + +// div.pageitem.table +// div.col +// // a(href="#") +// img(src="images/fa.png" alt="Facebook logo") +// p Email. +// | dr.diane well hello there ☃ :) +// | @ +// | geocation.com +// div.col +// a(href="#") +// img(src="images/tw.png" alt="Twitter logo") +// p Follow. +// | We are on Twitter +// br +// | twitter.com/foo-template +// div.col +// a(href="#") +// img(src="images/in.png" alt="Instagram logo") +// p Like. +// | We are on Instagram +// br +// | instagram.com/foo-template +// div.col +// a(href="#") +// img(src="images/go.png" alt="Google Plus logo") +// p +1. +// | We are on Google+ +// br +// | plus.google.com/foo-template div.section div#credits - div.col: p © Copyright 2017 Company Name. - div.col: p Privacy | Terms of Use | Support | Site Map - div.col: p.right HTML & CSS by MLPdesign + // div.col: p © Copyright 2017 Company Name. + // div.col: p Privacy | Terms of Use | Support | Site Map + div.col + p.right + a(href="http://mlpdesign.net") HTML & CSS + | by MLPdesign + // | and + // a(href="https://austenadler.com") austenadler.com + + + diff --git a/includes/hawk.pug b/includes/hawk.pug deleted file mode 100644 index 3f3bc23..0000000 --- a/includes/hawk.pug +++ /dev/null @@ -1,3 +0,0 @@ -br -| Photo courtesy: -a(href="https://ryanhawk.com/") RyanHawk.com diff --git a/includes/head.pug b/includes/head.pug index 9452c62..98159be 100644 --- a/includes/head.pug +++ b/includes/head.pug @@ -1,3 +1,5 @@ +include ../includes/mixins.pug + doctype html html(lang="en") head @@ -70,16 +72,3 @@ mixin bigimage(src, alt, ryanhawk) block if ryanhawk +ryanhawk - -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/includes/mixins.pug b/includes/mixins.pug new file mode 100644 index 0000000..7331053 --- /dev/null +++ b/includes/mixins.pug @@ -0,0 +1,18 @@ +mixin email + | dr.diane well hello there ☃ :) + | @ + | geocation.com + + +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)