From cb2a7a5cee50d6aafe427483c3b8e575bd91eb9a Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Mon, 11 Dec 2017 16:15:14 +0100
Subject: Add logo + link to merch store.

---
 app/assets/stylesheets/hmno_header.scss | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

(limited to 'app/assets/stylesheets/hmno_header.scss')

diff --git a/app/assets/stylesheets/hmno_header.scss b/app/assets/stylesheets/hmno_header.scss
index f35eea0..5c83a21 100644
--- a/app/assets/stylesheets/hmno_header.scss
+++ b/app/assets/stylesheets/hmno_header.scss
@@ -1,19 +1,32 @@
 @import "color_scheme";
 
 #header {
+    background: {
+        color: $header-bg;
+        image: image_url("header-metal-bg.jpg");
+        repeat: repeat-y;
+    }
+
+    height: 100px;
+    border-bottom: 1px solid $fg;
+
     #logo {
-        background: {
-            color: $header-bg;
-            image: image_url("header-metal-bg.jpg");
-            repeat: no-repeat;
+        width: 200px;
+        float: left;
+    }
+
+    #merchlink {
+        width: 200px;
+        float: right;
+        text-align: center;
+
+        img {
+            display: block;
         }
-        border-bottom: 1px solid $fg;
     }
 
     #menu {
-        position: relative;
         text-align: center;
-        top: -2em;
 
         ul {
             padding: 0;
-- 
cgit v1.2.3