Skip to content

Commit 87af8f2

Browse files
authored
Technical updates (#385)
* Technical updates * Clarify that baseurl and url values relate to GitHub Pages Other minor updates to _config.yml * Use the theme gem directly * Use the main branch for the wai-website-theme and wai-website-plugin gems Update Gemfile.lock accordingly * Use the latest versions of the theme and plugin in deploy previews * Update README
1 parent 0097bd5 commit 87af8f2

File tree

12 files changed

+148
-96
lines changed

12 files changed

+148
-96
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
This file was deleted.

Gemfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1+
# frozen_string_literal: true
2+
13
source 'https://rubygems.org'
24

3-
gem "wai-gems", :path => "_external/data/wai-gems"
4-
gem "nokogiri"
5+
# Gems loaded irrespective of site configuration.
6+
group :jekyll_plugins do
7+
gem 'wai-website-theme', git: 'https://github.com/w3c/wai-website-theme', branch: 'main' # The theme of the site
8+
gem 'wai-website-plugin', git: 'https://github.com/w3c/wai-website-plugin', branch: 'main' # The Jekyll plugins needed by the theme
9+
end

Gemfile.lock

Lines changed: 99 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,51 @@
1-
PATH
2-
remote: _external/data/wai-gems
1+
GIT
2+
remote: https://github.com/w3c/wai-website-plugin
3+
revision: e9f2c0e098caf80e010f1985ba942b6bf540e85e
4+
branch: main
35
specs:
4-
wai-gems (1.0.0)
5-
jekyll-github-metadata
6-
jekyll-include-cache
7-
jekyll-paginate
8-
jekyll-redirect-from
9-
jekyll-relative-links
10-
jekyll-remote-theme
11-
jekyll-seo-tag
12-
jekyll-sitemap
13-
wai-website-plugin
6+
wai-website-plugin (0.3)
7+
jekyll (~> 4.4.1)
8+
nokogiri (~> 1.19.0)
9+
10+
GIT
11+
remote: https://github.com/w3c/wai-website-theme
12+
revision: f33b9fef553b59ef8ecf35c3bef264de8b1ad4a9
13+
branch: main
14+
specs:
15+
wai-website-theme (1.10)
16+
jekyll (~> 4.4.1)
17+
jekyll-include-cache (~> 0.2.1)
18+
jekyll-paginate (~> 1.1.0)
19+
jekyll-redirect-from (~> 0.16.0)
20+
jekyll-seo-tag (~> 2.8.0)
21+
jekyll-sitemap (~> 1.4.0)
22+
logger (~> 1.7.0)
1423

1524
GEM
1625
remote: https://rubygems.org/
1726
specs:
18-
addressable (2.8.7)
19-
public_suffix (>= 2.0.2, < 7.0)
20-
base64 (0.2.0)
21-
bigdecimal (3.1.9)
27+
addressable (2.8.8)
28+
public_suffix (>= 2.0.2, < 8.0)
29+
base64 (0.3.0)
30+
bigdecimal (4.0.1)
2231
colorator (1.1.0)
23-
concurrent-ruby (1.3.5)
24-
csv (3.3.3)
32+
concurrent-ruby (1.3.6)
33+
csv (3.3.5)
2534
em-websocket (0.5.3)
2635
eventmachine (>= 0.12.9)
2736
http_parser.rb (~> 0)
2837
eventmachine (1.2.7)
29-
faraday (2.12.2)
30-
faraday-net_http (>= 2.0, < 3.5)
31-
json
32-
logger
33-
faraday-net_http (3.4.0)
34-
net-http (>= 0.5.0)
35-
ffi (1.17.1-arm64-darwin)
36-
ffi (1.17.1-x86_64-linux-gnu)
38+
ffi (1.17.3-arm64-darwin)
39+
ffi (1.17.3-x86_64-linux-gnu)
3740
forwardable-extended (2.6.0)
38-
google-protobuf (4.30.2-arm64-darwin)
41+
google-protobuf (4.33.2-arm64-darwin)
3942
bigdecimal
4043
rake (>= 13)
41-
google-protobuf (4.30.2-x86_64-linux)
44+
google-protobuf (4.33.2-x86_64-linux-gnu)
4245
bigdecimal
4346
rake (>= 13)
44-
http_parser.rb (0.8.0)
45-
i18n (1.14.7)
47+
http_parser.rb (0.8.1)
48+
i18n (1.14.8)
4649
concurrent-ruby (~> 1.0)
4750
jekyll (4.4.1)
4851
addressable (~> 2.4)
@@ -63,21 +66,11 @@ GEM
6366
safe_yaml (~> 1.0)
6467
terminal-table (>= 1.8, < 4.0)
6568
webrick (~> 1.7)
66-
jekyll-github-metadata (2.16.1)
67-
jekyll (>= 3.4, < 5.0)
68-
octokit (>= 4, < 7, != 4.4.0)
6969
jekyll-include-cache (0.2.1)
7070
jekyll (>= 3.7, < 5.0)
7171
jekyll-paginate (1.1.0)
7272
jekyll-redirect-from (0.16.0)
7373
jekyll (>= 3.3, < 5.0)
74-
jekyll-relative-links (0.7.0)
75-
jekyll (>= 3.3, < 5.0)
76-
jekyll-remote-theme (0.4.3)
77-
addressable (~> 2.0)
78-
jekyll (>= 3.5, < 5.0)
79-
jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
80-
rubyzip (>= 1.3.0, < 3.0)
8174
jekyll-sass-converter (3.0.0)
8275
sass-embedded (~> 1.54)
8376
jekyll-seo-tag (2.8.0)
@@ -86,7 +79,7 @@ GEM
8679
jekyll (>= 3.7, < 5.0)
8780
jekyll-watch (2.2.1)
8881
listen (~> 3.0)
89-
json (2.10.2)
82+
json (2.18.0)
9083
kramdown (2.5.1)
9184
rexml (>= 3.3.9)
9285
kramdown-parser-gfm (1.1.0)
@@ -97,49 +90,87 @@ GEM
9790
rb-inotify (~> 0.9, >= 0.9.10)
9891
logger (1.7.0)
9992
mercenary (0.4.0)
100-
net-http (0.6.0)
101-
uri
102-
nokogiri (1.18.9-arm64-darwin)
93+
nokogiri (1.19.0-arm64-darwin)
10394
racc (~> 1.4)
104-
nokogiri (1.18.9-x86_64-linux-gnu)
95+
nokogiri (1.19.0-x86_64-linux-gnu)
10596
racc (~> 1.4)
106-
octokit (6.1.1)
107-
faraday (>= 1, < 3)
108-
sawyer (~> 0.9)
10997
pathutil (0.16.2)
11098
forwardable-extended (~> 2.6)
111-
public_suffix (6.0.1)
99+
public_suffix (7.0.0)
112100
racc (1.8.1)
113-
rake (13.2.1)
101+
rake (13.3.1)
114102
rb-fsevent (0.11.2)
115103
rb-inotify (0.11.1)
116104
ffi (~> 1.0)
117-
rexml (3.4.2)
118-
rouge (4.5.1)
119-
rubyzip (2.4.1)
105+
rexml (3.4.4)
106+
rouge (4.7.0)
120107
safe_yaml (1.0.5)
121-
sass-embedded (1.86.3-arm64-darwin)
122-
google-protobuf (~> 4.30)
123-
sass-embedded (1.86.3-x86_64-linux-gnu)
124-
google-protobuf (~> 4.30)
125-
sawyer (0.9.2)
126-
addressable (>= 2.3.5)
127-
faraday (>= 0.17.3, < 3)
108+
sass-embedded (1.97.1-arm64-darwin)
109+
google-protobuf (~> 4.31)
110+
sass-embedded (1.97.1-x86_64-linux-gnu)
111+
google-protobuf (~> 4.31)
128112
terminal-table (3.0.2)
129113
unicode-display_width (>= 1.1.1, < 3)
130114
unicode-display_width (2.6.0)
131-
uri (1.0.3)
132-
wai-website-plugin (0.2)
133-
jekyll (>= 3.6, < 5.0)
134-
webrick (1.9.1)
115+
webrick (1.9.2)
135116

136117
PLATFORMS
137-
arm64-darwin-24
118+
arm64-darwin-25
138119
x86_64-linux
139120

140121
DEPENDENCIES
141-
nokogiri
142-
wai-gems!
122+
wai-website-plugin!
123+
wai-website-theme!
124+
125+
CHECKSUMS
126+
addressable (2.8.8) sha256=7c13b8f9536cf6364c03b9d417c19986019e28f7c00ac8132da4eb0fe393b057
127+
base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
128+
bigdecimal (4.0.1) sha256=8b07d3d065a9f921c80ceaea7c9d4ae596697295b584c296fe599dd0ad01c4a7
129+
colorator (1.1.0) sha256=e2f85daf57af47d740db2a32191d1bdfb0f6503a0dfbc8327d0c9154d5ddfc38
130+
concurrent-ruby (1.3.6) sha256=6b56837e1e7e5292f9864f34b69c5a2cbc75c0cf5338f1ce9903d10fa762d5ab
131+
csv (3.3.5) sha256=6e5134ac3383ef728b7f02725d9872934f523cb40b961479f69cf3afa6c8e73f
132+
em-websocket (0.5.3) sha256=f56a92bde4e6cb879256d58ee31f124181f68f8887bd14d53d5d9a292758c6a8
133+
eventmachine (1.2.7) sha256=994016e42aa041477ba9cff45cbe50de2047f25dd418eba003e84f0d16560972
134+
ffi (1.17.3-arm64-darwin) sha256=0c690555d4cee17a7f07c04d59df39b2fba74ec440b19da1f685c6579bb0717f
135+
ffi (1.17.3-x86_64-linux-gnu) sha256=3746b01f677aae7b16dc1acb7cb3cc17b3e35bdae7676a3f568153fb0e2c887f
136+
forwardable-extended (2.6.0) sha256=1bec948c469bbddfadeb3bd90eb8c85f6e627a412a3e852acfd7eaedbac3ec97
137+
google-protobuf (4.33.2-arm64-darwin) sha256=6d0ac185fed18768e5f16338455b1e4b7c38a97fc46f352e709f7a3007b64e1d
138+
google-protobuf (4.33.2-x86_64-linux-gnu) sha256=73cba041477afcac92ff383fcbdec195ea28d96b994876d1deaa944d18f91786
139+
http_parser.rb (0.8.1) sha256=9ae8df145b39aa5398b2f90090d651c67bd8e2ebfe4507c966579f641e11097a
140+
i18n (1.14.8) sha256=285778639134865c5e0f6269e0b818256017e8cde89993fdfcbfb64d088824a5
141+
jekyll (4.4.1) sha256=4c1144d857a5b2b80d45b8cf5138289579a9f8136aadfa6dd684b31fe2bc18c1
142+
jekyll-include-cache (0.2.1) sha256=c7d4b9e551732a27442cb2ce853ba36a2f69c66603694b8c1184c99ab1a1a205
143+
jekyll-paginate (1.1.0) sha256=880aadf4b02529a93541d508c5cbb744f014cbfc071d0263a31f25ec9066eb64
144+
jekyll-redirect-from (0.16.0) sha256=6635cae569ef9b0f90ffb71ec014ba977177fafb44d32a2b0526288d4d9be6db
145+
jekyll-sass-converter (3.0.0) sha256=e2e7674f186e906b9d99b8066e13f9b4d5cb9f806d36f7bc8cf2610053d8c902
146+
jekyll-seo-tag (2.8.0) sha256=3f2ed1916d56f14ebfa38e24acde9b7c946df70cb183af2cb5f0598f21ae6818
147+
jekyll-sitemap (1.4.0) sha256=0de08c5debc185ea5a8f980e1025c7cd3f8e0c35c8b6ef592f15c46235cf4218
148+
jekyll-watch (2.2.1) sha256=bc44ed43f5e0a552836245a54dbff3ea7421ecc2856707e8a1ee203a8387a7e1
149+
json (2.18.0) sha256=b10506aee4183f5cf49e0efc48073d7b75843ce3782c68dbeb763351c08fd505
150+
kramdown (2.5.1) sha256=87bbb6abd9d3cebe4fc1f33e367c392b4500e6f8fa19dd61c0972cf4afe7368c
151+
kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729
152+
liquid (4.0.4) sha256=4fcfebb1a045e47918388dbb7a0925e7c3893e58d2bd6c3b3c73ec17a2d8fdb3
153+
listen (3.9.0) sha256=db9e4424e0e5834480385197c139cb6b0ae0ef28cc13310cfd1ca78377d59c67
154+
logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
155+
mercenary (0.4.0) sha256=b25a1e4a59adca88665e08e24acf0af30da5b5d859f7d8f38fba52c28f405138
156+
nokogiri (1.19.0-arm64-darwin) sha256=0811dfd936d5f6dd3f6d32ef790568bf29b2b7bead9ba68866847b33c9cf5810
157+
nokogiri (1.19.0-x86_64-linux-gnu) sha256=f482b95c713d60031d48c44ce14562f8d2ce31e3a9e8dd0ccb131e9e5a68b58c
158+
pathutil (0.16.2) sha256=e43b74365631cab4f6d5e4228f812927efc9cb2c71e62976edcb252ee948d589
159+
public_suffix (7.0.0) sha256=f7090b5beb0e56f9f10d79eed4d5fbe551b3b425da65877e075dad47a6a1b095
160+
racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
161+
rake (13.3.1) sha256=8c9e89d09f66a26a01264e7e3480ec0607f0c497a861ef16063604b1b08eb19c
162+
rb-fsevent (0.11.2) sha256=43900b972e7301d6570f64b850a5aa67833ee7d87b458ee92805d56b7318aefe
163+
rb-inotify (0.11.1) sha256=a0a700441239b0ff18eb65e3866236cd78613d6b9f78fea1f9ac47a85e47be6e
164+
rexml (3.4.4) sha256=19e0a2c3425dfbf2d4fc1189747bdb2f849b6c5e74180401b15734bc97b5d142
165+
rouge (4.7.0) sha256=dba5896715c0325c362e895460a6d350803dbf6427454f49a47500f3193ea739
166+
safe_yaml (1.0.5) sha256=a6ac2d64b7eb027bdeeca1851fe7e7af0d668e133e8a88066a0c6f7087d9f848
167+
sass-embedded (1.97.1-arm64-darwin) sha256=9da08e5cc569ef62235fc515a87c75a47b0de40d8416c563ba1abfbe60e606d9
168+
sass-embedded (1.97.1-x86_64-linux-gnu) sha256=9a294bb0acb1a539ed19f0e511098a9740b4aab4389e169585e8da1337fbd8b4
169+
terminal-table (3.0.2) sha256=f951b6af5f3e00203fb290a669e0a85c5dd5b051b3b023392ccfd67ba5abae91
170+
unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a
171+
wai-website-plugin (0.3)
172+
wai-website-theme (1.10)
173+
webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131
143174

144175
BUNDLED WITH
145-
2.5.14
176+
4.0.3

_config.yml

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ title: "Web Accessibility Initiative (WAI)"
1010
email: your-email@domain.com
1111
description: > # this means to ignore newlines until "baseurl:"
1212
The Website of the World Wide Web Consortium’s Web Accessibility Initiative.
13-
baseurl: "/wcag-act-rules" # the subpath of your site, e.g. /blog
14-
url: "https://w3c.github.io" # the base hostname & protocol for your site
13+
baseurl: "/wcag-act-rules" # the subpath of your site (for GitHub Pages)
14+
url: "https://w3c.github.io" # the base hostname & protocol for your site (for GitHub Pages)
1515
twitter:
1616
username: w3c_wai
1717
author: w3c_wai
@@ -21,17 +21,19 @@ exclude:
2121
- "Gemfile.lock"
2222
- "README.md"
2323
- "w3c.json"
24+
- "node_modules"
25+
repository: w3c/wcag-act-rules
26+
branch: main
2427

2528
# Build settings
2629
markdown: kramdown
27-
kramwdown:
30+
kramdown:
2831
toc_levels: 2..3
2932
input: GFM
3033
syntax_highlighter: rouge
3134
highlighter: rouge
32-
repository: w3c/wcag-act-rules
3335

34-
remote_theme: w3c/wai-website-theme
36+
theme: wai-website-theme
3537

3638
collections:
3739
wai-wcag-act-rules-patterns:
@@ -47,7 +49,7 @@ defaults:
4749
class: tight-page
4850
layout: act_rule
4951
external_css: /content-assets/wcag-act-rules/act-styles.css
50-
feedbackmail: group-act-rules@w3.org # NEW: delete this line if it’s an EOWG resource (the default is wai-eo-editors@w3.org)
52+
feedbackmail: group-act-rules@w3.org
5153
footer: > # Translate words below, including "Date:" and "Editor:" Translate the Working Group name. Leave the Working Group acronym in English. Do *not* change the dates in the footer below.
5254
<p><strong>Date:</strong> Updated @@ Month 2021. First published Month 20@@.</p>
5355
<p><strong>Editors:</strong> @@name, @@name. <strong>Contributors:</strong> @@name, @@name, and <a href="https://www.w3.org/groups/wg/@@wg/participants">participants of the @@WG</a>. ACKNOWLEDGEMENTS lists contributors and credits.</p>
@@ -69,13 +71,4 @@ defaults:
6971
- name: About
7072
ref: /standards-guidelines/act/rules/about/
7173
- name: Implementations
72-
ref: /standards-guidelines/act/implementations/
73-
74-
plugins:
75-
- jekyll-seo-tag
76-
- jekyll-sitemap
77-
- jekyll-redirect-from
78-
- jekyll-include-cache
79-
- jekyll-paginate
80-
- jekyll-remote-theme
81-
- wai-website-plugin
74+
ref: /standards-guidelines/act/implementations/

_data/lang.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

_data/navigation.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

_data/translations.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

_external/.nosync

Whitespace-only changes.

_external/data

Lines changed: 0 additions & 1 deletion
This file was deleted.

_plugins/theme-plugin.rb

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)