From 90874b72c3f39ba5848c53fcaa44cb44d23ca7c6 Mon Sep 17 00:00:00 2001
From: Ben Kurtovic <ben.kurtovic@gmail.com>
Date: Tue, 20 Dec 2016 05:42:34 -0500
Subject: [PATCH] Fix up header styling when logged in.

---
 calefaction/__init__.py    |  1 +
 static/main.css            | 29 +++++++++++++++++++----------
 static/styles/amarr.css    |  4 ++--
 static/styles/caldari.css  |  4 ++--
 static/styles/gallente.css |  4 ++--
 static/styles/minmatar.css |  4 ++--
 templates/_base.mako       |  2 +-
 templates/_default.mako    |  8 +++++---
 8 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/calefaction/__init__.py b/calefaction/__init__.py
index 99e9ee7..630deb5 100644
--- a/calefaction/__init__.py
+++ b/calefaction/__init__.py
@@ -7,6 +7,7 @@ baseLogger = logging.getLogger("calefaction")
 del logging
 
 def enable_logging():
+    """Set up calefaction's logger to print out all logs to stderr."""
     import logging
 
     fmt = "%(asctime)s [%(levelname)s] %(name)s: %(message)s"
diff --git a/static/main.css b/static/main.css
index 1f57bbb..00ec912 100644
--- a/static/main.css
+++ b/static/main.css
@@ -48,7 +48,6 @@ main {
 }
 
 header {
-    font-size: 120%;
     border-bottom-width: 1px;
     border-bottom-style: solid;
 }
@@ -114,15 +113,6 @@ header > div > div {
     }
 }
 
-header a {
-    color: #EAEAEA;
-}
-
-header a:hover {
-    color: #BABABA;
-    text-decoration: none;
-}
-
 header .aligned {
     vertical-align: middle;
 }
@@ -132,6 +122,11 @@ header .spacer {
     visibility: hidden;
 }
 
+header nav {
+    display: inline-block;
+    margin-left: 1.5em;
+}
+
 footer ul {
     margin: 0;
     padding: 0;
@@ -151,8 +146,22 @@ footer ul li:not(:last-child):after {
     margin-right: 0.25em;
 }
 
+#corp-title {
+    font-size: 120%;
+    color: #EAEAEA;
+}
+
+#corp-title:hover {
+    color: #BABABA;
+    text-decoration: none;
+}
+
 #character-portrait {
     height: 32px;
+    margin-right: 0.25em;
+    box-sizing: border-box;
+    border-width: 1px;
+    border-style: solid;
 }
 
 #flashes {
diff --git a/static/styles/amarr.css b/static/styles/amarr.css
index f61f2fe..3b6200b 100644
--- a/static/styles/amarr.css
+++ b/static/styles/amarr.css
@@ -1,8 +1,8 @@
 body {
-    background-image: url("/static/images/amarr.jpg");
+    background-image: url("/static/images/amarr.jpg?v=1");
 }
 
-main, header, footer {
+main, header, footer, #character-portrait {
     border-color: #5F4A26;
 }
 
diff --git a/static/styles/caldari.css b/static/styles/caldari.css
index ee04f74..b9a0cf2 100644
--- a/static/styles/caldari.css
+++ b/static/styles/caldari.css
@@ -1,8 +1,8 @@
 body {
-    background-image: url("/static/images/caldari.jpg");
+    background-image: url("/static/images/caldari.jpg?v=1");
 }
 
-main, header, footer {
+main, header, footer, #character-portrait {
     border-color: #364A5F;
 }
 
diff --git a/static/styles/gallente.css b/static/styles/gallente.css
index 9900655..1ce639d 100644
--- a/static/styles/gallente.css
+++ b/static/styles/gallente.css
@@ -1,8 +1,8 @@
 body {
-    background-image: url("/static/images/gallente.jpg");
+    background-image: url("/static/images/gallente.jpg?v=1");
 }
 
-main, header, footer {
+main, header, footer, #character-portrait {
     border-color: #365F4A;
 }
 
diff --git a/static/styles/minmatar.css b/static/styles/minmatar.css
index 6af41ec..f9c7c08 100644
--- a/static/styles/minmatar.css
+++ b/static/styles/minmatar.css
@@ -1,8 +1,8 @@
 body {
-    background-image: url("/static/images/minmatar.jpg");
+    background-image: url("/static/images/minmatar.jpg?v=1");
 }
 
-main, header, footer {
+main, header, footer, #character-portrait {
     border-color: #5F3C42;
 }
 
diff --git a/templates/_base.mako b/templates/_base.mako
index 6f9a578..9528234 100644
--- a/templates/_base.mako
+++ b/templates/_base.mako
@@ -29,7 +29,7 @@
                             <a href="${url_for('index')}">
                                 <img id="corp-masthead" class="aligned" title="Home" alt="Home" src="${g.eve.image.corp(g.config.get('corp.id'), 256)}"/>
                             </a>
-                            <a href="${url_for('index')}" class="aligned">${g.config.get("corp.name") | h}</a>
+                            <a id="corp-title" class="aligned" href="${url_for('index')}">${g.config.get("corp.name") | h}</a>
                         </%block>
                     </div>
                     <div class="right">
diff --git a/templates/_default.mako b/templates/_default.mako
index 1c4cc75..031857d 100644
--- a/templates/_default.mako
+++ b/templates/_default.mako
@@ -1,13 +1,15 @@
 <%inherit file="_base.mako"/>
 <%block name="lefthead">
     ${parent.lefthead()}
-    <nav>
+    <nav class="aligned">
         Campaign: XYZ | Map | Intel | Members...
     </nav>
 </%block>
 <%block name="righthead">
     <img id="character-portrait" class="aligned" title="${g.auth.get_character_prop('name')}" alt="" src="${g.eve.image.character(g.auth.get_character_id(), 256)}"/>
-    ${g.auth.get_character_prop("name")}
-    [<a title="Log out" href="${url_for('logout')}">logout</a>]  <!-- JS switch to a POST form -->
+    <span class="aligned">
+        ${g.auth.get_character_prop("name")}
+        [<a title="Log out" href="${url_for('logout')}">logout</a>]  <!-- ... JS switch to a POST form -->
+    </span>
 </%block>
 ${next.body()}