From 2e034e767f28a0971e69e960ef1744f0d6d7b20b Mon Sep 17 00:00:00 2001
From: Mark Griffiths <mark@thebespokepixel.com>
Date: Sun, 7 Sep 2014 17:35:19 +0100
Subject: [PATCH] Update menus for consistency

Widened 'Commands' menu + fish logo
fish logo added to FAQ menu
'Commands' menu content aligned with Docs menu
'FAQ' menu content aligned and made 1st order as all entires are long
and wrap.
---
 doc_src/commands.hdr.in |  5 +++--
 doc_src/faq.hdr         |  1 +
 doc_src/user_doc.css    | 10 +++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/doc_src/commands.hdr.in b/doc_src/commands.hdr.in
index 0ffb9d52f..f31c96e55 100644
--- a/doc_src/commands.hdr.in
+++ b/doc_src/commands.hdr.in
@@ -1,7 +1,8 @@
 /**
 \page commands Commands
 \htmlonly[block]
-<div class="fish_left_bar fish_left_little">
+<div class="fish_left_bar">
+<div class="logo"></div>
 <div class="menu commands_menu">
 \endhtmlonly
 @command_list_toc@
@@ -9,7 +10,7 @@
 \htmlonly[block]
 </div>
 </div>
-<div class="commands fish_right_bar fish_right_big">
+<div class="commands fish_right_bar">
 <h1 class="interior_title">Command reference</h1>
 \endhtmlonly
 `fish` ships with a large number of builtin commands, shellscript functions and external commands. These are all described below.
diff --git a/doc_src/faq.hdr b/doc_src/faq.hdr
index 75cbcd9aa..fbc6787d3 100644
--- a/doc_src/faq.hdr
+++ b/doc_src/faq.hdr
@@ -2,6 +2,7 @@
 \page faq Frequently asked questions
 \htmlonly[block]
 <div class="fish_left_bar">
+<div class="logo"></div>
 <div class="menu faq_menu">
 
 \endhtmlonly
diff --git a/doc_src/user_doc.css b/doc_src/user_doc.css
index 453f02002..5c041fd3d 100644
--- a/doc_src/user_doc.css
+++ b/doc_src/user_doc.css
@@ -51,14 +51,12 @@ body {
     font-family: DejaVuSansCondensed, DejaVuSans, Roboto, "Lucida Grande", Calibri, Verdana, "Helvetica Neue", Helvetica, Arial, sans-serif;
     background-color: #1f2d53;
 }
-.fish_left_little { width: 19rem; }
 .fish_right_bar {
     margin-left: 25rem;
     margin-right: 0;
     padding: 0 3rem;
     box-shadow: -0.3rem 0.3rem 1rem #000818;
 }
-.fish_right_big { margin-left: 19rem; }
 .fish_only_bar {
     width: 100%;
     padding-bottom: 3rem;
@@ -242,7 +240,7 @@ tt, code, pre, .fish {
 .docs_menu > ul ul { margin: 0.6rem 0; }
 .docs_menu > ul ul > li { margin-bottom: 0.2rem; }
 /*Tutorial*/
-
+.tutorial_menu { margin-left: 2rem; }
 /*Design*/
 .design {
     max-width: 780px;
@@ -250,10 +248,12 @@ tt, code, pre, .fish {
     padding: 0 4rem;
 }
 /*Commands*/
-.commands_menu { line-height: 2rem; }
+.commands_menu { line-height: 2rem; margin-left: 2rem; }
 /*FAQ*/
-.faq_menu { line-height: 2rem; }
+.faq_menu { line-height: 2rem; margin-top: 4rem; margin-right: 2rem;}
+.faq_menu > ul > li { position: static; }
 .faq_menu > ul li { margin-bottom: 0.6rem; }
+
 /*Licenses*/
 .license {
     max-width: 780px;