HTML5; style header a small bit.

9 jaren geleden · 3da26356af
--- 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;
 }
--- 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
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -9,9 +9,9 @@
 <body>
  <%= render "shared/header" %>
  </div>
  <div id="content">
  <main>
    <%= yield %>
  </div>
  </main>
  <%= render "shared/footer" %>
 </body>
 </html>
--- a/app/views/shared/_footer.html.erb
+++ b/app/views/shared/_footer.html.erb
@@ -1,4 +1,4 @@
 <div id="footer">
 <footer>
  <p>
    Copyright &copy; <%= copyright_year %> <%= AdminSetting.get('copyright') %>
    &bull;
@@ -6,4 +6,4 @@
    &bull;
    <a href="//eveonline.com">EVE Online</a> and all related trademarks are property of <a href="//ccpgames.com">CCP hf</a>.
  </p>
 </div>
 </footer>
--- a/app/views/shared/_header.html.erb
+++ b/app/views/shared/_header.html.erb
@@ -1,19 +1,15 @@
 <div id="header">
  <h1>
 <header>
  <%= link_to({controller: 'tools', action: 'index'}, {id: 'home-link'}) do %>
    <%= corp_logo_tag %>
    <%= AdminSetting.get('corp_name') %>
  </h1>
  <p>
    <%= link_to 'Home', controller: 'tools', action: 'index' %>
  </p>
  <p>
    Users:
    <span id="corp-name">
      <%= AdminSetting.get('corp_name') %>
    </span>
  <% end %>
  <span id="user-links">
    <%= link_to "Signup", controller: "users", action: "create" %>
    &bull;
    <%= link_to "Login", controller: "users", action: "login" %>
  </p>
  <p>
    Admin:
    &bull;
    <%= link_to "Admin", controller: "admin", action: "index" %>
  </p>
 </div>
  </span>
 </header>