From e8fbe968a523a19ff92caca5620df26dc6ac0505 Mon Sep 17 00:00:00 2001 From: eCode Date: Thu, 7 Mar 2024 20:45:13 -0300 Subject: [PATCH] update slatedocs --- .github/workflows/build.yml | 12 ++--- .github/workflows/deploy.yml | 4 +- .github/workflows/dev_deploy.yml | 6 +-- .github/workflows/publish.yml | 2 +- CHANGELOG.md | 15 ++++++ Gemfile | 2 +- Gemfile.lock | 82 +++++++++++++++--------------- Vagrantfile | 2 +- slate.sh | 2 +- source/javascripts/app/_lang.js | 2 +- source/stylesheets/_normalize.scss | 2 +- source/stylesheets/screen.css.scss | 4 ++ 12 files changed, 75 insertions(+), 60 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 38a608b..34e1b77 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,16 +12,16 @@ jobs: strategy: matrix: - ruby-version: [2.6, 2.7, '3.0', 3.1] + ruby-version: [2.6, 2.7, '3.0', 3.1, 3.2] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby-version }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: vendor/bundle key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} @@ -29,14 +29,10 @@ jobs: gems-${{ runner.os }}-${{ matrix.ruby-version }}- gems-${{ runner.os }}- - # necessary to get ruby 2.3 to work nicely with bundler vendor/bundle cache - # can remove once ruby 2.3 is no longer supported - - run: gem update --system - - run: bundle config set deployment 'true' - name: bundle install run: | bundle config path vendor/bundle bundle install --jobs 4 --retry 3 - - run: bundle exec middleman build --verbose + - run: bundle exec middleman build diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3eefbec..6a032b4 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,13 +14,13 @@ jobs: ruby-version: 2.6 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: ruby-version: ${{ env.ruby-version }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: vendor/bundle key: gems-${{ runner.os }}-${{ env.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml index 85c7f8b..d9edd29 100644 --- a/.github/workflows/dev_deploy.yml +++ b/.github/workflows/dev_deploy.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Check out the repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up QEMU uses: docker/setup-qemu-action@v1 @@ -56,13 +56,13 @@ jobs: ruby-version: 2.6 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: ruby-version: ${{ env.ruby-version }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: vendor/bundle key: gems-${{ runner.os }}-${{ env.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6c51180..149e720 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out the repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up QEMU uses: docker/setup-qemu-action@v1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e7e39d..49b83dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## Version 2.13.1 + +*January 31, 2023* + +* Fix Vagrantfile gem install for ruby >= 2.6 (thanks @Cyb0rk) +* Disable file watcher in run_build() for sake of qemu on arm64 (thanks @anapsix) +* Expand deprecated git.io links to full url in docs (thanks @judge2020) +* Add margin to paragraph following code-block on phones (thanks @tlhunter) +* Bump nokogiri from 1.13.4 to 1.13.9 +* Bump rouge from 3.28.0 to 3.30.0 +* Bump redcarpet from 3.5.1 to 3.6.0 +* Bump middleman from 4.4.2 to 4.4.3 +* Bump middleman-syntax from 3.2.0 to 3.3.0 +* Bump webrick from 1.7.0 to 1.8.1 + ## Version 2.13.0 *April 22, 2022* diff --git a/Gemfile b/Gemfile index 7604fd4..f2e8441 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ gem 'middleman-syntax', '~> 3.2' gem 'middleman-autoprefixer', '~> 3.0' gem 'middleman-sprockets', '~> 4.1' gem 'rouge', '~> 3.21' -gem 'redcarpet', '~> 3.5.0' +gem 'redcarpet', '~> 3.6.0' gem 'nokogiri', '~> 1.13.3' gem 'sass' gem 'webrick' diff --git a/Gemfile.lock b/Gemfile.lock index bd60f7f..79bfbcb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,29 +1,29 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.1.4.1) + activesupport (6.1.6.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) autoprefixer-rails (10.2.5.0) execjs (< 2.8.0) - backports (3.21.0) + backports (3.23.0) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.9) - contracts (0.13.0) - dotenv (2.7.6) + concurrent-ruby (1.2.0) + contracts (0.16.1) + dotenv (2.8.1) erubis (2.7.0) execjs (2.7.0) fast_blank (1.0.1) - fastimage (2.2.5) - ffi (1.15.4) + fastimage (2.2.6) + ffi (1.15.5) haml (5.2.2) temple (>= 0.8.0) tilt @@ -32,29 +32,29 @@ GEM hashie (3.6.0) i18n (1.6.0) concurrent-ruby (~> 1.0) - kramdown (2.3.1) + kramdown (2.4.0) rexml - listen (3.0.8) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) + listen (3.8.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) memoist (0.16.2) - middleman (4.4.2) + middleman (4.4.3) coffee-script (~> 2.2) - haml (>= 4.0.5) + haml (>= 4.0.5, < 6.0) kramdown (>= 2.3.0) - middleman-cli (= 4.4.2) - middleman-core (= 4.4.2) + middleman-cli (= 4.4.3) + middleman-core (= 4.4.3) middleman-autoprefixer (3.0.0) autoprefixer-rails (~> 10.0) middleman-core (>= 4.0.0) - middleman-cli (4.4.2) + middleman-cli (4.4.3) thor (>= 0.17.0, < 2.0) - middleman-core (4.4.2) - activesupport (>= 6.1, < 7.0) + middleman-core (4.4.3) + activesupport (>= 6.1, < 7.1) addressable (~> 2.4) backports (~> 3.6) bundler (~> 2.0) - contracts (~> 0.13.0) + contracts (~> 0.13) dotenv erubis execjs (~> 2.0) @@ -63,7 +63,7 @@ GEM hamster (~> 3.0) hashie (~> 3.4) i18n (~> 1.6.0) - listen (~> 3.0.0) + listen (~> 3.0) memoist (~> 0.14) padrino-helpers (~> 0.15.0) parallel @@ -77,30 +77,30 @@ GEM middleman-sprockets (4.1.1) middleman-core (~> 4.0) sprockets (>= 3.0) - middleman-syntax (3.2.0) + middleman-syntax (3.3.0) middleman-core (>= 3.2) rouge (~> 3.2) mini_portile2 (2.8.0) - minitest (5.14.4) - nokogiri (1.13.4) + minitest (5.17.0) + nokogiri (1.13.9) mini_portile2 (~> 2.8.0) racc (~> 1.4) - padrino-helpers (0.15.1) + padrino-helpers (0.15.2) i18n (>= 0.6.7, < 2) - padrino-support (= 0.15.1) + padrino-support (= 0.15.2) tilt (>= 1.4.1, < 3) - padrino-support (0.15.1) - parallel (1.21.0) + padrino-support (0.15.2) + parallel (1.22.1) parslet (2.0.0) - public_suffix (4.0.6) + public_suffix (5.0.1) racc (1.6.0) - rack (2.2.3) - rb-fsevent (0.11.0) + rack (2.2.6.2) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - redcarpet (3.5.1) + redcarpet (3.6.0) rexml (3.2.5) - rouge (3.28.0) + rouge (3.30.0) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -112,17 +112,17 @@ GEM sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - temple (0.8.2) - thor (1.1.0) - tilt (2.0.10) + temple (0.10.0) + thor (1.2.1) + tilt (2.0.11) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - tzinfo (2.0.4) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) uglifier (3.2.0) execjs (>= 0.3.0, < 3) - webrick (1.7.0) - zeitwerk (2.5.1) + webrick (1.8.1) + zeitwerk (2.6.0) PLATFORMS ruby @@ -133,7 +133,7 @@ DEPENDENCIES middleman-sprockets (~> 4.1) middleman-syntax (~> 3.2) nokogiri (~> 1.13.3) - redcarpet (~> 3.5.0) + redcarpet (~> 3.6.0) rouge (~> 3.21) sass webrick diff --git a/Vagrantfile b/Vagrantfile index 769b8a5..8a9981b 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -15,7 +15,7 @@ Vagrant.configure(2) do |config| sudo apt-get install -yq ruby ruby-dev sudo apt-get install -yq pkg-config build-essential nodejs git libxml2-dev libxslt-dev sudo apt-get autoremove -yq - gem install --no-ri --no-rdoc bundler + gem install --no-document bundler SHELL # add the local user git config to the vm diff --git a/slate.sh b/slate.sh index a3cc498..d6f1bd9 100755 --- a/slate.sh +++ b/slate.sh @@ -35,7 +35,7 @@ run_serve() { } run_build() { - bundle exec middleman build --clean + bundle exec middleman build --clean --watcher-disable } parse_args() { diff --git a/source/javascripts/app/_lang.js b/source/javascripts/app/_lang.js index cc5ac8b..c1bd6b2 100644 --- a/source/javascripts/app/_lang.js +++ b/source/javascripts/app/_lang.js @@ -143,7 +143,7 @@ under the License. languages = l; var presetLanguage = getLanguageFromQueryString(); - if (presetLanguage) { + if (presetLanguage && languages.includes(presetLanguage)) { // the language is in the URL, so use that language! activateLanguage(presetLanguage); diff --git a/source/stylesheets/_normalize.scss b/source/stylesheets/_normalize.scss index 46f646a..a38db2a 100644 --- a/source/stylesheets/_normalize.scss +++ b/source/stylesheets/_normalize.scss @@ -1,4 +1,4 @@ -/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ +/*! normalize.css v3.0.2 | MIT License | github.com/necolas/normalize.css */ /** * 1. Set default font family to sans-serif. diff --git a/source/stylesheets/screen.css.scss b/source/stylesheets/screen.css.scss index 70e3527..0ce124e 100644 --- a/source/stylesheets/screen.css.scss +++ b/source/stylesheets/screen.css.scss @@ -609,6 +609,10 @@ html, body { %right-col + %left-col { margin-top: $main-padding; } + + .highlight + p { + margin-top: 20px; + } } .highlight .c, .highlight .cm, .highlight .c1, .highlight .cs {