From e799b1d63525930ff14f7be79ac98c9935b638dd Mon Sep 17 00:00:00 2001 From: sylhare Date: Wed, 6 Dec 2023 09:53:16 -0500 Subject: [PATCH 1/2] Remove problematic sass --- _sass/includes/_share_buttons.scss | 4 +--- _sass/layouts/_posts.scss | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/_sass/includes/_share_buttons.scss b/_sass/includes/_share_buttons.scss index 2bf9711ac9..4c552fc592 100644 --- a/_sass/includes/_share_buttons.scss +++ b/_sass/includes/_share_buttons.scss @@ -1,8 +1,6 @@ -@use "sass:math"; - ul.share-buttons { list-style: none; - padding: math.div($padding-x-small, 2) 0 math.div($padding-x-small, 4) 0; + padding: 1.5% 0 0.75% 0; margin: 0; text-align: center; diff --git a/_sass/layouts/_posts.scss b/_sass/layouts/_posts.scss index 0dd3493b36..9b92839d1e 100644 --- a/_sass/layouts/_posts.scss +++ b/_sass/layouts/_posts.scss @@ -1,5 +1,3 @@ -@use "sass:math"; - .comments { @extend %padding-post; border-bottom: 1px solid rgba(0, 0, 0, 0.1); @@ -101,7 +99,7 @@ header { header { color: var(--header-text); margin-bottom: 0; - padding: math.div($padding-large, 2.5) $padding-large; + padding: 3.6% $padding-large; .meta { color: var(--header-text); From 679069a2f5632295af4fd8983fd55dc9ce93d001 Mon Sep 17 00:00:00 2001 From: sylhare Date: Wed, 6 Dec 2023 10:21:03 -0500 Subject: [PATCH 2/2] Update jekyll build workflow --- .github/workflows/jekyll-build.yml | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/.github/workflows/jekyll-build.yml b/.github/workflows/jekyll-build.yml index eab644c0be..56076860d9 100644 --- a/.github/workflows/jekyll-build.yml +++ b/.github/workflows/jekyll-build.yml @@ -10,18 +10,22 @@ jobs: build: runs-on: ubuntu-latest + strategy: + matrix: + # Do not change as jekyll/builder is used by GitHub pages (for compatibility) + docker-image: [ 'jekyll/builder', 'sylhare/jekyll' ] steps: - - uses: actions/checkout@v3 - - name: Build the site in the jekyll/builder container - run: | - docker run \ - -v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \ - sylhare/jekyll:latest /bin/bash -c "chmod -R 777 /srv/jekyll && jekyll build --future" + - uses: actions/checkout@v3 + - name: Build the site in the container + run: | + docker run \ + -v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \ + ${{ matrix.docker-image }}:latest /bin/bash -c "chmod -R 777 /srv/jekyll && jekyll build --future" - - name: Install packages - continue-on-error: true - run: | - docker pull sylhare/type-on-strap - docker pull sylhare/jekyll + - name: Install packages + continue-on-error: true + run: | + docker pull sylhare/type-on-strap + docker pull sylhare/jekyll