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.

Sign up for GitHub

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

Update sass fix to work with github-pages deprecated sass converter #415

Merged
merged 2 commits into from
Dec 6, 2023
Merged

Update sass fix to work with github-pages deprecated sass converter #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e799b1d
Remove problematic sass
sylhare Dec 6, 2023
679069a
Update jekyll build workflow
sylhare Dec 6, 2023
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
26 changes: 15 additions & 11 deletions .github/workflows/jekyll-build.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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