Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev patches #382

Merged
merged 4 commits into from
Jul 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ on:

env:
FORCE_COLOR: 2
NODE: 16
RUBY: 2.7
NODE: 20
RUBY: "3.2"

jobs:
test:
Expand Down Expand Up @@ -54,6 +54,7 @@ jobs:
with:
name: docs
path: ./_site/
if-no-files-found: error

deploy:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.7
3.2.4
6 changes: 4 additions & 2 deletions .stylelintrc → .stylelintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
"extends": [
"stylelint-config-twbs-bootstrap"
],
"reportInvalidScopeDisables": true,
"reportNeedlessDisables": true,
"rules": {
"indentation": 4,
"number-leading-zero": "always",
"@stylistic/indentation": 4,
"@stylistic/number-leading-zero": "always",
"order/properties-order": null,
"property-no-vendor-prefix": null,
"selector-no-vendor-prefix": null,
Expand Down
6 changes: 2 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
source 'https://rubygems.org'

gem 'html-proofer', '~> 3.19.3'
gem 'jekyll', '~> 4.2.2'
gem 'html-proofer', '~> 3.19.4'
gem 'jekyll', '~> 4.3.3'
gem 'jekyll-redirect-from', '~> 0.16.0'
gem 'jekyll-seo-tag', '~> 2.8.0'
gem 'jekyll-sitemap', '~> 1.4.0'
gem 'jekyll-feed', '~> 0.17.0'
gem 'wdm', '~> 0.1.1', :install_if => Gem.win_platform?

gem "webrick", "~> 1.7"
84 changes: 48 additions & 36 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,20 +1,27 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
bigdecimal (3.1.8)
colorator (1.1.0)
concurrent-ruby (1.2.3)
concurrent-ruby (1.3.3)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
ethon (0.16.0)
ffi (>= 1.15.0)
eventmachine (1.2.7)
eventmachine (1.2.7-x64-mingw32)
ffi (1.16.3)
ffi (1.16.3-x64-mingw32)
ffi (1.17.0)
ffi (1.17.0-x64-mingw-ucrt)
forwardable-extended (2.6.0)
google-protobuf (4.27.2)
bigdecimal
rake (>= 13)
google-protobuf (4.27.2-x64-mingw-ucrt)
bigdecimal
rake (>= 13)
html-proofer (3.19.4)
addressable (~> 2.3)
mercenary (~> 0.3)
Expand All @@ -24,29 +31,30 @@ GEM
typhoeus (~> 1.3)
yell (~> 2.0)
http_parser.rb (0.8.0)
i18n (1.14.1)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
jekyll (4.2.2)
jekyll (4.3.3)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 1.0)
jekyll-sass-converter (~> 2.0)
jekyll-sass-converter (>= 2.0, < 4.0)
jekyll-watch (~> 2.0)
kramdown (~> 2.3)
kramdown (~> 2.3, >= 2.3.1)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (~> 0.4.0)
mercenary (>= 0.3.6, < 0.5)
pathutil (~> 0.9)
rouge (~> 3.0)
rouge (>= 3.0, < 5.0)
safe_yaml (~> 1.0)
terminal-table (~> 2.0)
terminal-table (>= 1.8, < 4.0)
webrick (~> 1.7)
jekyll-feed (0.17.0)
jekyll (>= 3.7, < 5.0)
jekyll-redirect-from (0.16.0)
jekyll (>= 3.3, < 5.0)
jekyll-sass-converter (2.2.0)
sassc (> 2.0.1, < 3.0)
jekyll-sass-converter (3.0.0)
sass-embedded (~> 1.54)
jekyll-seo-tag (2.8.0)
jekyll (>= 3.8, < 5.0)
jekyll-sitemap (1.4.0)
Expand All @@ -58,56 +66,60 @@ GEM
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.4)
listen (3.8.0)
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
mini_portile2 (2.8.5)
nokogiri (1.15.6)
mini_portile2 (2.8.7)
nokogiri (1.16.6)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.15.6-x64-mingw32)
nokogiri (1.16.6-x64-mingw-ucrt)
racc (~> 1.4)
parallel (1.24.0)
parallel (1.25.1)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (5.0.4)
racc (1.7.3)
public_suffix (6.0.0)
racc (1.8.0)
rainbow (3.1.1)
rake (13.2.1)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
rb-inotify (0.11.1)
ffi (~> 1.0)
rexml (3.2.8)
strscan (>= 3.0.9)
rouge (3.30.0)
rexml (3.3.2)
strscan
rouge (4.3.0)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
sassc (2.4.0-x64-mingw32)
ffi (~> 1.9)
sass-embedded (1.77.8)
google-protobuf (~> 4.26)
rake (>= 13)
sass-embedded (1.77.8-x64-mingw-ucrt)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-x64-mingw32)
google-protobuf (~> 4.26)
strscan (3.1.0)
terminal-table (2.0.0)
unicode-display_width (~> 1.1, >= 1.1.1)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
typhoeus (1.4.1)
ethon (>= 0.9.0)
unicode-display_width (1.8.0)
unicode-display_width (2.5.0)
wdm (0.1.1)
webrick (1.8.1)
yell (2.2.2)

PLATFORMS
ruby
x64-mingw-ucrt
x64-mingw32

DEPENDENCIES
html-proofer (~> 3.19.3)
jekyll (~> 4.2.2)
html-proofer (~> 3.19.4)
jekyll (~> 4.3.3)
jekyll-feed (~> 0.17.0)
jekyll-redirect-from (~> 0.16.0)
jekyll-seo-tag (~> 2.8.0)
jekyll-sitemap (~> 1.4.0)
wdm (~> 0.1.1)
webrick (~> 1.7)

BUNDLED WITH
2.3.9
2.5.15
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ The easiest way to contribute to this project is via [GitPod](https://gitpod.io)

Alternatively, you can run the application locally:

* Install Ruby (preferably version **2.7.x**) make sure you select "Add Ruby to `PATH`"
* Install Ruby (preferably version **3.2.x**) make sure you select "Add Ruby to `PATH`"
* Run `bundle install`
* Run `bundle exec jekyll s` to build and watch for changes (`http://localhost:8000/`)

### npm tasks

* Install [Node.js](https://nodejs.org/en/), preferably version **16 LTS**
* Install [Node.js](https://nodejs.org/en/), preferably version **20 LTS**
* Run `npm i`
* Run `npm run autoprefixer` to update the vendor prefixes in our Sass files; should be run frequently
* Run `npm run svgo:base -- assets/img/foo.svg` to optimize specific file(s) or `npm run svgo`
Expand Down
2 changes: 1 addition & 1 deletion _includes/scripts.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
<script>{%- include assets/baguetteBox-init.js -%}</script>
{%- endif -%}

<script src='//s3.amazonaws.com/downloads.mailchimp.com/js/mc-validate.js'></script><script>(function($) {window.fnames = new Array(); window.ftypes = new Array();fnames[0]='EMAIL';ftypes[0]='email';fnames[1]='FNAME';ftypes[1]='text';fnames[2]='LNAME';ftypes[2]='text';}(jQuery));var $mcj = jQuery.noConflict(true);</script>
<script src="https://s3.amazonaws.com/downloads.mailchimp.com/js/mc-validate.js"></script><script>(function($) {window.fnames = new Array(); window.ftypes = new Array();fnames[0]='EMAIL';ftypes[0]='email';fnames[1]='FNAME';ftypes[1]='text';fnames[2]='LNAME';ftypes[2]='text';}(jQuery));var $mcj = jQuery.noConflict(true);</script>

1 change: 0 additions & 1 deletion _sass/components/_typography.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
body {
// stylelint-disable-next-line max-line-length
font-family: "Open Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
padding-top: 5rem; // for fixed to top navbar
}
Loading