From 6efe93f92f7b9c03655bf8f80c8ccf41542ebf84 Mon Sep 17 00:00:00 2001 From: classicrocker883 Date: Mon, 27 Jan 2025 16:23:27 -0500 Subject: [PATCH] fix: revert, and change workflow --- .github/workflows/starter/pages-deploy.yml | 2 +- _sass/base/_syntax.scss | 18 +++++----- _sass/pages/_archives.scss | 8 ++--- _sass/pages/_categories.scss | 2 +- _sass/pages/_category-tag.scss | 4 +-- _sass/pages/_home.scss | 12 +++---- _sass/pages/_post.scss | 42 +++++++++++----------- 7 files changed, 44 insertions(+), 44 deletions(-) diff --git a/.github/workflows/starter/pages-deploy.yml b/.github/workflows/starter/pages-deploy.yml index cc28f99fd25..7076868bfa0 100644 --- a/.github/workflows/starter/pages-deploy.yml +++ b/.github/workflows/starter/pages-deploy.yml @@ -40,7 +40,7 @@ jobs: uses: actions/configure-pages@v4 - name: Setup Ruby - uses: ruby/setup-ruby@v1 + uses: ruby/setup-ruby@v1.214.0 with: ruby-version: 3.3 bundler-cache: true diff --git a/_sass/base/_syntax.scss b/_sass/base/_syntax.scss index 766ffb588de..69924fc693e 100644 --- a/_sass/base/_syntax.scss +++ b/_sass/base/_syntax.scss @@ -10,14 +10,14 @@ } .highlight { - @extend %rounded !optional; - @extend %code-snippet-bg !optional; + @extend %rounded; + @extend %code-snippet-bg; overflow: auto; padding-bottom: 0.75rem; @at-root figure#{&} { - @extend %code-snippet-bg !optional; + @extend %code-snippet-bg; } pre { @@ -93,7 +93,7 @@ code { } td.rouge-code { - @extend %code-snippet-padding !optional; + @extend %code-snippet-padding; /* Prevent some browser extends from @@ -107,8 +107,8 @@ td.rouge-code { } div[class^='language-'] { - @extend %rounded !optional; - @extend %code-snippet-bg !optional; + @extend %rounded; + @extend %code-snippet-bg; box-shadow: var(--language-border-color) 0 0 0 1px; @@ -175,7 +175,7 @@ div { } .code-header { - @extend %no-cursor !optional; + @extend %no-cursor; display: flex; justify-content: space-between; @@ -215,8 +215,8 @@ div { /* clipboard */ button { - @extend %cursor-pointer !optional; - @extend %rounded !optional; + @extend %cursor-pointer; + @extend %rounded; border: 1px solid transparent; height: v.$code-header-height; diff --git a/_sass/pages/_archives.scss b/_sass/pages/_archives.scss index 3709114421a..86e77a89b48 100644 --- a/_sass/pages/_archives.scss +++ b/_sass/pages/_archives.scss @@ -30,7 +30,7 @@ margin-left: -$timeline-width; &::before { - @extend %timeline !optional; + @extend %timeline; height: 72px; left: 79px; @@ -38,7 +38,7 @@ } &:first-child::before { - @extend %timeline !optional; + @extend %timeline; height: 32px; top: 24px; @@ -66,7 +66,7 @@ font-size: 1.1rem; line-height: 3rem; - @extend %text-ellipsis !optional; + @extend %text-ellipsis; &:nth-child(odd) { background-color: var(--main-bg, #ffffff); @@ -81,7 +81,7 @@ } &::before { - @extend %timeline !optional; + @extend %timeline; top: 0; left: 77px; diff --git a/_sass/pages/_categories.scss b/_sass/pages/_categories.scss index aa0853e1a17..64a2df500c5 100644 --- a/_sass/pages/_categories.scss +++ b/_sass/pages/_categories.scss @@ -11,7 +11,7 @@ &.card, .list-group { - @extend %rounded !optional; + @extend %rounded; } .card-header { diff --git a/_sass/pages/_category-tag.scss b/_sass/pages/_category-tag.scss index baede201772..0a827121bad 100644 --- a/_sass/pages/_category-tag.scss +++ b/_sass/pages/_category-tag.scss @@ -32,7 +32,7 @@ /* post's title */ > a { - @extend %no-bottom-border !optional; + @extend %no-bottom-border; font-size: 1.1rem; @@ -56,7 +56,7 @@ #page-tag, #access-lastmod { a:hover { - @extend %link-hover !optional; + @extend %link-hover; margin-bottom: -1px; /* Avoid jumping */ } diff --git a/_sass/pages/_home.scss b/_sass/pages/_home.scss index 639e957be66..7a4bbf9b0c8 100644 --- a/_sass/pages/_home.scss +++ b/_sass/pages/_home.scss @@ -32,10 +32,10 @@ } .preview-img { - @extend %img-radius !optional; + @extend %img-radius; img { - @extend %img-radius !optional; + @extend %img-radius; } } @@ -48,7 +48,7 @@ } .card-title { - @extend %text-clip !optional; + @extend %text-clip; color: var(--heading-color) !important; font-size: 1.25rem; @@ -76,7 +76,7 @@ } .post-meta { - @extend %muted !optional; + @extend %muted; i { &:not(:first-child) { @@ -89,7 +89,7 @@ } em { - @extend %normal-font-style !optional; + @extend %normal-font-style; color: inherit; } @@ -97,7 +97,7 @@ > div:first-child { display: block; - @extend %text-ellipsis !optional; + @extend %text-ellipsis; } } } diff --git a/_sass/pages/_post.scss b/_sass/pages/_post.scss index 16f7ee40a88..12a301f5cde 100644 --- a/_sass/pages/_post.scss +++ b/_sass/pages/_post.scss @@ -17,7 +17,7 @@ header { .post-desc { - @extend %heading !optional; + @extend %heading; font-size: 1.125rem; line-height: 1.6; @@ -30,7 +30,7 @@ header { em, time { - @extend %text-highlight !optional; + @extend %text-highlight; } em { @@ -46,7 +46,7 @@ header { } .post-tail-wrapper { - @extend %text-sm !optional; + @extend %text-sm; margin-top: 6rem; border-bottom: 1px double var(--main-border-color); @@ -55,20 +55,20 @@ header { line-height: 1.2rem; > a { - @extend %text-highlight !optional; + @extend %text-highlight; &:hover { - @extend %link-hover !optional; + @extend %link-hover; } } span:last-child { - @extend %text-sm !optional; + @extend %text-sm; } } /* .license-wrapper */ .post-meta a:not(:hover) { - @extend %link-underline !optional; + @extend %link-underline; } .share-wrapper { @@ -88,17 +88,17 @@ header { i { color: var(--btn-share-color); - @extend %icon-size !optional; + @extend %icon-size; } > * { - @extend %icon-size !optional; + @extend %icon-size; margin-left: 0.5rem; &:hover { i { - @extend %btn-share-hover !optional; + @extend %btn-share-hover; } } } @@ -108,7 +108,7 @@ header { border: none; line-height: inherit; - @extend %cursor-pointer !optional; + @extend %cursor-pointer; } } /* .share-icons */ } /* .share-wrapper */ @@ -143,9 +143,9 @@ header { .post-tag { &:hover { - @extend %link-hover !optional; - @extend %tag-hover !optional; - @extend %no-bottom-border !optional; + @extend %link-hover; + @extend %tag-hover; + @extend %no-bottom-border; } } } @@ -282,7 +282,7 @@ header { .toc-link { display: block; - @extend %text-ellipsis !optional; + @extend %text-ellipsis; &:hover { color: var(--toc-highlight); @@ -349,14 +349,14 @@ header { border-bottom: 1px solid var(--main-border-color); transition: all 0.2s ease-in-out; - @extend %btn-color !optional; + @extend %btn-color; @include bp.xl { display: none !important; } .label { - @extend %heading !optional; + @extend %heading; margin-left: 0.375rem; padding: 0 0.75rem; @@ -437,14 +437,14 @@ header { } time { - @extend %normal-font-style !optional; - @extend %text-xs !optional; + @extend %normal-font-style; + @extend %text-xs; color: var(--text-muted-color); } p { - @extend %text-ellipsis !optional; + @extend %text-ellipsis; font-size: 0.9rem; margin-bottom: 0.5rem; @@ -456,7 +456,7 @@ header { .card { h4 { - @extend %text-clip !optional; + @extend %text-clip; } } }