aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorHarald Eilertsen <haraldei@anduin.net>2017-12-11 16:15:14 +0100
committerHarald Eilertsen <haraldei@anduin.net>2017-12-16 13:31:30 +0100
commitcb2a7a5cee50d6aafe427483c3b8e575bd91eb9a (patch)
treed590210e3aa44a80615a3248d31081f5c1027cce /app
parent515b798b48c799df74f4132a7837faeaba141a8a (diff)
downloadhmnoweb-cb2a7a5cee50d6aafe427483c3b8e575bd91eb9a.tar.gz
hmnoweb-cb2a7a5cee50d6aafe427483c3b8e575bd91eb9a.tar.bz2
hmnoweb-cb2a7a5cee50d6aafe427483c3b8e575bd91eb9a.zip
Add logo + link to merch store.
Diffstat (limited to 'app')
-rw-r--r--app/assets/images/hypestore-logo.pngbin0 -> 13315 bytes
-rw-r--r--app/assets/stylesheets/hmno_header.scss27
-rw-r--r--app/views/refinery/_header.html.erb4
3 files changed, 24 insertions, 7 deletions
diff --git a/app/assets/images/hypestore-logo.png b/app/assets/images/hypestore-logo.png
new file mode 100644
index 0000000..26e8f4f
--- /dev/null
+++ b/app/assets/images/hypestore-logo.png
Binary files 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 %>