From fd4b11fe381996769ea6b0a9c834367a64b62166 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul@snyman.info>
Date: Sun, 7 Nov 2021 09:09:08 -0700
Subject: [PATCH] Fix up a couple of small styling issues and things

---
 libertywiki/templates/base.html                |  4 ++--
 libertywiki/templates/edit.html                | 10 ++++++++--
 libertywiki/templates/security/login_user.html |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/libertywiki/templates/base.html b/libertywiki/templates/base.html
index ad55ac0..381807b 100644
--- a/libertywiki/templates/base.html
+++ b/libertywiki/templates/base.html
@@ -16,10 +16,10 @@
     <nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
       <div class="container">
         <a class="navbar-brand d-flex" href="/">Wiki</a>
-        <form class="d-flex">
+        <!-- form class="d-flex">
           <input class="form-control me-2" type="search" placeholder="Search" aria-label="Search">
           <button class="btn btn-outline-light" type="submit">Search</button>
-        </form>
+        </form -->
         <ul class="navbar-nav">
         {% if current_user.is_authenticated %}
           <li class="nav-item dropdown">
diff --git a/libertywiki/templates/edit.html b/libertywiki/templates/edit.html
index 97e5c0d..5bcc657 100644
--- a/libertywiki/templates/edit.html
+++ b/libertywiki/templates/edit.html
@@ -13,7 +13,7 @@
       <div><div><div id="editor"><div></div></div>
       <div id="page-body-help" class="form-text">The content of the page, in reStructuredText</div>
     </div>
-    <div class="mb-3">
+    <div class="mt-3">
       <button type="submit" class="btn btn-primary">Save</button>
     </div>
   </form>
@@ -28,7 +28,13 @@
 </style>
 <script src="/static/js/ace/ace.js"></script>
 <script>
-  var editor = ace.edit("editor", {mode: "ace/mode/rst", showPrintMargin: false, useSoftTabs: true});
+  var editor = ace.edit("editor", {
+    fontSize: "10pt",
+    fontFamily: "monospace",
+    mode: "ace/mode/rst",
+    showPrintMargin: false,
+    useSoftTabs: true
+  });
   editor.setValue(document.getElementById("page-body").value, -1);
   editor.on('change', function() {
     document.getElementById("page-body").value = editor.getSession().getValue();
diff --git a/libertywiki/templates/security/login_user.html b/libertywiki/templates/security/login_user.html
index ce7e338..9813632 100644
--- a/libertywiki/templates/security/login_user.html
+++ b/libertywiki/templates/security/login_user.html
@@ -1,4 +1,4 @@
-{% extends 'admin/master.html' %}
+{% extends 'admin/my_master.html' %}
 {% from "security/_macros.html" import render_field, render_field_with_errors, render_checkbox_field %}
 {% include "security/_messages.html" %}
 {% block body %}