Revert "wiki: Format content just like we do on the blog"

This reverts commit 54fe9647c21042a6dcf4e7e8075fa2aab419c9f0.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/scss/style.scss b/src/scss/style.scss
index 4e45e83694d7bfee08f26cd9fb448ad1655d91ed..1b326cff97a56414403879080a0acf7aafd4afc5 100644 (file)
--- a/src/scss/style.scss
+++ b/src/scss/style.scss
@@ -187,8 +187,8 @@ section {
        }
 }
 
-.user-content {
-       .user-content-header {
+.blog-post {
+       .blog-header {
                h4 {
                        margin-bottom: 0;
 
@@ -198,7 +198,7 @@ section {
                }
        }
 
-       .user-content-body {
+       .blog-content {
                h1, h2, h3, h4, h5, h6 {
                        font-size: 1.375rem;
                        font-weight: $headings-font-weight;
@@ -220,7 +220,7 @@ section {
        }
 
        &.lightning-wire-labs {
-               .user-content-header {
+               .blog-header {
                        h5 {
                                a {
                                        color: $lwl;
@@ -232,7 +232,7 @@ section {
                        }
                }
 
-               .user-content-body {
+               .blog-content {
                        a {
                                color: $lwl;
                        }

diff --git a/src/templates/blog/modules/post.html b/src/templates/blog/modules/post.html
index a8c29867c5ba981bdc250b6ecc14ad3b242bee4e..6eb9c599555ebe3140efbb4471a3f0be7c554be1 100644 (file)
--- a/src/templates/blog/modules/post.html
+++ b/src/templates/blog/modules/post.html
@@ -1,7 +1,7 @@
 {% import ipfire.accounts as accounts %}
 
-<div class="user-content {% if "lightningwirelabs.com" in post.tags %}lightning-wire-labs{% end %}">
-       <div class="user-content-header">
+<div class="blog-post {% if "lightningwirelabs.com" in post.tags %}lightning-wire-labs{% end %}">
+       <div class="blog-header">
                <h4 class="card-title">
                        <a href="https://blog.ipfire.org/post/{{ post.slug }}">
                                {{ post.title }}
@@ -48,7 +48,7 @@
                </div>
        {% end %}
 
-       <div class="user-content-body">
+       <div class="blog-content">
                {% raw post.html %}
        </div>
 

diff --git a/src/templates/wiki/page.html b/src/templates/wiki/page.html
index 42572c8f9666951339e2886e6c171f7183769ffe..fce410537ddb2030fced7a067f126b68121f79f7 100644 (file)
--- a/src/templates/wiki/page.html
+++ b/src/templates/wiki/page.html
@@ -4,11 +4,7 @@
 
 {% block sidebar %}
        {% if page.sidebar %}
-               <div class="user-content">
-                       <div class="user-content-body">
-                               {% raw page.sidebar.html %}
-                       </div>
-               </div>
+               {% raw page.sidebar.html %}
        {% end %}
 {% end block %}
 
@@ -19,11 +15,7 @@
 
        <div class="card mb-3">
                <div class="card-body">
-                       <div class="user-content">
-                               <div class="user-content-body">
-                                       {% raw page.html %}
-                               </div>
-                       </div>
+                       {% raw page.html %}
                </div>
        </div>