From 6c1c6289ff5d253fd0b95850853b2496cced4439 Mon Sep 17 00:00:00 2001
From: Leilukin <contact@leilukin.com>
Date: Thu, 6 Jun 2024 19:22:08 +0800
Subject: [PATCH] Remove article class

---
 src/_includes/global/content.njk | 14 +++++---------
 src/assets/css/content.css       | 16 ++++------------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/src/_includes/global/content.njk b/src/_includes/global/content.njk
index 367f48fa..14b032df 100644
--- a/src/_includes/global/content.njk
+++ b/src/_includes/global/content.njk
@@ -39,15 +39,11 @@
         {% include "global/toc.njk" %}
     {% endif %}
 
-    {% if isArticle or isStatement %}
-        <article class="article">
-            {{ content | safe }}
-        </article>
-    {% else %}
-		<div class="content{{' content--divided' if isContentDivided }}">
-			{{ content | safe }}
-		</div>
-    {% endif %}
+    {% set contentEl = "article" if isArticle or isStatement else "div" %}
+
+    <{{contentEl}} class="content{{' content--divided' if isContentDivided }}">
+        {{ content | safe }}
+    </{{contentEl}}>
 
     {% if
         tags and tags.includes("articles")
diff --git a/src/assets/css/content.css b/src/assets/css/content.css
index 9abd4ad0..07f0fe5d 100644
--- a/src/assets/css/content.css
+++ b/src/assets/css/content.css
@@ -13,7 +13,6 @@
     justify-self: center;
 }
 
-.article,
 .content:not(.content--divided),
 .content__section {
     padding: 1.5rem var(--sz-main-padding);
@@ -25,7 +24,6 @@
     display: grid;
 }
 
-.article,
 .content:not(.content--divided),
 .content__section {
     background-color: var(--clr-content-bg);
@@ -38,25 +36,20 @@
 }
 
 .content > * + .h2,
-.content__section > * + .h2,
-.article > * + .h2 {
+.content__section > * + .h2 {
     margin-top: 2em;
 }
 
 .content > * + :not([class]),
-.content__section > * + :not([class]),
-.article > * + :not([class]) {
+.content__section > * + :not([class]) {
     margin-top: var(--sz-paragraph-margin);
 }
 
-.article ul:not([class]), .article ol:not([class]),
 .content ul:not([class]), .content ol:not([class]) {
     display: grid;
     gap: 0.7em;
 }
 
-.article ul ul, .article ol ol,
-.article ul ol, .article ol ul,
 .content ul ul, .content ol ol,
 .content ul ol, .content ol ul {
     margin-top: 0.7em;
@@ -71,13 +64,12 @@
 @media only screen and (min-width: 60rem) {
     .content__wrapper {
         padding: 0 var(--sz-main-padding);
-        grid-template-areas: 'leftbar article rightbar';
+        grid-template-areas: 'leftbar content rightbar';
         grid-template-columns: minmax(0, 20%) minmax(0, 2.5fr) minmax(0, 20%);
     }
 
-    .article,
     .content {
-        grid-area: article;
+        grid-area: content;
     }
 
     .left-sidebar {