Remove SCSS Deprecation(s)

mecha-cms · Dec 12, 2024 · 6d4c70e · 6d4c70e
1 parent b54c28f
commit 6d4c70e
Show file tree

Hide file tree

Showing 21 changed files with 127 additions and 116 deletions.
diff --git a/.factory/_/x/alert.scss b/.factory/_/x/alert.scss
diff --git a/.factory/_/x/comment.scss b/.factory/_/x/comment.scss
diff --git a/.factory/_/x/markdown.scss b/.factory/_/x/markdown.scss
diff --git a/.factory/_/x/pass.scss b/.factory/_/x/pass.scss
diff --git a/.factory/_/x/search.scss b/.factory/_/x/search.scss
diff --git a/.factory/_/x/t-o-c.scss b/.factory/_/x/t-o-c.scss
diff --git a/.factory/_/x/user.scss b/.factory/_/x/user.scss
diff --git a/.factory/_x.scss b/.factory/_x.scss
@@ -0,0 +1,7 @@
+@forward '_x/alert';
+@forward '_x/comment';
+@forward '_x/markdown';
+@forward '_x/pass';
+@forward '_x/search';
+@forward '_x/t-o-c';
+@forward '_x/user';
diff --git a/.factory/_x/alert.scss b/.factory/_x/alert.scss
@@ -0,0 +1,11 @@
+@mixin alert {
+  [role='alert'] {
+    background: rgba(0, 0, 0, 0.125);
+    border: 1px solid rgba(0, 0, 0, 0.5);
+    padding: 0.25rem 0.75rem;
+    text-align: center;
+    a {
+      text-decoration: underline;
+    }
+  }
+}
diff --git a/.factory/_x/comment.scss b/.factory/_x/comment.scss
@@ -0,0 +1,35 @@
+@mixin comment {
+  .comments,
+  .comments-body,
+  .comments-footer,
+  .form-comment {
+    margin-top: 1.15rem;
+  }
+  .comments {
+    h3,
+    h4 {
+      font-size: 125%;
+    }
+  }
+  .comment-header {
+    .comment-author {
+      color: inherit;
+      font: inherit;
+      font-weight: bold;
+      letter-spacing: 0;
+    }
+  }
+  .form-comment {
+    p {
+      input,
+      select,
+      textarea {
+        + br {
+          + small {
+            color: #777;
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/.factory/_x/markdown.scss b/.factory/_x/markdown.scss
@@ -0,0 +1,5 @@
+@mixin markdown {
+  [role='doc-endnotes'] {
+    @extend %small;
+  }
+}
diff --git a/.factory/_x/pass.scss b/.factory/_x/pass.scss
@@ -0,0 +1,7 @@
+@mixin pass {
+  form {
+    &[name='pass'] {
+      padding: 1.15rem;
+    }
+  }
+}
diff --git a/.factory/_x/search.scss b/.factory/_x/search.scss
@@ -0,0 +1,17 @@
+@mixin search {
+  search {
+    display: block;
+    input {
+      flex: 1;
+      min-width: 0;
+      + button {
+        flex: initial;
+      }
+    }
+    p {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 0.5rem;
+    }
+  }
+}
diff --git a/.factory/_x/t-o-c.scss b/.factory/_x/t-o-c.scss
@@ -0,0 +1,23 @@
+@mixin t-o-c {
+  [role='doc-toc'] {
+    [role='heading'] {
+      padding-left: 1.15rem;
+    }
+    [role='doc-pagelist'] {
+      li {
+        &::after,
+        &::before {
+          border: {
+            color: #e0ad12;
+            style: dotted;
+          }
+        }
+        &:last-child {
+          &::after {
+            background: #f6f6f6;
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/.factory/_x/user.scss b/.factory/_x/user.scss
@@ -0,0 +1,7 @@
+@mixin user {
+  form {
+    &[name='user'] {
+      padding: 1.15rem;
+    }
+  }
+}
diff --git a/.factory/index.css.scss b/.factory/index.css.scss
@@ -1,3 +1,5 @@
+@use 'x';
+
 @mixin clear() {
   clear: both;
   content: "";
@@ -550,13 +552,13 @@ textarea {
   font-weight: normal;
 }
 
-@import './_/x/alert';
-@import './_/x/comment';
-@import './_/x/markdown';
-@import './_/x/pass';
-@import './_/x/search';
-@import './_/x/t-o-c';
-@import './_/x/user';
+@include x.alert;
+@include x.comment;
+@include x.markdown;
+@include x.pass;
+@include x.search;
+@include x.t-o-c;
+@include x.user;
 
 body {
   > div {

diff --git a/about.page b/about.page
@@ -4,7 +4,7 @@ description: Sand Dollar (classic Blogger template), ported to Mecha.
 image: /lot/y/blogger-sand-dollar/index.png
 author: Taufik Nurrohman
 type: Markdown
-version: 1.0.3
+version: 1.0.4
 ...
 
 This is not a clone of the original Sand Dollar template. I didn’t make it from the original source code, but by

diff --git a/enter.php b/enter.php
@@ -3,8 +3,8 @@
   <head>
     <meta charset="utf-8">
     <meta content="width=device-width" name="viewport">
-    <?php if ($w = w($page->description ?? $site->description ?? "")): ?>
-      <meta content="<?= $w; ?>" name="description">
+    <?php if ($v = w($page->description ?? $site->description ?? "")): ?>
+      <meta content="<?= $v; ?>" name="description">
     <?php endif; ?>
     <?php if ('archive' === $page->x): ?>
       <!-- Prevent search engines from indexing pages with `archive` state -->

diff --git a/index.min.css b/index.min.css
diff --git a/index.php b/index.php
@@ -3,8 +3,8 @@
 $z = defined('TEST') && TEST ? '.' : '.min.';
 Asset::set(__DIR__ . D . 'index' . $z . 'css', 20);
 
-lot('links', new Anemone((static function ($links, $state, $url) {
-    $index = LOT . D . 'page' . D . trim(strtr($state->route, '/', D), D) . '.page';
+lot('links', $links = new Anemone((static function ($links, $state, $url) {
+    $index = LOT . D . 'page' . D . trim(strtr($state->route ?? 'index', '/', D), D) . '.page';
     $path = $url->path . '/';
     foreach (g(LOT . D . 'page', 'page') as $k => $v) {
         // Exclude home page
@@ -69,8 +69,4 @@
     Hook::set('page.content', function ($content) {
         return null !== $content ? strtr($content, ["\f" => '<hr id="next:' . $this->id . '" role="doc-pagebreak">']) : null;
     });
-}
-
-if ($skin = $state->y->{'blogger-moto'}->skin->name ?? "") {
-    State::set('[y].skin:' . $skin, true);
 }
diff --git a/state.php b/state.php