Merge pull request #475 from sylhare/revert-471-sass-update

Revert "Fix sass warning"
sylhare · Nov 26, 2024 · c96a8a2 · c96a8a2
2 parents e36689f + 8b95cce
commit c96a8a2
Show file tree

Hide file tree

Showing 38 changed files with 961 additions and 1,032 deletions.
diff --git a/_includes/blog/post_nav.liquid b/_includes/blog/post_nav.liquid
@@ -2,7 +2,7 @@
     {% if page.next.url %}
     <div id="previous-post">
         <a alt="{{ page.next.title }}" href="{{ page.next.url | relative_url | default: 'none' }}">
-            <p class="meta">{{ site.data.language.str_previous_post | default: "Previous post" }}</p>
+            <p>{{ site.data.language.str_previous_post | default: "Previous post" }}</p>
             {{ page.next.title }}
         </a>
     </div>
@@ -11,7 +11,7 @@
     {% if page.previous.url %}
     <div id="next-post">
         <a alt="{{ page.previous.title }}" href="{{ page.previous.url | relative_url | default: 'none' }}">
-            <p class="meta">{{ site.data.language.str_next_post | default: "Next post"}}</p>
+            <p>{{ site.data.language.str_next_post | default: "Next post"}}</p>
             {{ page.previous.title }}
         </a>
     </div>

diff --git a/_sass/base/_global.scss b/_sass/base/_global.scss
@@ -1,5 +1,3 @@
-@use 'variables' as *;
-
 * {
   margin: 0;
   padding: 0;
@@ -283,50 +281,4 @@ details {
     padding-top: 2em;
     max-width: 100%;
   }
-}
-
-// Buttons
-.button {
-  border-radius: 0.3em;
-  border: 1px solid;
-  display: inline-block;
-  margin: 1em 0;
-  padding: 0.5em 0.75em;
-}
-
-a.button {
-  @extend .button-link;
-}
-
-.button-link {
-  &:hover {
-    background: var(--link);
-    border: 1px solid var(--link);
-    color: var(--background);
-    text-decoration: none;
-    filter: none;
-  }
-}
-
-
-
-.post-link {
-  &:hover {
-    text-decoration: none;
-    color: var(--link);
-  }
-}
-
-// States
-.disabled {
-  opacity: 0.7;
-}
-
-// Custom
-.text-center {
-  text-align: center;
-}
-
-.right {
-  float: right;
-}
+}
diff --git a/_sass/base/_highlight.scss b/_sass/base/_highlight.scss
@@ -1,7 +1,6 @@
 // ==========================================================================
 //   Syntax highlighting
 // ==========================================================================
-@use 'variables' as *;
 
 div.highlighter-rouge,
 figure.highlight,

diff --git a/_sass/base/_utility.scss b/_sass/base/_utility.scss
@@ -1,5 +1,3 @@
-@use 'variables' as *;
-
 // Mix-ins
 %padding-nav {
   padding: $padding-small $padding-x-large;
@@ -43,18 +41,61 @@
   }
 }
 
-
-%txt-shadow {
+.txt-shadow {
   text-shadow: 0.07em 0.10em 0.15em var(--text-shadow);
 }
 
-%subtle-txt-shadow {
+.subtle-txt-shadow {
   text-shadow: 1px 1px 2px var(--text-shadow);
 }
 
-%body-link {
+// Buttons
+.button {
+  border-radius: 0.3em;
+  border: 1px solid;
+  display: inline-block;
+  margin: 1em 0;
+  padding: 0.5em 0.75em;
+}
+
+a.button {
+  @extend .button-link;
+}
+
+.button-link {
+  &:hover {
+    background: var(--link);
+    border: 1px solid var(--link);
+    color: var(--background);
+    text-decoration: none;
+    filter: none;
+  }
+}
+
+.body-link {
   &:hover {
     text-decoration: underline;
     filter: brightness(0.85);
   }
-}
+}
+
+.post-link {
+  &:hover {
+    text-decoration: none;
+    color: var(--link);
+  }
+}
+
+// States
+.disabled {
+  opacity: 0.7;
+}
+
+// Custom
+.text-center {
+  text-align: center;
+}
+
+.right {
+  float: right;
+}
diff --git a/_sass/external/_font-awesome.scss b/_sass/external/_font-awesome.scss
@@ -2,14 +2,11 @@
  * Type-on-strap Font Awesome kit v6.7.1
  * Find the version and license of the included Font Awesome here: _sass/external/font-awesome/fontawesome.scss
  */
-$fa-font-path: "../fonts/font-awesome" !default;
 $fa-inverse: var(--background);
+$fa-font-path: "../fonts/font-awesome" !default;
 
-@use 'font-awesome/fontawesome' with (
-  $fa-font-path: $fa-font-path,
-  $fa-inverse: $fa-inverse
-);
-@use 'font-awesome/brands';
-@use 'font-awesome/regular';
-@use 'font-awesome/solid';
-@use 'font-awesome/v4-shims';
+@import 'font-awesome/fontawesome';
+@import 'font-awesome/brands';
+@import 'font-awesome/regular';
+@import 'font-awesome/solid';
+@import 'font-awesome/v4-shims';
diff --git a/_sass/external/_katex.scss b/_sass/external/_katex.scss
@@ -4,10 +4,9 @@
  */
 
 @use "katex/katex";
-@use '../base/variables';
 
 .katex-display {
-  @media screen and (max-width: variables.$sm-break) {
+  @media screen and (max-width: $sm-break) {
     overflow-x: auto;
   }
   & {