From c2c671641df7fa3604d99fbd2f66720e5dcc1000 Mon Sep 17 00:00:00 2001 From: BigBlueHat Date: Tue, 20 Oct 2015 08:43:34 -0400 Subject: [PATCH 1/4] Move GitHub & Twitter icons into includes --- lib/site_template/_includes/footer.html | 9 ++------- lib/site_template/_includes/icon-github.svg | 3 +++ lib/site_template/_includes/icon-twitter.svg | 4 ++++ 3 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 lib/site_template/_includes/icon-github.svg create mode 100644 lib/site_template/_includes/icon-twitter.svg diff --git a/lib/site_template/_includes/footer.html b/lib/site_template/_includes/footer.html index 8fa89ba9..9fbc29e3 100644 --- a/lib/site_template/_includes/footer.html +++ b/lib/site_template/_includes/footer.html @@ -18,9 +18,7 @@
  • - - - + {% include icon-github.svg %} {{ site.github_username }} @@ -32,10 +30,7 @@
  • {{ site.twitter_username }} diff --git a/lib/site_template/_includes/icon-github.svg b/lib/site_template/_includes/icon-github.svg new file mode 100644 index 00000000..1ae1eb60 --- /dev/null +++ b/lib/site_template/_includes/icon-github.svg @@ -0,0 +1,3 @@ + + + diff --git a/lib/site_template/_includes/icon-twitter.svg b/lib/site_template/_includes/icon-twitter.svg new file mode 100644 index 00000000..871707da --- /dev/null +++ b/lib/site_template/_includes/icon-twitter.svg @@ -0,0 +1,4 @@ + + + From 5d92a90bded649f69457f1e589717f861583e49c Mon Sep 17 00:00:00 2001 From: BigBlueHat Date: Tue, 20 Oct 2015 08:52:20 -0400 Subject: [PATCH 2/4] Make HTML includes for GitHub & Twitter icons Made one for each to avoid over paramaterizing the includes. Also allows for various icon formats. --- lib/site_template/_includes/footer.html | 16 ++-------------- lib/site_template/_includes/icon-github.html | 7 +++++++ lib/site_template/_includes/icon-twitter.html | 7 +++++++ 3 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 lib/site_template/_includes/icon-github.html create mode 100644 lib/site_template/_includes/icon-twitter.html diff --git a/lib/site_template/_includes/footer.html b/lib/site_template/_includes/footer.html index 9fbc29e3..72239f1c 100644 --- a/lib/site_template/_includes/footer.html +++ b/lib/site_template/_includes/footer.html @@ -16,25 +16,13 @@ diff --git a/lib/site_template/_includes/icon-github.html b/lib/site_template/_includes/icon-github.html new file mode 100644 index 00000000..604b6d31 --- /dev/null +++ b/lib/site_template/_includes/icon-github.html @@ -0,0 +1,7 @@ + + + {% include icon-github.svg %} + + + {{ include.username }} + diff --git a/lib/site_template/_includes/icon-twitter.html b/lib/site_template/_includes/icon-twitter.html new file mode 100644 index 00000000..25c242ec --- /dev/null +++ b/lib/site_template/_includes/icon-twitter.html @@ -0,0 +1,7 @@ + + + + {{ include.username }} + From 2cde74c44bf286adfd102ffb33c32970ab5ecddd Mon Sep 17 00:00:00 2001 From: BigBlueHat Date: Tue, 20 Oct 2015 08:56:36 -0400 Subject: [PATCH 3/4] Use GitHub icon inline in about.md Had to remove whitespace from icon includes because Markdown... --- lib/site_template/_includes/icon-github.html | 8 +------- lib/site_template/_includes/icon-github.svg | 4 +--- lib/site_template/about.md | 8 ++++++-- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/lib/site_template/_includes/icon-github.html b/lib/site_template/_includes/icon-github.html index 604b6d31..e501a16b 100644 --- a/lib/site_template/_includes/icon-github.html +++ b/lib/site_template/_includes/icon-github.html @@ -1,7 +1 @@ - - - {% include icon-github.svg %} - - - {{ include.username }} - +{% include icon-github.svg %}{{ include.username }} diff --git a/lib/site_template/_includes/icon-github.svg b/lib/site_template/_includes/icon-github.svg index 1ae1eb60..4422c4f5 100644 --- a/lib/site_template/_includes/icon-github.svg +++ b/lib/site_template/_includes/icon-github.svg @@ -1,3 +1 @@ - - - + diff --git a/lib/site_template/about.md b/lib/site_template/about.md index 3ed64bb6..d0e6de5e 100644 --- a/lib/site_template/about.md +++ b/lib/site_template/about.md @@ -6,6 +6,10 @@ permalink: /about/ This is the base Jekyll theme. You can find out more info about customizing your Jekyll theme, as well as basic Jekyll usage documentation at [jekyllrb.com](http://jekyllrb.com/) -You can find the source code for the Jekyll new theme at: [github.com/jglovier/jekyll-new](https://github.com/jglovier/jekyll-new) +You can find the source code for the Jekyll new theme at: +{% include icon-github.html username="jglovier" %} / +[jekyll-new](https://github.com/jglovier/jekyll-new) -You can find the source code for Jekyll at [github.com/jekyll/jekyll](https://github.com/jekyll/jekyll) +You can find the source code for Jekyll at +{% include icon-github.html username="jekyll" %} / +[jekyll](https://github.com/jekyll/jekyll) From d8f38eef0e4e84cca1fe86f432f1e9085fce46a8 Mon Sep 17 00:00:00 2001 From: BigBlueHat Date: Tue, 20 Oct 2015 09:03:27 -0400 Subject: [PATCH 4/4] Made icon-twitter.html inline-able --- lib/site_template/_includes/icon-twitter.html | 8 +------- lib/site_template/_includes/icon-twitter.svg | 5 +---- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/lib/site_template/_includes/icon-twitter.html b/lib/site_template/_includes/icon-twitter.html index 25c242ec..e623dbd6 100644 --- a/lib/site_template/_includes/icon-twitter.html +++ b/lib/site_template/_includes/icon-twitter.html @@ -1,7 +1 @@ - - - - {{ include.username }} - +{{ include.username }} diff --git a/lib/site_template/_includes/icon-twitter.svg b/lib/site_template/_includes/icon-twitter.svg index 871707da..dcf660e7 100644 --- a/lib/site_template/_includes/icon-twitter.svg +++ b/lib/site_template/_includes/icon-twitter.svg @@ -1,4 +1 @@ - - - +