From 3da26356afacda1a5868e73c2abed6c1c0b76926 Mon Sep 17 00:00:00 2001 From: Ben Kurtovic Date: Fri, 13 Mar 2015 13:52:59 -0500 Subject: [PATCH] HTML5; style header a small bit. --- app/assets/stylesheets/application.css | 22 ++++++++++++++++++++-- app/helpers/application_helper.rb | 2 +- app/views/layouts/application.html.erb | 4 ++-- app/views/shared/_footer.html.erb | 4 ++-- app/views/shared/_header.html.erb | 24 ++++++++++-------------- 5 files changed, 35 insertions(+), 21 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 657a180..6f1efff 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -14,7 +14,25 @@ *= require_self */ -img#corp_logo { - width: 64px; +header #home-link { + text-decoration: none; + color: black; + font-family: sans-serif; +} + +header #corp-logo { + width: 64px; height: 64px; + vertical-align: middle; + margin-right: 0.5em; +} + +header #corp-name { + font-size: 250%; + vertical-align: middle; +} + +header #user-links { + float: right; + margin: 0.5em; } diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c8700c9..5d0da96 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -11,7 +11,7 @@ module ApplicationHelper corp_id = AdminSetting.get('corp_id') corp_name = AdminSetting.get('corp_name') image_tag("https://image.eveonline.com/Corporation/#{corp_id}_256.png", - id: 'corp_logo', title: corp_name, alt: "#{corp_name} Logo") + id: 'corp-logo', title: corp_name, alt: "#{corp_name} Logo") end def copyright_year diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 124cc94..f026a9c 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,9 +9,9 @@ <%= render "shared/header" %> -
+
<%= yield %> -
+ <%= render "shared/footer" %> diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb index f28bc22..a3281e1 100644 --- a/app/views/shared/_footer.html.erb +++ b/app/views/shared/_footer.html.erb @@ -1,4 +1,4 @@ - + diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb index 49c08c3..94b0c84 100644 --- a/app/views/shared/_header.html.erb +++ b/app/views/shared/_header.html.erb @@ -1,19 +1,15 @@ - + +