Skip to content

Commit 6025f2d

Browse files
authored
Merge pull request #119 from brianmaierjr/remove-gulp
Remove gulp
2 parents 9983602 + 830c404 commit 6025f2d

25 files changed

+283
-1478
lines changed

Gemfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ source 'https://rubygems.org'
33
gem "jekyll"
44
gem "jekyll-paginate"
55
gem "support-for"
6-
gem "http_parser"
6+
gem "http_parser"
7+
gem "webrick", "~> 1.7"
8+

Gemfile.lock

+24-20
Original file line numberDiff line numberDiff line change
@@ -4,76 +4,80 @@ GEM
44
addressable (2.8.1)
55
public_suffix (>= 2.0.2, < 6.0)
66
colorator (1.1.0)
7-
concurrent-ruby (1.1.10)
7+
concurrent-ruby (1.2.0)
88
em-websocket (0.5.3)
99
eventmachine (>= 0.12.9)
1010
http_parser.rb (~> 0)
1111
eventmachine (1.2.7)
1212
ffi (1.15.5)
1313
forwardable-extended (2.6.0)
14+
google-protobuf (3.21.12)
1415
http_parser (0.1.3)
1516
http_parser.rb (0.8.0)
1617
i18n (1.12.0)
1718
concurrent-ruby (~> 1.0)
18-
jekyll (4.2.2)
19+
jekyll (4.3.2)
1920
addressable (~> 2.4)
2021
colorator (~> 1.0)
2122
em-websocket (~> 0.5)
2223
i18n (~> 1.0)
23-
jekyll-sass-converter (~> 2.0)
24+
jekyll-sass-converter (>= 2.0, < 4.0)
2425
jekyll-watch (~> 2.0)
25-
kramdown (~> 2.3)
26+
kramdown (~> 2.3, >= 2.3.1)
2627
kramdown-parser-gfm (~> 1.0)
2728
liquid (~> 4.0)
28-
mercenary (~> 0.4.0)
29+
mercenary (>= 0.3.6, < 0.5)
2930
pathutil (~> 0.9)
30-
rouge (~> 3.0)
31+
rouge (>= 3.0, < 5.0)
3132
safe_yaml (~> 1.0)
32-
terminal-table (~> 2.0)
33+
terminal-table (>= 1.8, < 4.0)
34+
webrick (~> 1.7)
3335
jekyll-paginate (1.1.0)
34-
jekyll-sass-converter (2.2.0)
35-
sassc (> 2.0.1, < 3.0)
36+
jekyll-sass-converter (3.0.0)
37+
sass-embedded (~> 1.54)
3638
jekyll-watch (2.2.1)
3739
listen (~> 3.0)
3840
kramdown (2.4.0)
3941
rexml
4042
kramdown-parser-gfm (1.1.0)
4143
kramdown (~> 2.0)
42-
liquid (4.0.3)
43-
listen (3.7.1)
44+
liquid (4.0.4)
45+
listen (3.8.0)
4446
rb-fsevent (~> 0.10, >= 0.10.3)
4547
rb-inotify (~> 0.9, >= 0.9.10)
4648
mercenary (0.4.0)
4749
pathutil (0.16.2)
4850
forwardable-extended (~> 2.6)
49-
public_suffix (5.0.0)
51+
public_suffix (5.0.1)
5052
rb-fsevent (0.11.2)
5153
rb-inotify (0.10.1)
5254
ffi (~> 1.0)
5355
rexml (3.2.5)
54-
rouge (3.30.0)
56+
rouge (4.0.1)
5557
safe_yaml (1.0.5)
5658
sass (3.7.4)
5759
sass-listen (~> 4.0.0)
60+
sass-embedded (1.58.0-arm64-darwin)
61+
google-protobuf (~> 3.21)
5862
sass-listen (4.0.0)
5963
rb-fsevent (~> 0.9, >= 0.9.4)
6064
rb-inotify (~> 0.9, >= 0.9.7)
61-
sassc (2.4.0)
62-
ffi (~> 1.9)
6365
support-for (1.0.7)
6466
sass (~> 3.3)
65-
terminal-table (2.0.0)
66-
unicode-display_width (~> 1.1, >= 1.1.1)
67-
unicode-display_width (1.8.0)
67+
terminal-table (3.0.2)
68+
unicode-display_width (>= 1.1.1, < 3)
69+
unicode-display_width (2.4.2)
70+
webrick (1.8.1)
6871

6972
PLATFORMS
70-
x86_64-darwin-21
73+
arm64-darwin-22
7174

7275
DEPENDENCIES
7376
http_parser
7477
jekyll
7578
jekyll-paginate
7679
support-for
80+
webrick (~> 1.7)
7781

7882
BUNDLED WITH
79-
2.3.7
83+
2.3.26

README.md

+28-26
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
![preview Long Haul](/preview.jpg)
22

3-
Long Haul is a minimal jekyll theme built with SASS / GULP / BROWSERSYNC / AUTOPREFIXER and focuses on long form blog posts. It is meant to be used as a starting point for a jekyll blog/website.
3+
Long Haul is a minimal jekyll theme built with SASS and focuses on long form blog posts. It is meant to be used as a starting point for a jekyll blog/website.
44

55
If you really enjoy Long Haul and want to give me credit somewhere on the internet send or tweet out your experience with Long Haul and tag me [@brianmaierjr](https://twitter.com/brianmaierjr).
66

@@ -10,19 +10,19 @@ If you really enjoy Long Haul and want to give me credit somewhere on the intern
1010

1111
## Features
1212

13-
- Minimal, Type Focused Design
14-
- Built with GULP + SASS + BROWSERSYNC + AUTOPREFIXER
15-
- SVG Social Icons
16-
- Responsive Nav Menu
17-
- XML Feed for RSS Readers
18-
- Contact Form via Formspree
19-
- 5 Post Loop with excerpt on Home Page
20-
- Previous / Next Post Navigation
21-
- Estimated Reading Time for posts
22-
- Stylish Drop Cap on posts
23-
- A Better Type Scale for all devices
24-
- Comments powered by Disqus
25-
- [Dark Mode support](https://github.com/brianmaierjr/long-haul/blob/master/preview-dark.png) via [prefers-color-scheme](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme)
13+
- Minimal, Type Focused Design
14+
- Built with SASS
15+
- SVG Social Icons
16+
- Responsive Nav Menu
17+
- XML Feed for RSS Readers
18+
- Contact Form via Formspree
19+
- 5 Post Loop with excerpt on Home Page
20+
- Previous / Next Post Navigation
21+
- Estimated Reading Time for posts
22+
- Stylish Drop Cap on posts
23+
- A Better Type Scale for all devices
24+
- Comments powered by Disqus
25+
- [Dark Mode support](https://github.com/brianmaierjr/long-haul/blob/master/preview-dark.png) via [prefers-color-scheme](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme)
2626

2727
## Setup
2828

@@ -31,30 +31,32 @@ If you really enjoy Long Haul and want to give me credit somewhere on the intern
3131
3. Clone it
3232
4. [Install Bundler](http://bundler.io/)
3333
5. Run `bundle install`
34-
6. Install gulp dependencies by running `npm install`
35-
7. Run Jekyll and watch files by running `bundle exec gulp`
36-
8. Customize and watch the magic happen!
34+
6. Run Jekyll Serve and Watch command`bundle exec jekyll serve -w`
3735

3836
## Site Settings
3937

4038
The main settings can be found inside the `_config.yml` file:
4139

42-
- **title:** title of your site
43-
- **description:** description of your site
44-
- **url:** your url
45-
- **paginate:** the amount of posts displayed on homepage
46-
- **navigation:** these are the links in the main site navigation
47-
- **social** diverse social media usernames (optional)
48-
- **google_analytics** Google Analytics key (optional)
40+
- **title:** title of your site
41+
- **description:** description of your site
42+
- **url:** your url
43+
- **paginate:** the amount of posts displayed on homepage
44+
- **navigation:** these are the links in the main site navigation
45+
- **social** diverse social media usernames (optional)
46+
- **google_analytics** Google Analytics key (optional)
4947

5048
### Header Option
5149

52-
If you'd like your header to be larger then you can use the option below in you `config.yml` to make it take up half of the vertical space on screens 800px wide and up. *Preview image below.*
50+
If you'd like your header to be larger then you can use the option below in you `config.yml` to make it take up half of the vertical space on screens 800px wide and up. _Preview image below._
5351

54-
- **header:** large
52+
- **header:** large
5553

5654
![preview Long Haul](/preview-large.png)
5755

56+
## To use on GitHub Pages
57+
58+
To use latest Jekyll and Jekyll Sass Converter on GitHub Pages, <a href="https://github.blog/changelog/2022-07-27-github-pages-custom-github-actions-workflows-beta/">you can now deploy to a GitHub Pages site using GitHub Actions.</a>
59+
5860
## License
5961

6062
This is [MIT](LICENSE) with no added caveats, so feel free to use this Jekyll theme on your site without linking back to me or using a disclaimer.

_config.yml

+15-12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
title: Long Haul
2-
description: Long Form Jekyll theme built with SASS / COMPASS / SUSY
2+
description: Long Form Jekyll theme built with SASS
33

44
url: https://long-haul.netlify.app
55
paginate_path: "blog/page:num/"
@@ -8,25 +8,28 @@ permalink: blog/:title/
88
# Header Option
99
# header: large
1010

11+
sass:
12+
style: compressed
13+
1114
markdown: kramdown
1215
highlighter: rouge
1316
plugins: [jekyll-paginate]
1417
paginate: 5
1518

1619
navigation:
17-
- title: Home
18-
url: /index.html
19-
- title: About
20-
url: /about
21-
- title: Contact
22-
url: /contact
20+
- title: Home
21+
url: /index.html
22+
- title: About
23+
url: /about
24+
- title: Contact
25+
url: /contact
2326

2427
social:
25-
github: brianmaierjr
26-
twitter: brianmaierjr
27-
facebook: brianmaierjr
28-
29-
linkedin: brianmaierjr
28+
github: brianmaierjr
29+
twitter: brianmaierjr
30+
facebook: brianmaierjr
31+
32+
linkedin: brianmaierjr
3033

3134
google_analytics: "UA-58263416-1"
3235

_includes/head.html

+77-68
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,86 @@
11
<head>
2-
<meta charset="utf-8">
3-
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
4-
<meta name="viewport" content="width=device-width, initial-scale=1">
5-
<meta name="description" content="">
6-
<title>{{ page.title }}</title>
2+
<meta charset="utf-8" />
3+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
4+
<meta name="viewport" content="width=device-width, initial-scale=1" />
5+
<meta name="description" content="" />
6+
<title>{{ page.title }}</title>
77

8-
<!-- Open Graph Meta -->
9-
<meta content="{{ site.title }}" property="og:site_name">
10-
{%- if page.title -%}
11-
<meta content="{{ page.title }}" property="og:title">
12-
{%- else -%}
13-
<meta content="{{ site.title }}" property="og:title">
14-
{%- endif -%}
15-
{%- if page.title -%}
16-
<meta content="article" property="og:type">
17-
{%- else -%}
18-
<meta content="website" property="og:type">
19-
{%- endif -%}
20-
{%- if page.description -%}
21-
<meta content="{{ page.description }}" property="og:description">
22-
{%- else -%}
23-
<meta content="{{ site.description }}" property="og:description">
24-
{%- endif -%}
25-
{%- if page.url -%}
26-
<meta content="{{ site.url }}{{ page.url }}" property="og:url">
27-
{%- endif -%}
28-
{%- if page.date -%}
29-
<meta content="{{ page.date | date_to_xmlschema }}" property="article:published_time">
30-
<meta content="{{ site.url }}/about/" property="article:author">
31-
{%- endif -%}
32-
{%- if page.image -%}
33-
<meta content="{{ site.url }}/assets/img/{{ page.image }}" property="og:image">
34-
{%- else -%}
35-
<meta content="{{ '/assets/img/touring.jpg' | prepend: site.url }}" property="og:image">
36-
{%- endif -%}
8+
<!-- Open Graph Meta -->
9+
<meta content="{{ site.title }}" property="og:site_name" />
10+
{%- if page.title -%}
11+
<meta content="{{ page.title }}" property="og:title" />
12+
{%- else -%}
13+
<meta content="{{ site.title }}" property="og:title" />
14+
{%- endif -%} {%- if page.title -%}
15+
<meta content="article" property="og:type" />
16+
{%- else -%}
17+
<meta content="website" property="og:type" />
18+
{%- endif -%} {%- if page.description -%}
19+
<meta content="{{ page.description }}" property="og:description" />
20+
{%- else -%}
21+
<meta content="{{ site.description }}" property="og:description" />
22+
{%- endif -%} {%- if page.url -%}
23+
<meta content="{{ site.url }}{{ page.url }}" property="og:url" />
24+
{%- endif -%} {%- if page.date -%}
25+
<meta
26+
content="{{ page.date | date_to_xmlschema }}"
27+
property="article:published_time"
28+
/>
29+
<meta content="{{ site.url }}/about/" property="article:author" />
30+
{%- endif -%} {%- if page.image -%}
31+
<meta
32+
content="{{ site.url }}/assets/img/{{ page.image }}"
33+
property="og:image"
34+
/>
35+
{%- else -%}
36+
<meta
37+
content="{{ '/assets/img/touring.jpg' | prepend: site.url }}"
38+
property="og:image"
39+
/>
40+
{%- endif -%}
3741

38-
<!-- Twitter Cards -->
39-
<meta name="twitter:card" content="summary">
40-
<meta name="twitter:site" content="@{{ site.social.twitter }}">
41-
<meta name="twitter:creator" content="@{{ site.social.twitter }}">
42-
{%- if page.title -%}
43-
<meta name="twitter:title" content="{{ page.title }}">
44-
{%- else -%}
45-
<meta name="twitter:title" content="{{ site.title }}">
46-
{%- endif -%}
47-
{%- if page.url -%}
48-
<meta name="twitter:url" content="{{ site.url }}{{ page.url }}">
49-
{%- endif -%}
50-
{%- if page.description -%}
51-
<meta name="twitter:description" content="{{ page.description }}">
52-
{%- else -%}
53-
<meta name="twitter:description" content="{{ site.description }}">
54-
{%- endif -%}
55-
{%- if page.image -%}
56-
<meta name="twitter:image:src" content="{{ site.url }}/assets/img/{{ page.image }}">
57-
{%- else -%}
58-
<meta name="twitter:image:src" content="{{ '/assets/img/touring.jpg' | prepend: site.url }}">
59-
{%- endif -%}
42+
<!-- Twitter Cards -->
43+
<meta name="twitter:card" content="summary" />
44+
<meta name="twitter:site" content="@{{ site.social.twitter }}" />
45+
<meta name="twitter:creator" content="@{{ site.social.twitter }}" />
46+
{%- if page.title -%}
47+
<meta name="twitter:title" content="{{ page.title }}" />
48+
{%- else -%}
49+
<meta name="twitter:title" content="{{ site.title }}" />
50+
{%- endif -%} {%- if page.url -%}
51+
<meta name="twitter:url" content="{{ site.url }}{{ page.url }}" />
52+
{%- endif -%} {%- if page.description -%}
53+
<meta name="twitter:description" content="{{ page.description }}" />
54+
{%- else -%}
55+
<meta name="twitter:description" content="{{ site.description }}" />
56+
{%- endif -%} {%- if page.image -%}
57+
<meta
58+
name="twitter:image:src"
59+
content="{{ site.url }}/assets/img/{{ page.image }}"
60+
/>
61+
{%- else -%}
62+
<meta
63+
name="twitter:image:src"
64+
content="{{ '/assets/img/touring.jpg' | prepend: site.url }}"
65+
/>
66+
{%- endif -%}
6067

68+
<!-- Favicon -->
69+
<link rel="icon" type="image/x-icon" href="/assets/img/favicon.ico" />
6170

62-
<!-- Favicon -->
63-
<link rel="icon" type="image/x-icon" href="/assets/img/favicon.ico" />
71+
<!-- Come and get me RSS readers -->
72+
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}"
73+
href="{{ "/feed.xml" | prepend: site.url }}" />
6474

65-
<!-- Come and get me RSS readers -->
66-
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.url }}" />
67-
68-
<!-- Stylesheet -->
69-
<link rel="stylesheet" href="/assets/css/style.css">
70-
<!--[if IE 8]><link rel="stylesheet" href="/assets/css/ie.css"><![endif]-->
71-
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.url }}">
75+
<!-- Stylesheet -->
76+
<link rel="stylesheet" href="/assets/css/style.css" />
7277

73-
<!-- Modernizr -->
74-
<script src="/assets/js/modernizr.custom.15390.js"" type="text/javascript"></script>
78+
<!-- Canonical URL -->
79+
<link
80+
rel="canonical"
81+
href="{{ page.url | replace:'index.html','' | prepend: site.url }}"
82+
/>
7583

76-
{%- if site.google_analytics -%} {%- include google_analytics.html -%} {%- endif -%}
84+
{%- if site.google_analytics -%} {%- include google_analytics.html -%} {%-
85+
endif -%}
7786
</head>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)