Skip to content

Commit 575244d

Browse files
authored
Merge pull request #152 from justwriteclick/ag-upgrade-theme
Update theme version
2 parents 6177ce4 + 5afebec commit 575244d

7 files changed

Lines changed: 112 additions & 156 deletions

File tree

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.6
1+
2.6.2

Gemfile.lock

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ GEM
44
addressable (2.7.0)
55
public_suffix (>= 2.0.2, < 5.0)
66
colorator (1.1.0)
7-
concurrent-ruby (1.1.5)
7+
concurrent-ruby (1.1.6)
88
em-websocket (0.5.1)
99
eventmachine (>= 0.12.9)
1010
http_parser.rb (~> 0.6.0)
1111
ethon (0.12.0)
1212
ffi (>= 1.3.0)
1313
eventmachine (1.2.7)
14-
faraday (1.0.0)
14+
faraday (1.0.1)
1515
multipart-post (>= 1.2, < 3)
16-
ffi (1.12.2)
16+
ffi (1.13.1)
1717
forwardable-extended (2.6.0)
18-
html-proofer (3.15.1)
18+
html-proofer (3.15.3)
1919
addressable (~> 2.3)
2020
mercenary (~> 0.3)
2121
nokogumbo (~> 2.0)
@@ -24,28 +24,30 @@ GEM
2424
typhoeus (~> 1.3)
2525
yell (~> 2.0)
2626
http_parser.rb (0.6.0)
27-
i18n (0.9.5)
27+
i18n (1.8.3)
2828
concurrent-ruby (~> 1.0)
29-
jekyll (3.8.6)
29+
jekyll (4.1.0)
3030
addressable (~> 2.4)
3131
colorator (~> 1.0)
3232
em-websocket (~> 0.5)
33-
i18n (~> 0.7)
34-
jekyll-sass-converter (~> 1.0)
33+
i18n (~> 1.0)
34+
jekyll-sass-converter (~> 2.0)
3535
jekyll-watch (~> 2.0)
36-
kramdown (~> 1.14)
36+
kramdown (~> 2.1)
37+
kramdown-parser-gfm (~> 1.0)
3738
liquid (~> 4.0)
38-
mercenary (~> 0.3.3)
39+
mercenary (~> 0.4.0)
3940
pathutil (~> 0.9)
40-
rouge (>= 1.7, < 4)
41+
rouge (~> 3.0)
4142
safe_yaml (~> 1.0)
43+
terminal-table (~> 1.8)
4244
jekyll-feed (0.13.0)
4345
jekyll (>= 3.7, < 5.0)
4446
jekyll-gist (1.5.0)
4547
octokit (~> 4.2)
4648
jekyll-paginate (1.1.0)
47-
jekyll-sass-converter (1.5.2)
48-
sass (~> 3.4)
49+
jekyll-sass-converter (2.1.0)
50+
sassc (> 2.0.1, < 3.0)
4951
jekyll-seo-tag (2.6.1)
5052
jekyll (>= 3.3, < 5.0)
5153
jekyll-sitemap (1.4.0)
@@ -59,42 +61,46 @@ GEM
5961
jekyll-sitemap (~> 1.3)
6062
jekyll-watch (2.2.1)
6163
listen (~> 3.0)
62-
kramdown (1.17.0)
64+
kramdown (2.2.1)
65+
rexml
66+
kramdown-parser-gfm (1.1.0)
67+
kramdown (~> 2.0)
6368
liquid (4.0.3)
6469
listen (3.2.1)
6570
rb-fsevent (~> 0.10, >= 0.10.3)
6671
rb-inotify (~> 0.9, >= 0.9.10)
67-
mercenary (0.3.6)
72+
mercenary (0.4.0)
6873
mini_portile2 (2.4.0)
6974
multipart-post (2.1.1)
70-
nokogiri (1.10.7)
75+
nokogiri (1.10.9)
7176
mini_portile2 (~> 2.4.0)
7277
nokogumbo (2.0.2)
7378
nokogiri (~> 1.8, >= 1.8.4)
74-
octokit (4.16.0)
79+
octokit (4.18.0)
7580
faraday (>= 0.9)
7681
sawyer (~> 0.8.0, >= 0.5.3)
7782
parallel (1.19.1)
7883
pathutil (0.16.2)
7984
forwardable-extended (~> 2.6)
80-
public_suffix (4.0.3)
85+
public_suffix (4.0.5)
8186
rainbow (3.0.0)
82-
rb-fsevent (0.10.3)
87+
rb-fsevent (0.10.4)
8388
rb-inotify (0.10.1)
8489
ffi (~> 1.0)
85-
rouge (3.15.0)
90+
rexml (3.2.4)
91+
rouge (3.20.0)
8692
safe_yaml (1.0.5)
87-
sass (3.7.4)
88-
sass-listen (~> 4.0.0)
89-
sass-listen (4.0.0)
90-
rb-fsevent (~> 0.9, >= 0.9.4)
91-
rb-inotify (~> 0.9, >= 0.9.7)
93+
sassc (2.4.0)
94+
ffi (~> 1.9)
9295
sawyer (0.8.2)
9396
addressable (>= 2.3.5)
9497
faraday (> 0.8, < 2.0)
95-
typhoeus (1.3.1)
98+
terminal-table (1.8.0)
99+
unicode-display_width (~> 1.1, >= 1.1.1)
100+
typhoeus (1.4.0)
96101
ethon (>= 0.9.0)
97-
yell (2.2.1)
102+
unicode-display_width (1.7.0)
103+
yell (2.2.2)
98104

99105
PLATFORMS
100106
ruby
@@ -104,4 +110,4 @@ DEPENDENCIES
104110
jekyll-theme-so-simple
105111

106112
BUNDLED WITH
107-
1.16.3
113+
1.17.2

README.md

Lines changed: 21 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -19,39 +19,50 @@ Theme courtesy of https://mmistakes.github.io/so-simple-theme/
1919

2020
Test your additions and changes to content by running a local build.
2121

22-
To prepare your environment to build locally, you need to install brew, bundler.io, and Ruby version manager:
22+
On macOS after Catalina, you can
23+
24+
On a macOS prior to Catalina, you need to install brew, bundler.io, and Ruby version manager:
2325

2426
1. Use brew to install a Ruby version manager.
2527

2628
```
2729
$ brew install rbenv ruby-build
2830
```
2931

30-
1. Add rbenv to bash so that it loads every time you open a terminal.
32+
1. Add rbenv to bash so that it loads every time you open a terminal. If you are using macOS Catalina, your profile file may be `.zshrc`.
3133

3234
```
3335
$ echo 'if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi' >> ~/.bash_profile
3436
```
37+
or
38+
```
39+
$ echo 'if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi' >> ~/.zshrc
40+
```
3541

36-
1. Source your `.bash_profile` file.
42+
1. Source your `.bash_profile` file. If you are using macOS Catalina, your profile file may be `.zshrc`.
3743

3844
```
3945
$ source ~/.bash_profile
4046
```
47+
or
48+
```
49+
$ source ~/.zshrc
50+
```
4151

42-
1. Install the version Ruby we need:
52+
1. Install the required Ruby version:
4353

4454
```
45-
$ rbenv install 2.3.1
46-
$ rbenv global 2.3.1
47-
$ ruby -v
55+
$ rbenv install 2.7.1
56+
$ rbenv global 2.7.1
57+
$ rbenv version
4858
```
49-
59+
In return, you should see `ruby 2.7.1 2.7.1 (set by /Users/username/docslikecode/.ruby-version`.
60+
5061
1. Run `gem install bundle` to install the bundler gem, which helps with Ruby dependencies.
5162
1. Run `bundle install` the first time you are in the `docslikecode` directory.
5263

5364
To build locally:
54-
Once you have completed preparing your environment, then you can build locally and review the site in your browser.
65+
Once you have completed preparing your environment, then you can build locally and review the site in your browser.
5566

5667
1. Run the serve command.
5768

@@ -62,93 +73,5 @@ Once you have completed preparing your environment, then you can build locally a
6273
1. Use the **Server address** URL `http://127.0.0.1:4000/` in a browser to preview the content.
6374
1. Press `Ctrl+C` in the serve terminal to stop the server.
6475

65-
> ***TIP***
76+
> ***Tip***
6677
> Leave the serve terminal open and running. Every time you save changes to a file, it automatically regenerates the site so you can test the output immediately. The only file where changes require a restart is the `_config.yml` file.
67-
68-
## To Build Locally (Docker)
69-
70-
1. Install [Docker Community Version](https://www.docker.com/community-edition).
71-
72-
2. In the root directory where the `docslikecode` repo is cloned, create a file named `Dockerfile` containing:
73-
74-
```
75-
FROM grahamc/jekyll:latest
76-
77-
# Install whatever is in your Gemfile
78-
WORKDIR /tmp
79-
ADD Gemfile /tmp/
80-
ADD Gemfile.lock /tmp/
81-
RUN bundle install
82-
83-
# Change back to the Jekyll site directory
84-
WORKDIR /src
85-
86-
```
87-
3. Create a `_config.dev.yml` file, also in the root directory, containing the following:
88-
89-
```
90-
# Develop override settings
91-
# Use when building with Docker container and preview.sh script locally
92-
93-
url : http://192.168.99.100:4000
94-
95-
# Analytics
96-
analytics:
97-
provider : false
98-
```
99-
100-
4. Create a `preview.sh` file, also in the root directory, containing the following:
101-
102-
```
103-
#!/usr/bin/env bash
104-
105-
# Set to the name of the Docker machine you want to use
106-
DOCKER_MACHINE_NAME=default
107-
108-
# Set to the name of the Docker image you want to use
109-
DOCKER_IMAGE_NAME=dlc-site
110-
111-
# Stop on first error
112-
set -e
113-
114-
# Create a Docker host
115-
if !(docker-machine ls | grep "^$DOCKER_MACHINE_NAME "); then
116-
docker-machine create --driver virtualbox $DOCKER_MACHINE_NAME
117-
fi
118-
119-
# Start the host
120-
if (docker-machine ls | grep "^$DOCKER_MACHINE_NAME .* Stopped"); then
121-
docker-machine start $DOCKER_MACHINE_NAME
122-
fi
123-
124-
# Load your Docker host's environment variables
125-
eval $(docker-machine env $DOCKER_MACHINE_NAME)
126-
127-
if [ -e Dockerfile ]; then
128-
# Build a custom Docker image that has custom Jekyll plug-ins installed
129-
docker build --tag $DOCKER_IMAGE_NAME --file Dockerfile .
130-
131-
# Remove dangling images from previous runs
132-
docker rmi -f $(docker images --filter "dangling=true" -q) > /dev/null 2>&1 || true
133-
else
134-
# Use an existing Jekyll Docker image
135-
DOCKER_IMAGE_NAME=grahamc/jekyll
136-
fi
137-
138-
echo "***********************************************************"
139-
echo " Your site will be available at http://$(docker-machine ip $DOCKER_MACHINE_NAME):4000"
140-
echo "***********************************************************"
141-
142-
# Start Jekyll and watch for changes
143-
docker run --rm \
144-
-e JEKYLL_ENV=production \
145-
--volume=/$(pwd):/src \
146-
--publish 4000:4000 \
147-
$DOCKER_IMAGE_NAME \
148-
serve --watch --drafts --force_polling -H 0.0.0.0
149-
```
150-
5. If using Windows, launch Git Bash to run the `preview.sh` file. If using MacOS, launch a Terminal window to run the `preview.sh` file. Make sure to allow permissions to execute the `preview.sh` file, for example `chmod 600 preview.sh`.
151-
152-
```
153-
$ ./preview.sh
154-
```

articles/index.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
---
2-
layout: posts
2+
layout: categories
33
title: Articles
44
excerpt: "Read articles to learn more about the docs like code vision and how to try it for yourself."
55
search: false
6+
entries_layout: grid
67
---
78

89

index.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
layout: home
3-
title: "Docs Like Code"
3+
title: "Docs as Code"
44
excerpt: "Docs like code means treating docs as artfully and mindfully as code."
55
search: false
6+
show_excerpts: true
7+
entries_layout: grid
68
---
79

8-
{% include sign-up.html %}
9-
1010
<div>
1111
<a href="https://www.docslikecode.com/learn/"><img src="images/learn/octocat-400x333.png" alt="Learn more" align="left" hspace="20" vspace="20" width="159"></a>
1212

@@ -34,3 +34,5 @@ <h2>Read the articles</h2>
3434
using GitHub for documentation. Let's find out the best practices and create a balance point between artisanal craft and automation efficiency.
3535
</p>
3636
</div>
37+
38+
{% include sign-up.html %}

netlify.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[build]
2+
3+
publish = "_site/"
4+
5+
[context.production]
6+
publish = "_site/"
7+
command = "jekyll build"
8+
environment = { JEKYLL_ENV = "production" }

package.json

Lines changed: 41 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,43 @@
11
{
2-
"name": "so-simple-theme",
3-
"author": "Michael Rose <michael@mademistakes.com>",
4-
"homepage": "http://mmistakes.github.io/so-simple-theme/",
5-
"repository": {
6-
"type": "git",
7-
"url": "git://github.com/mmistakes/so-simple-theme.git"
8-
},
9-
"bugs": {
10-
"url": "https://github.com/mmistakes/so-simple-theme/issues"
11-
},
12-
"engines": {
13-
"node": ">= 0.10.0"
14-
},
15-
"devDependencies": {
16-
"grunt": "^0.4.5",
17-
"grunt-contrib-clean": "~0.5.0",
18-
"grunt-contrib-imagemin": "~0.5.0",
19-
"grunt-contrib-jshint": "~0.8.0",
20-
"grunt-contrib-uglify": "~0.3.2",
21-
"grunt-contrib-watch": "~0.5.3",
22-
"grunt-svgmin": "~0.3.1"
23-
},
24-
"dependencies": {
25-
"gifsicle": "^3.0.4"
26-
}
2+
"name":"jekyll-theme-so-simple",
3+
"description":"A simple Jekyll theme for words and pictures.",
4+
"version":"3.2.0",
5+
"author":"Michael Rose",
6+
"homepage":"http://mmistakes.github.io/so-simple-theme/",
7+
"repository":{
8+
"type":"git",
9+
"url":"git://github.com/mmistakes/so-simple-theme.git"
10+
},
11+
"bugs":{
12+
"url":"https://github.com/mmistakes/so-simple-theme/issues"
13+
},
14+
"keywords":[
15+
"jekyll",
16+
"theme",
17+
"minimal",
18+
"responsive"
19+
],
20+
"license":"MIT",
21+
"engines":{
22+
"node":">= 0.10.0"
23+
},
24+
"devDependencies":{
25+
"npm-run-all":"^4.1.5",
26+
"onchange":"^6.0.0",
27+
"uglify-js":"^3.4.9"
28+
},
29+
"browserslist":[
30+
"last 2 versions",
31+
"> 5%",
32+
"IE 9"
33+
],
34+
"scripts":{
35+
"uglify":"uglifyjs assets/js/plugins/lity.js assets/js/plugins/jquery.smooth-scroll.js assets/js/plugins/table-of-contents.js assets/js/main.js -c -m -o assets/js/main.min.js",
36+
"add-banner":"node banner.js",
37+
"watch:js":"onchange \"assets/js/**/*.js\" -e \"assets/js/main.min.js\" -- npm run build:js",
38+
"build:js":"npm run uglify && npm run add-banner"
39+
},
40+
"dependencies":{
41+
42+
}
2743
}

0 commit comments

Comments
 (0)