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/images/hypestore-logo.png | Bin 0 -> 13315 bytes
app/assets/stylesheets/hmno_header.scss | 27 ++++++++++++++++++++-------
app/views/refinery/_header.html.erb | 4 ++++
3 files changed, 24 insertions(+), 7 deletions(-)
create mode 100644 app/assets/images/hypestore-logo.png
(limited to 'app')
diff --git a/app/assets/images/hypestore-logo.png b/app/assets/images/hypestore-logo.png
new file mode 100644
index 0000000..26e8f4f
Binary files /dev/null and b/app/assets/images/hypestore-logo.png differ
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;
diff --git a/app/views/refinery/_header.html.erb b/app/views/refinery/_header.html.erb
index 8b0c424..7215e57 100644
--- a/app/views/refinery/_header.html.erb
+++ b/app/views/refinery/_header.html.erb
@@ -1,4 +1,8 @@
<div id='logo'>
<%= link_to image_tag("logo.png", :alt => "Heavymetal.no"), refinery.root_path %>
</div>
+<div id="merchlink">
+ <%= link_to image_tag("hypestore-logo.png", alt: "Hypestore", size: '197x75'), 'https://hypestore.no/collections/artistmerch-1' %>
+ <%= link_to "HMNO Merch!", 'https://hypestore.no/collections/artistmerch-1' %>
+</div>
<%= Refinery::Pages::MenuPresenter.new(refinery_menu_pages, self).to_html %>
--
cgit v1.2.3
From e48585aa7e6070e9a103c29d853b0e8c9a38d23d Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Sat, 16 Dec 2017 13:32:02 +0100
Subject: Fixup page header.
Changes menu bckground and font size, and adds a bit of space below header.
---
app/assets/stylesheets/_color_scheme.scss | 10 +++++-----
app/assets/stylesheets/hmno_header.scss | 9 +++++++++
2 files changed, 14 insertions(+), 5 deletions(-)
(limited to 'app')
diff --git a/app/assets/stylesheets/_color_scheme.scss b/app/assets/stylesheets/_color_scheme.scss
index 63e3058..c64d2bf 100644
--- a/app/assets/stylesheets/_color_scheme.scss
+++ b/app/assets/stylesheets/_color_scheme.scss
@@ -19,11 +19,11 @@ $link-fg: $primary-5; //lighten($primary-4, 5%);
$link-visited-fg: $link-fg;
$link-hover-fg: lighten($link-fg, 5%);
-$selected-menu-bg: $primary-4;
-$selected-menu-fg: $primary-2;
-$hover-menu-bg: $selected-menu-bg;
-$hover-menu-fg: $selected-menu-fg;
-$menu-bg: $primary-1;
+$hover-menu-bg: $primary-4;
+$hover-menu-fg: $primary-2;
+$selected-menu-bg: darken($hover-menu-bg, 10%);
+$selected-menu-fg: $hover-menu-fg;
+$menu-bg: rgba(0,0,0,0.4);
$menu-fg: $primary-5;
$header-bg: black;
diff --git a/app/assets/stylesheets/hmno_header.scss b/app/assets/stylesheets/hmno_header.scss
index 5c83a21..8d822c0 100644
--- a/app/assets/stylesheets/hmno_header.scss
+++ b/app/assets/stylesheets/hmno_header.scss
@@ -9,6 +9,7 @@
height: 100px;
border-bottom: 1px solid $fg;
+ margin-bottom: $spacing;
#logo {
width: 200px;
@@ -22,11 +23,19 @@
img {
display: block;
+ margin-top: 0;
+ }
+
+ a {
+ color: #ddf;
+ font-weight: bold;
}
}
#menu {
text-align: center;
+ font-size: 120%;
+ font-weight: bold;
ul {
padding: 0;
--
cgit v1.2.3