From b0c17ff17245ec39f4df8253eebb59d758e1e9a3 Mon Sep 17 00:00:00 2001 From: David Darnes Date: Mon, 1 Jan 2018 18:30:28 +0000 Subject: [PATCH 01/16] Switch gems to plugins in demo config --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 7e7303f..05fffce 100755 --- a/_config.yml +++ b/_config.yml @@ -19,7 +19,7 @@ exclude: - garth-jekyll-theme.gemspec # 2. Installed Gems -gems: +plugins: - jekyll-paginate # 3. Gem settings From 702a0e89ce77154fc2276f7c29ff419ad81e279f Mon Sep 17 00:00:00 2001 From: David Darnes Date: Mon, 1 Jan 2018 18:36:00 +0000 Subject: [PATCH 02/16] Remove demo files, fixes #12 --- _config.yml | 3 +- demo/404.md | 7 --- demo/Gemfile | 12 ---- demo/_config.yml | 63 -------------------- demo/_posts/2016-08-27-example-post-one.md | 14 ----- demo/_posts/2016-08-28-example-post-two.md | 20 ------- demo/_posts/2016-08-29-example-post-three.md | 14 ----- demo/about.md | 30 ---------- 8 files changed, 2 insertions(+), 161 deletions(-) delete mode 100755 demo/404.md delete mode 100755 demo/Gemfile delete mode 100755 demo/_config.yml delete mode 100755 demo/_posts/2016-08-27-example-post-one.md delete mode 100755 demo/_posts/2016-08-28-example-post-two.md delete mode 100755 demo/_posts/2016-08-29-example-post-three.md delete mode 100644 demo/about.md diff --git a/_config.yml b/_config.yml index 05fffce..f84dcfc 100755 --- a/_config.yml +++ b/_config.yml @@ -10,12 +10,13 @@ # 1. Files excluded from Jekyll builds exclude: - README.md +- CODE_OF_CONDUCT.md +- CONTRIBUTING.md - screenshot.png - LICENSE - CNAME - Gemfile - Gemfile.lock -- demo/* - garth-jekyll-theme.gemspec # 2. Installed Gems diff --git a/demo/404.md b/demo/404.md deleted file mode 100755 index 3ddb248..0000000 --- a/demo/404.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: "404" -excerpt: "Page Not Found" -permalink: 404.html ---- - -Sorry, but the page could not be found. diff --git a/demo/Gemfile b/demo/Gemfile deleted file mode 100755 index 35d967e..0000000 --- a/demo/Gemfile +++ /dev/null @@ -1,12 +0,0 @@ -source "https://rubygems.org" - -# Make sure Jekyll 3.3 is running -gem "jekyll", "~> 3.3" - -# The theme for the site -gem "garth-jekyll-theme", "~> 0.5" - -# The plugins for the site -group :jekyll_plugins do - gem "jekyll-paginate" -end diff --git a/demo/_config.yml b/demo/_config.yml deleted file mode 100755 index 795220c..0000000 --- a/demo/_config.yml +++ /dev/null @@ -1,63 +0,0 @@ -# Site configuration -# 1. Files excluded from Jekyll builds -# 2. Installed Gems -# 3. Gem settings -# 4. Jekyll settings -# 5. Collections -# 6. Jekyll collections settings -# 7. Site settings - -# 1. Files excluded from Jekyll builds -exclude: -- README.md -- screenshot.png -- LICENSE -- CNAME -- Gemfile -- Gemfile.lock - -# 2. Installed Gems -gems: -- jekyll-paginate - -theme: garth-jekyll-theme - -# 3. Gem settings -paginate: 2 # jekyll-paginate > items per page -paginate_path: blog/page:num # jekyll-paginate > blog page - -# 4. Jekyll settings -sass: - style: compressed # Style compression -permalink: pretty # Permalink style (/YYYY/MM/DD/page-name/) -excerpt_separator: # Marks end of excerpt in posts -timezone: Europe/London # Timezone for blog posts and alike - -# 5. Collections -collections: - posts: - title: Welcome # Needed for Siteleaf - output: true - description: "This is just a demo, find out more [about Garth](/about/)" # The post list page content - -# 6. Jekyll collections settings -defaults: - - - scope: - path: "" - type: pages - values: - layout: page # Default layout - - - scope: - path: "" - type: posts - values: - layout: post # Default layout - -# 7. Site settings -encoding: utf-8 # Make sure the encoding is right -title: "Garth" # Site name or title -logo: "https://www.gravatar.com/avatar/6c0377abcf4da91cdd35dea4554b2a4c?s=500" # Site logo -description: "A stupidly simple theme for Jekyll, using the official Jekyll theme implementation" # Site description and default description -url: "https://garth.darn.es" # Site url diff --git a/demo/_posts/2016-08-27-example-post-one.md b/demo/_posts/2016-08-27-example-post-one.md deleted file mode 100755 index dd3508b..0000000 --- a/demo/_posts/2016-08-27-example-post-one.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -title: What was Wayne's World? -category: General ---- - -Wayne's World is a 1992 American comedy film directed by Penelope Spheeris and starring Mike Myers as Wayne Campbell and Dana Carvey as Garth Algar. The film was adapted from a sketch of the same name on NBC's Saturday Night Live. - - - -The film grossed US$121.6 million in its theatrical run, placing it as the tenth highest-grossing film of 1992 and the highest-grossing of the 11 films based on Saturday Night Live skits. It was filmed in 34 days. - -Wayne's World was Myers' feature film debut. It also features Rob Lowe, Tia Carrere, Lara Flynn Boyle, Brian Doyle-Murray, Robert Patrick (spoofing his role in Terminator 2: Judgment Day), Chris Farley, Ed O'Neill, Ione Skye, Meat Loaf, and Alice Cooper. Wayne's World was released on February 14, 1992, and was a critical and commercial success. A sequel, Wayne's World 2, was released on December 10, 1993. In 2000, readers of Total Film magazine voted Wayne's World the 41st-greatest comedy film of all time. - -_Originally from [Wayne's World (film) - Wikipedia](https://en.wikipedia.org/wiki/Wayne%27s_World_(film))_ diff --git a/demo/_posts/2016-08-28-example-post-two.md b/demo/_posts/2016-08-28-example-post-two.md deleted file mode 100755 index 6e059f1..0000000 --- a/demo/_posts/2016-08-28-example-post-two.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -title: Who is Mike Myers? -category: People ---- - -Michael John "Mike" Myers (born May 25, 1963) is a Canadian-born actor, comedian, screenwriter, and film producer, who also holds UK and US citizenship.[1] He is known for his run as a featured performer on Saturday Night Live from 1989 to 1995, and for playing the title roles in the Wayne's World, Austin Powers, and Shrek films. He also directed the documentary film Supermensch: The Legend of Shep Gordon, and had a small role in Quentin Tarantino's Inglourious Basterds in 2009. - - - -Myers was born on May 25, 1963 in Scarborough, Ontario, the son of English-born parents Eric Myers (1922–1991), an insurance agent, and his wife, Alice E. (nΓ©e Hind; born 1926), an office supervisor and a veteran of the Royal Air Force. - -Both his parents were from Liverpool and he has two older brothers, Paul, an indie rock singer-songwriter, broadcaster and author, and Peter, a Sears Canada employee. - -The family is of English, Scottish and Irish ancestry. Myers was raised Protestant. - -Myers reportedly holds Canadian, U.S. and British citizenship. - -Myers grew up in North York and then Scarborough, where he attended Sir John A. MacDonald Collegiate Institute and then graduated from Stephen Leacock Collegiate Institute in 1982. - -_Originally from [Mike Myers - Wikipedia](https://en.wikipedia.org/wiki/Mike_Myers)_ diff --git a/demo/_posts/2016-08-29-example-post-three.md b/demo/_posts/2016-08-29-example-post-three.md deleted file mode 100755 index 0aa997e..0000000 --- a/demo/_posts/2016-08-29-example-post-three.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -title: Who is Dana Carvey? -category: People ---- - -Dana Thomas Carvey (born June 2, 1955) is an American actor and stand-up comedian known for his work as a cast member on Saturday Night Live and for playing the role of Garth Algar in the Wayne's World films. - - - -Carvey was born in Missoula, Montana, the son of Billie Dahl, a schoolteacher, and Bud Carvey, a high-school business teacher. Carvey is the brother of Brad Carvey, the engineer/designer of the Video Toaster. The character Garth Algar is loosely based on Brad. Carvey has English, German, Irish, Norwegian, and Swedish ancestry, and was raised Lutheran. When he was three years old, his family moved to San Carlos, California, in the San Francisco Bay Area. He received his first drum kit at an early age. He attended Tierra Linda Junior High in San Carlos, Carlmont High School in Belmont, California (where he was a member of the Central Coast Section champion cross country team), College of San Mateo in San Mateo, California, and received his bachelor's degree in broadcast communications from San Francisco State University. - -He had a minor role in Halloween II, and co-starred on One of the Boys in 1982, a short-lived television sitcom that also starred Mickey Rooney, Nathan Lane, and Meg Ryan. In 1984, Carvey had a small role in Rob Reiner's film This Is Spinal Tap, in which he played a mime, with fellow comedian Billy Crystal (who tells him "Mime is money!"). He also appeared in the short-lived film-based action television series Blue Thunder. - -_Originally from [Dana Carvey - Wikipedia](https://en.wikipedia.org/wiki/Dana_Carvey)_ diff --git a/demo/about.md b/demo/about.md deleted file mode 100644 index ffa2d9f..0000000 --- a/demo/about.md +++ /dev/null @@ -1,30 +0,0 @@ ---- -title: About Garth ---- - -A stupidly simple theme for Jekyll, using the official Jekyll theme implementation. - -- [Fork on GitHub](https://github.com/daviddarnes/garth) -- [Install Garth](https://github.com/daviddarnes/garth#installation) -- [Tip me $5](https://www.paypal.me/daviddarnes/5usd) - -## Installation - -### As a Fork - -1. [Fork the repo](https://github.com/daviddarnes/garth#fork-destination-box) -2. Clone down the repo with `$ git clone git@github.com:username/reponame.git` -3. Delete the `demo/` folder and `screenshot.png` files -4. Change the `CNAME` record to your projects' record -5. Install bundler with `$ gem install bundler` -6. Install gems with `$ bundle install` -7. Run Jekyll with `$ bundle exec jekyll serve --watch` -8. Begin hacking for your project - -### As a Jekyll 3.3 theme gem - -1. Download the starter `/demo` content, [quick download link](https://minhaskamal.github.io/DownGit/#/home?url=https://github.com/daviddarnes/garth/tree/master/demo) -2. Install bundler with `$ gem install bundler` -3. Install gems with `$ bundle install` -4. Run Jekyll with `$ bundle exec jekyll serve --watch` -5. Begin hacking for your project From b46caa1eda4156f9920b5681c85e1994d04dcd45 Mon Sep 17 00:00:00 2001 From: David Darnes Date: Mon, 1 Jan 2018 18:49:28 +0000 Subject: [PATCH 03/16] Update readme to reflect installation changes --- README.md | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index d8f8faf..0358691 100755 --- a/README.md +++ b/README.md @@ -13,24 +13,33 @@ ## Installation -### As a Fork +### As a Jekyll theme + +1. Add `gem "garth-jekyll-theme"` to your `Gemfile` to add the theme as a dependancy +2. Run the command `bundle install` in the root of project to install the theme and its dependancies +3. Add `theme: garth-jekyll-theme` to your `_config.yml` file to set the site theme +4. Run `bundle exec jekyll serve` to build and serve your site +5. Done! Use the example [`_config.yml`](https://github.com/daviddarnes/garth/blob/master/_config.yml) file to set site-wide options + +### As a GitHub Pages remote theme + +1. Add `gem "jekyll-remote-theme"` to your `Gemfile` to add the theme as a dependancy +2. Run the command `bundle install` in the root of project to install the jekyll remote theme gem as a dependancy +3. Add `jekyll-remote-theme` to the list of `plugins` in your `_config.yml` file +4. Add `remote_theme: daviddarnes/garth` to your `_config.yml` file to set the site theme +5. Run `bundle exec jekyll serve` to build and serve your site +6. Done! Use the example [`_config.yml`](https://github.com/daviddarnes/garth/blob/master/_config.yml) file to set site-wide options + +### As a Boilerplate / Fork + +_(deprecated, not recommended)_ 1. [Fork the repo](https://github.com/daviddarnes/garth#fork-destination-box) -2. Clone down the repo with `$ git clone git@github.com:username/reponame.git` -3. Delete the `demo/` folder and `screenshot.png` files -4. Change the `CNAME` record to your projects' record -5. Install bundler with `$ gem install bundler` -6. Install gems with `$ bundle install` -7. Run Jekyll with `$ bundle exec jekyll serve --watch` -8. Begin hacking for your project - -### As a Jekyll 3.3 theme gem - -1. Download the starter `/demo` content, [quick download link](https://minhaskamal.github.io/DownGit/#/home?url=https://github.com/daviddarnes/garth/tree/master/demo) -2. Install bundler with `$ gem install bundler` -3. Install gems with `$ bundle install` -4. Run Jekyll with `$ bundle exec jekyll serve --watch` -5. Begin hacking for your project +2. Replace the `Gemfile` with one stating all the gems used in your project +3. Delete the following unnecessary files/folders: `CODE_OF_CONDUCT.md`, `CONTRIBUTING.md`, `LICENSE`, `screenshot.png`, `CNAME` and `garth-jekyll-theme.gemspec` +4. Run the command `bundle install` in the root of project to install the jekyll remote theme gem as a dependancy +5. Run `bundle exec jekyll serve` to build and serve your site +6. Done! Use the example [`_config.yml`](https://github.com/daviddarnes/garth/blob/master/_config.yml) file to set site-wide options ## Site settings From 403501335e218153aeac60bd981d68bf2aa0789e Mon Sep 17 00:00:00 2001 From: David Darnes Date: Mon, 1 Jan 2018 18:59:40 +0000 Subject: [PATCH 04/16] Better styles file structure, #10 --- _sass/_theme.scss | 157 ++++++++++++++++++++++++++++++++++++++++++ _sass/garth.scss | 11 +++ assets/styles.scss | 168 +-------------------------------------------- 3 files changed, 169 insertions(+), 167 deletions(-) create mode 100644 _sass/_theme.scss create mode 100644 _sass/garth.scss diff --git a/_sass/_theme.scss b/_sass/_theme.scss new file mode 100644 index 0000000..0ceb1e6 --- /dev/null +++ b/_sass/_theme.scss @@ -0,0 +1,157 @@ +// Structural elements +body { + background: $color__site--background; + color: $color__site--body; + height: 100%; + display: flex; + @include flex-direction(column); + overflow-x: hidden; +} + +.container { + width: 90%; + max-width: 900px; + margin: 0 auto; +} + + +// Header, feature and footer +.header, +.footer { + .container { + padding: 1rem 0; + @include flexbox; + @include flex-direction(column); + @include align-items(center); + text-align: center; + } + @include breakpoint(break-1) { + .container { + @include flex-direction(row); + @include justify-content(space-between); + text-align: inherit; + } + } +} + +.header { + @include flex(0, 0, auto); + background: darken($color__site--background, 10%); +} + +.logo { + display: inline-block; + line-height: 0; + border-radius: 100%; + overflow: hidden; + img { + width: 4rem; + height: 4rem; + } +} + +.small { + padding-top: .6rem; + color: $color__site--captions; + display: inline-block; +} + +.footer { + border-top: 1px solid darken($color__site--background, 15%); +} + + +// Nav and copyright +.nav { + &--paginator { + @include flexbox; + @include justify-content(center); + color: $color__site--captions; + text-align: center; + } +} + +.pagination { + margin: 0 1rem; +} + + +// Main content +.main { + @include flexbox; + @include flex-direction(column); + @include flex(1, 0, auto); + margin-bottom: 1.6rem; + @include breakpoint(break-1) { + @include flex-direction(row); + } +} + + +// Lists +.list { + &--posts { + list-style: none; + } + &--nav { + list-style: none; + } + .item--post { + margin-left: 0; + } +} + +.item { + &--nav { + display: inline-block; + margin-left: 1rem; + &:first-of-type { + margin-left: 0; + } + } + &--current { + a { + color: $color__site--link--current; + } + } +} + + +// Images and media elements +img { + max-width: 100%; + height: auto; +} + +audio, +video { + width: 100%; +} + + +// Text selection +::selection { + background: $color__site--heading; + color: $color__site--background; + text-shadow: none; +} + + +// Sassline overrides +.typeset { + .button, + button { + background-image: none; + text-shadow: none; + color: lighten(invert($color__site--body), 15%); + &:hover, + &:active, + &:focus { + background-image: none; + color: lighten(invert($color__site--body), 15%); + } + } + hr { + width: 100%; + } +} diff --git a/_sass/garth.scss b/_sass/garth.scss new file mode 100644 index 0000000..37cc94c --- /dev/null +++ b/_sass/garth.scss @@ -0,0 +1,11 @@ +@charset "utf-8"; + +// Import frameworks & theme styles +@import + "normalize", + "colors", + "sassline-base", + "syntax", + "flex", + "theme" +; diff --git a/assets/styles.scss b/assets/styles.scss index 0895eb2..ce117be 100755 --- a/assets/styles.scss +++ b/assets/styles.scss @@ -2,170 +2,4 @@ title: false --- - -// Frameworks & Imports -@charset "utf-8"; -@import "colors.scss"; -@import "normalize"; -@import "sassline-base"; -@import "syntax"; -@import "flex"; - - -// Structural elements -body { - background: $color__site--background; - color: $color__site--body; - height: 100%; - display: flex; - @include flex-direction(column); - overflow-x: hidden; -} - -.container { - width: 90%; - max-width: 900px; - margin: 0 auto; -} - - -// Header, feature and footer -.header, -.footer { - .container { - padding: 1rem 0; - @include flexbox; - @include flex-direction(column); - @include align-items(center); - text-align: center; - } - @include breakpoint(break-1) { - .container { - @include flex-direction(row); - @include justify-content(space-between); - text-align: inherit; - } - } -} - -.header { - @include flex(0, 0, auto); - background: darken($color__site--background, 10%); -} - -.logo { - display: inline-block; - line-height: 0; - border-radius: 100%; - overflow: hidden; - img { - width: 4rem; - height: 4rem; - } -} - -.small { - padding-top: .6rem; - color: $color__site--captions; - display: inline-block; -} - -.footer { - border-top: 1px solid darken($color__site--background, 15%); -} - - -// Nav and copyright -.nav { - &--paginator { - @include flexbox; - @include justify-content(center); - color: $color__site--captions; - text-align: center; - } -} - -.pagination { - margin: 0 1rem; -} - - -// Main content -.main { - @include flexbox; - @include flex-direction(column); - @include flex(1, 0, auto); - margin-bottom: 1.6rem; - @include breakpoint(break-1) { - @include flex-direction(row); - } -} - - -// Lists -.list { - &--posts { - list-style: none; - } - &--nav { - list-style: none; - } - .item--post { - margin-left: 0; - } -} - -.item { - &--nav { - display: inline-block; - margin-left: 1rem; - &:first-of-type { - margin-left: 0; - } - } - &--current { - a { - color: $color__site--link--current; - } - } -} - - -// Images and media elements -img { - max-width: 100%; - height: auto; -} - -audio, -video { - width: 100%; -} - - -// Text selection -::selection { - background: $color__site--heading; - color: $color__site--background; - text-shadow: none; -} - - -// Sassline overrides -.typeset { - .button, - button { - background-image: none; - text-shadow: none; - color: lighten(invert($color__site--body), 15%); - &:hover, - &:active, - &:focus { - background-image: none; - color: lighten(invert($color__site--body), 15%); - } - } - hr { - width: 100%; - } -} +@import "garth"; From 620051e2d3300de6a5698ad7215c120a4a309a67 Mon Sep 17 00:00:00 2001 From: David Darnes Date: Mon, 1 Jan 2018 19:08:31 +0000 Subject: [PATCH 05/16] Remove need for more obscured colour variables #10 --- _sass/_colors.scss | 17 +++++++++-------- _sass/_theme.scss | 22 +++++++++++----------- _sass/sassline-base/_variables.scss | 12 ------------ 3 files changed, 20 insertions(+), 31 deletions(-) diff --git a/_sass/_colors.scss b/_sass/_colors.scss index 41fde2e..4b3218b 100755 --- a/_sass/_colors.scss +++ b/_sass/_colors.scss @@ -1,9 +1,10 @@ // Colours -$color__site--background: #ffefc8; -$color__site--heading: darken(#46412A, 5%); -$color__site--body: #46412A; -$color__site--captions: lighten($color__site--heading, 40%); -$color__site--link: #5B5BFF; -$color__site--link--hover: darken($color__site--link, 10%); -$color__site--link--current: desaturate($color__site--link, 100%); -$color__site--accent: #5B5BFF; +$bodyColour: #46412A; +$headingColour: darken($bodyColour, 5%); +$linkColour: #5B5BFF; +$hoverColour: darken($linkColour, 10%); +$captionColour: lighten($headingColour, 40%); +$white: #fff; + +$backgroundColour: #ffefc8; +$codeBackgroundColour: darken($backgroundColour, 5%); diff --git a/_sass/_theme.scss b/_sass/_theme.scss index 0ceb1e6..e664e32 100644 --- a/_sass/_theme.scss +++ b/_sass/_theme.scss @@ -1,7 +1,7 @@ // Structural elements body { - background: $color__site--background; - color: $color__site--body; + background: $backgroundColour; + color: $bodyColour; height: 100%; display: flex; @include flex-direction(column); @@ -36,7 +36,7 @@ body { .header { @include flex(0, 0, auto); - background: darken($color__site--background, 10%); + background: darken($backgroundColour, 10%); } .logo { @@ -52,12 +52,12 @@ body { .small { padding-top: .6rem; - color: $color__site--captions; + color: $captionColour; display: inline-block; } .footer { - border-top: 1px solid darken($color__site--background, 15%); + border-top: 1px solid darken($backgroundColour, 15%); } @@ -66,7 +66,7 @@ body { &--paginator { @include flexbox; @include justify-content(center); - color: $color__site--captions; + color: $captionColour; text-align: center; } } @@ -111,7 +111,7 @@ body { } &--current { a { - color: $color__site--link--current; + color: desaturate($linkColour, 100%); } } } @@ -131,8 +131,8 @@ video { // Text selection ::selection { - background: $color__site--heading; - color: $color__site--background; + background: $headingColour; + color: $white; text-shadow: none; } @@ -143,12 +143,12 @@ video { button { background-image: none; text-shadow: none; - color: lighten(invert($color__site--body), 15%); + color: lighten(invert($bodyColour), 15%); &:hover, &:active, &:focus { background-image: none; - color: lighten(invert($color__site--body), 15%); + color: lighten(invert($bodyColour), 15%); } } hr { diff --git a/_sass/sassline-base/_variables.scss b/_sass/sassline-base/_variables.scss index 16bb2c1..e0d8747 100755 --- a/_sass/sassline-base/_variables.scss +++ b/_sass/sassline-base/_variables.scss @@ -94,15 +94,3 @@ $white: #FFFFFF !default; // Background colours. $backgroundColour: #FCFCFC !default; $codeBackgroundColour: #F5F4F2 !default; - - -// Alembic reassigned variables -$headingColour: $color__site--heading; -$bodyColour: $color__site--body; -$linkColour: $color__site--link; -$hoverColour: $color__site--link--hover; -$captionColour: $color__site--captions; -$white: #fff; - -$backgroundColour: $color__site--background; -$codeBackgroundColour: darken($color__site--background, 5%); From efeb7623ea512da1edd00193052fda7176e809ed Mon Sep 17 00:00:00 2001 From: David Darnes Date: Mon, 1 Jan 2018 19:13:40 +0000 Subject: [PATCH 06/16] Remove need for title attributes, #14 --- _includes/post-list.html | 4 ++-- _includes/site-logo.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_includes/post-list.html b/_includes/post-list.html index b660ca7..9f4aa50 100755 --- a/_includes/post-list.html +++ b/_includes/post-list.html @@ -5,7 +5,7 @@
  • -

    {{ page.title }}

    +

    {{ page.title }}

    {% include post-meta.html %} {{ page.excerpt | markdownify | truncatewords: 60 }} @@ -22,7 +22,7 @@
  • -

    {{ page.title }}

    +

    {{ page.title }}

    {% include post-meta.html %} {{ page.excerpt | markdownify | truncatewords: 60 }} diff --git a/_includes/site-logo.html b/_includes/site-logo.html index e67dc72..ce5d3f0 100755 --- a/_includes/site-logo.html +++ b/_includes/site-logo.html @@ -1,3 +1,3 @@ - From a787982af8a3793c7be600d4a96b84715ab97951 Mon Sep 17 00:00:00 2001 From: David Darnes Date: Mon, 1 Jan 2018 19:20:43 +0000 Subject: [PATCH 07/16] Check logo exists before showing it --- _includes/site-header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/site-header.html b/_includes/site-header.html index fa02f3e..2a93c0c 100755 --- a/_includes/site-header.html +++ b/_includes/site-header.html @@ -1,6 +1,6 @@
    - {% include site-logo.html %} + {% if site.logo %}{% include site-logo.html %}{% endif %} {% include site-nav.html %}
    From 4026a8ededd3fce0f3506693348f04071e160469 Mon Sep 17 00:00:00 2001 From: David Darnes Date: Mon, 1 Jan 2018 20:23:56 +0000 Subject: [PATCH 08/16] Allow use of baseurl, change logo to an internal url, simple graphic placeholder #13 --- _config.yml | 7 ++++--- _includes/post-list.html | 4 ++-- _includes/post-pagination.html | 4 ++-- _includes/site-logo.html | 4 ++-- _includes/site-nav.html | 4 ++-- assets/logo.svg | 1 + 6 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 assets/logo.svg diff --git a/_config.yml b/_config.yml index f84dcfc..1b564e6 100755 --- a/_config.yml +++ b/_config.yml @@ -37,9 +37,9 @@ timezone: Europe/London # Timezone for blog posts and alike # 5. Collections collections: posts: - title: Welcome # Needed for Siteleaf + title: Blog # Needed for Siteleaf output: true - description: "This is just a demo, find out more [about Garth](/about/)" # The post list page content + description: "This is just a demo, find out more [about Garth](about)" # The post list page content # 6. Jekyll collections settings defaults: @@ -59,6 +59,7 @@ defaults: # 7. Site settings encoding: utf-8 # Make sure the encoding is right title: "Garth" # Site name or title -logo: "https://www.gravatar.com/avatar/6c0377abcf4da91cdd35dea4554b2a4c?s=500" # Site logo +logo: "/assets/logo.svg" # Site logo description: "A stupidly simple theme for Jekyll, using the official Jekyll theme implementation" # Site description and default description url: "https://garth.darn.es" # Site url +baseurl: "/toast" diff --git a/_includes/post-list.html b/_includes/post-list.html index 9f4aa50..99b32d0 100755 --- a/_includes/post-list.html +++ b/_includes/post-list.html @@ -5,7 +5,7 @@
  • -

    {{ page.title }}

    +

    {{ page.title }}

    {% include post-meta.html %} {{ page.excerpt | markdownify | truncatewords: 60 }} @@ -22,7 +22,7 @@
  • -

    {{ page.title }}

    +

    {{ page.title }}

    {% include post-meta.html %} {{ page.excerpt | markdownify | truncatewords: 60 }} diff --git a/_includes/post-pagination.html b/_includes/post-pagination.html index 7aee453..19ff05d 100755 --- a/_includes/post-pagination.html +++ b/_includes/post-pagination.html @@ -1,7 +1,7 @@