From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 12 Nov 2018 18:41:40 +0000 (+0000)
Subject: Revert "wiki: Format content just like we do on the blog"
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=321c58c303220d9df3e72548e2b3f4008ec46cb1;p=ipfire.org.git

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 4e45e836..1b326cff 100644
--- 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 a8c29867..6eb9c599 100644
--- 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 42572c8f..fce41053 100644
--- 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>