From 04523f51b73a4fd11fe0adcb3e439b86915beb71 Mon Sep 17 00:00:00 2001 From: Ben Kurtovic Date: Mon, 16 Mar 2015 21:14:48 -0500 Subject: [PATCH] Reorganize CSS, cleanup. --- app/assets/stylesheets/_header.css | 51 ++++++++++++++++++++++++++++++++++ app/assets/stylesheets/application.css | 23 --------------- app/helpers/application_helper.rb | 2 +- app/views/layouts/application.html.erb | 27 +++++++++--------- app/views/shared/_header.html.erb | 28 +++++++++---------- 5 files changed, 79 insertions(+), 52 deletions(-) create mode 100644 app/assets/stylesheets/_header.css diff --git a/app/assets/stylesheets/_header.css b/app/assets/stylesheets/_header.css new file mode 100644 index 0000000..adbeaef --- /dev/null +++ b/app/assets/stylesheets/_header.css @@ -0,0 +1,51 @@ +header { + display: table; + width: 100%; + background-color: #EEE; +} + +header #corp-banner { + display: table-cell; +} + +header #corp-banner a { + text-decoration: none; + color: black; + font-family: sans-serif; +} + +header #corp-banner img { + width: 64px; + height: 64px; + vertical-align: middle; + margin-right: 0.5em; +} + +header #corp-banner span { + font-size: 250%; + vertical-align: middle; +} + +header nav { + display: table-cell; + text-align: right; + vertical-align: middle; +} + +header nav ul { + padding-left: 0; + margin-right: 1.5em; +} + +header nav li { + display: inline; + list-style-type: none; +} + +header nav li:not(:first-child) { + padding-left: 1em; +} + +div.flash { + /**/ +} diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 6f1efff..f9cd5b3 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -13,26 +13,3 @@ *= require_tree . *= require_self */ - -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 608fc59..60c967b 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") + 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 f026a9c..67e8716 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,17 +1,16 @@ - - <%= get_title(yield(:title)) %> - <%= stylesheet_link_tag 'application', media: 'all' %> - <%= javascript_include_tag 'application' %> - <%= csrf_meta_tags %> - - - <%= render "shared/header" %> - -
- <%= yield %> -
- <%= render "shared/footer" %> - + + <%= get_title(yield(:title)) %> + <%= stylesheet_link_tag 'application', media: 'all' %> + <%= javascript_include_tag 'application' %> + <%= csrf_meta_tags %> + + + <%= render "shared/header" %> +
+ <%= yield %> +
+ <%= render "shared/footer" %> + diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb index 57c7e5e..426e1a7 100644 --- a/app/views/shared/_header.html.erb +++ b/app/views/shared/_header.html.erb @@ -1,18 +1,18 @@
- <%= link_to(root_url, id: 'home-link') do %> - <%= corp_logo_tag %> - - <%= AdminSetting.get(:corp_name) %> - - <% end %> - - <%= link_to 'Signup', controller: 'users', action: 'signup' %> - • - <%= link_to 'Login', controller: 'users', action: 'login' %> - • - <%= link_to 'Admin', controller: 'admin', action: 'index' %> - +
+ <%= link_to(root_url) do %> + <%= corp_logo_tag %> + <%= AdminSetting.get(:corp_name) %> + <% end %> +
+
<% flash.each do |name, msg| %> -
FLASH: <%= name %>: <%= msg %>
+
<%= name %>: <%= msg %>
<% end %>