Merge pull request #1362 from gollum/fix_header_layout

Move page title (h1) down. Move Home button to upper left corner on all views.

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 {

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">

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}}"

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>

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}}

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>

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">

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">