aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/assets/images/logo.pngbin6289 -> 35625 bytes
-rw-r--r--app/assets/stylesheets/hmno_header.scss13
-rw-r--r--app/views/refinery/_header.html.erb4
3 files changed, 12 insertions, 5 deletions
diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png
index 8849010..184a5f1 100644
--- a/app/assets/images/logo.png
+++ b/app/assets/images/logo.png
Binary files differ
diff --git a/app/assets/stylesheets/hmno_header.scss b/app/assets/stylesheets/hmno_header.scss
index 32e2760..772b7d4 100644
--- a/app/assets/stylesheets/hmno_header.scss
+++ b/app/assets/stylesheets/hmno_header.scss
@@ -24,21 +24,28 @@
repeat: repeat-y;
}
- height: 100px;
+ height: 110px;
border-bottom: 1px solid $fg;
margin-bottom: $spacing;
+ padding-top: $spacing;
#logo {
flex: 0 0 200px;
}
#merchlink {
- flex: 0 0 200px;
+ flex: 0 0 90px;
text-align: center;
img {
display: block;
- margin-top: 0;
+ text-align: center;
+ background-color: #fff8;
+ padding: 0.2rem;
+
+ &:hover {
+ background-color: #fffc;
+ }
}
a {
diff --git a/app/views/refinery/_header.html.erb b/app/views/refinery/_header.html.erb
index 5b28f3e..92b6e3e 100644
--- a/app/views/refinery/_header.html.erb
+++ b/app/views/refinery/_header.html.erb
@@ -15,13 +15,13 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
%>
<div id='logo'>
- <%= link_to image_tag("logo.png", :alt => "Heavymetal.no"), refinery.root_path %>
+ <%= link_to image_tag("logo.png", :alt => "Heavymetal.no", size: '200x100'), refinery.root_path %>
</div>
<div id="menu-area">
<%= render "common/search" %>
<%= Refinery::Pages::MenuPresenter.new(refinery_menu_pages, self).to_html %>
</div>
<div id="merchlink">
- <%= link_to image_tag("d2-shop-logo.png", alt: "D2 Shop logo", size: '197x75'), 'https://d2shop.no/product-category/hmno/' %>
+ <%= link_to image_tag("d2-shop-logo.png", alt: "D2 Shop logo", size: '75x75'), 'https://d2shop.no/product-category/hmno/' %>
<%= link_to "HMNO Merch!", 'https://d2shop.no/product-category/hmno/' %>
</div>