From fb5c65827d4b4a8cf7622d814d6d8eaf727eecc6 Mon Sep 17 00:00:00 2001
From: Bart Kamphorst <bart@kamphorst.com>
Date: Sun, 30 Dec 2018 19:09:52 +0100
Subject: [PATCH] Move page title (h1) down. Move Home button to upper left
 corner on all views.

---
 lib/gollum/public/gollum/stylesheets/gollum.scss | 9 +++++++--
 lib/gollum/templates/create.mustache             | 4 ++++
 lib/gollum/templates/edit.mustache               | 2 ++
 lib/gollum/templates/history.mustache            | 2 ++
 lib/gollum/templates/page.mustache               | 4 ++--
 lib/gollum/templates/pages.mustache              | 4 ++--
 lib/gollum/templates/search.mustache             | 5 +++--
 lib/gollum/templates/searchbar.mustache          | 2 +-
 8 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/lib/gollum/public/gollum/stylesheets/gollum.scss b/lib/gollum/public/gollum/stylesheets/gollum.scss
index d2358015..c8d8a8c4 100644
--- a/lib/gollum/public/gollum/stylesheets/gollum.scss
+++ b/lib/gollum/public/gollum/stylesheets/gollum.scss
@@ -46,6 +46,7 @@ a {
     float: left;
     line-height: normal;
     margin: 0;
+    margin-top: 2em;
     padding: 0 0 0 0.667em;
 
     @include desktop-breakpoint {
@@ -57,6 +58,7 @@ a {
   ul.actions {
     clear: both;
     margin: 0 1em;
+    position: absolute;
 
     @include desktop-breakpoint {
       clear: none;
@@ -505,18 +507,21 @@ ul.actions {
    list-style-type: none;
    overflow: hidden;
    padding: 0;
+   width: $layout-body-width;
 
   li {
-    float: left;
     font-size: 0.9em;
     margin-left: 1px;
     margin-bottom: 1px;
+    float: left;
 
     @include desktop-breakpoint {
       margin-left: 0.6em;
       margin-bottom: 0.6em;
     }
+  
   }
+  
 }
 
 .minibutton a {
@@ -576,7 +581,7 @@ ul.actions {
 
 /* @control searchbar */
 #searchbar {
-  float: right;
+  float: none;
   overflow: hidden;
 
   @include desktop-breakpoint {
diff --git a/lib/gollum/templates/create.mustache b/lib/gollum/templates/create.mustache
index a6a805dd..c444b0d7 100644
--- a/lib/gollum/templates/create.mustache
+++ b/lib/gollum/templates/create.mustache
@@ -1,6 +1,10 @@
 <div id="wiki-wrapper" class="create">
 <div id="head">
   <h1>Create New Page</h1>
+	<ul class="actions">
+		<li class="minibutton"><a href="{{base_url}}/"
+       class="action-home-page">Home</a></li>
+	</ul>
 </div>
 <div id="wiki-content" class="create edit">
   <div class="has-sidebar">
diff --git a/lib/gollum/templates/edit.mustache b/lib/gollum/templates/edit.mustache
index 7aa93ecc..c4a573dc 100644
--- a/lib/gollum/templates/edit.mustache
+++ b/lib/gollum/templates/edit.mustache
@@ -2,6 +2,8 @@
 <div id="head">
   <h1>Editing <strong>{{title}}</strong></h1>
   <ul class="actions">
+		<li class="minibutton"><a href="{{base_url}}/"
+       class="action-home-page">Home</a></li>
     <li class="minibutton"><a href="{{base_url}}/{{escaped_url_path}}"
        class="action-view-page">View Page</a></li>
      <li class="minibutton"><a href="{{history_path}}/{{escaped_url_path}}"
diff --git a/lib/gollum/templates/history.mustache b/lib/gollum/templates/history.mustache
index 15c3feb8..16c0fe8c 100644
--- a/lib/gollum/templates/history.mustache
+++ b/lib/gollum/templates/history.mustache
@@ -2,6 +2,8 @@
 <div id="head">
   <h1>History for <strong>{{title}}</strong></h1>
   <ul class="actions">
+		<li class="minibutton"><a href="{{base_url}}/"
+       class="action-home-page">Home</a></li>
     <li class="minibutton">
       {{>searchbar}}
     </li>
diff --git a/lib/gollum/templates/page.mustache b/lib/gollum/templates/page.mustache
index a1d33733..8555ea61 100644
--- a/lib/gollum/templates/page.mustache
+++ b/lib/gollum/templates/page.mustache
@@ -9,11 +9,11 @@ Mousetrap.bind(['e'], function( e ) {
 <div id="head">
   <h1>{{page_header}}</h1>
   <ul class="actions">
+		<li class="minibutton"><a href="{{base_url}}/"
+       class="action-home-page">Home</a></li>
     <li class="minibutton">
       {{>searchbar}}
     </li>
-    <li class="minibutton"><a href="{{base_url}}/"
-       class="action-home-page">Home</a></li>
     <li class="minibutton"><a href="{{pages_path}}"
       class="action-all-pages">Overview</a></li>
     {{#allow_editing}}
diff --git a/lib/gollum/templates/pages.mustache b/lib/gollum/templates/pages.mustache
index 7efc3dbe..7cfde7a4 100644
--- a/lib/gollum/templates/pages.mustache
+++ b/lib/gollum/templates/pages.mustache
@@ -2,11 +2,11 @@
 <div id="head" style="border:none;">
   <h1>{{title}}</h1>
   <ul class="actions">
+	  <li class="minibutton"><a href="{{base_url}}/"
+       class="action-home-page">Home</a></li>
     <li class="minibutton">
       {{>searchbar}}
     </li>
-    <li class="minibutton"><a href="{{base_url}}/"
-       class="action-home-page">Home</a></li>
     {{#allow_editing}}
       <li class="minibutton jaws">
       <a href="#" id="minibutton-new-page">New</a></li>
diff --git a/lib/gollum/templates/search.mustache b/lib/gollum/templates/search.mustache
index fdae8774..52d45aae 100644
--- a/lib/gollum/templates/search.mustache
+++ b/lib/gollum/templates/search.mustache
@@ -2,11 +2,12 @@
 <div id="head">
   <h1>Search Results for <strong>{{query}}</strong></h1>
   <ul class="actions">
+	  <li class="minibutton"><a href="{{base_url}}/"
+       class="action-home-page">Home</a></li>
     <li class="minibutton">
       {{>searchbar}}
     </li>
-    <li class="minibutton"><a href="{{base_url}}/"
-       class="action-home-page">Home</a></li>
+
   </ul>
 </div>
 <div id="results">
diff --git a/lib/gollum/templates/searchbar.mustache b/lib/gollum/templates/searchbar.mustache
index 48b428b5..794cad03 100644
--- a/lib/gollum/templates/searchbar.mustache
+++ b/lib/gollum/templates/searchbar.mustache
@@ -1,5 +1,5 @@
 <div id="searchbar">
-  <form action="{{search_path}}" method="get" id="search-form">
+  <form class="search-form" action="{{search_path}}" method="get" id="search-form">
   <div id="searchbar-fauxtext">
     <input type="text" name="q" id="search-query" value="Search&hellip;" autocomplete="off">
     <a href="#" id="search-submit" title="Search this wiki">