Skip to content

Commit

Permalink
Merge pull request #415 from sylhare/sass-fix
Browse files Browse the repository at this point in the history
Update sass fix to work with github-pages deprecated sass converter
  • Loading branch information
sylhare authored Dec 6, 2023
2 parents 50771dc + 679069a commit b249031
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
26 changes: 15 additions & 11 deletions .github/workflows/jekyll-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 1 addition & 3 deletions _sass/includes/_share_buttons.scss
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 1 addition & 3 deletions _sass/layouts/_posts.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@use "sass:math";

.comments {
@extend %padding-post;
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit b249031

Please sign in to comment.