From b9f60ac5f33b39ba01799289793e653e19885f13 Mon Sep 17 00:00:00 2001
From: Benjamin Bach <benjamin@overtag.dk>
Date: Wed, 1 Apr 2020 17:11:23 +0200
Subject: [PATCH] Re-align article, breadcrumbs and navbar + fix spacing
 between edit sidebar items

---
 .../wiki/bootstrap/scss/wiki/wiki-bootstrap.scss  |  3 +--
 .../static/wiki/bootstrap/scss/wiki/wiki.scss     | 15 +++++++++++++++
 src/wiki/templates/wiki/base_site.html            |  5 ++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/wiki/static/wiki/bootstrap/scss/wiki/wiki-bootstrap.scss b/src/wiki/static/wiki/bootstrap/scss/wiki/wiki-bootstrap.scss
index de5ad5fc..083c64df 100644
--- a/src/wiki/static/wiki/bootstrap/scss/wiki/wiki-bootstrap.scss
+++ b/src/wiki/static/wiki/bootstrap/scss/wiki/wiki-bootstrap.scss
@@ -1,10 +1,9 @@
 /*!
- * This is django-wiki's LESS rules built on top of
+ * This is django-wiki's SASS rules built on top of
  * Bootstrap. Please do not modify the original Bootstrap
  * files as we try to maintain a simple and clean copy of
  * Bootstrap!!
  */
 
- // CSS Reset
 @import "../bootstrap";
 @import "wiki";
diff --git a/src/wiki/static/wiki/bootstrap/scss/wiki/wiki.scss b/src/wiki/static/wiki/bootstrap/scss/wiki/wiki.scss
index b856667a..99336ef6 100644
--- a/src/wiki/static/wiki/bootstrap/scss/wiki/wiki.scss
+++ b/src/wiki/static/wiki/bootstrap/scss/wiki/wiki.scss
@@ -196,6 +196,17 @@ h1#article-title {font-size: 2.5em; margin-top: 0;}
     font-size: $font-size-base;
 }
 
+#wiki-edit-sidebar
+{
+    .card {
+        margin-bottom: 5px;
+    }
+    .card-body
+    {
+        font-size: $font-size-base*0.8;
+    }
+}
+
 
 input[type=file] {float: none; width: auto;}
 .asteriskField { font-size: 20px; margin-left: 5px;}
@@ -237,6 +248,10 @@ input[type=file] {float: none; width: auto;}
   margin-top: 20px;
 }
 
+#article-breadcrumbs {
+    margin: 0;
+}
+
 #wiki-footer
 {
   padding: 30px 0;
diff --git a/src/wiki/templates/wiki/base_site.html b/src/wiki/templates/wiki/base_site.html
index 4e5548f2..d4f2e7a4 100644
--- a/src/wiki/templates/wiki/base_site.html
+++ b/src/wiki/templates/wiki/base_site.html
@@ -19,7 +19,8 @@
     {% block wiki_body %}
 
     {% block wiki_navbar %}
-<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
+  <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
+  <div class="container">
     {% block wiki_header_branding %}
           <a class="navbar-brand" href="{% url 'wiki:root' %}">django-\/\/ i K |</a>
     {% endblock %}
@@ -108,6 +109,8 @@
         </div>
       </form>
     </div>
+
+  </div>
   </nav>
     {% endblock %}
 
-- 
2.45.2