cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Eliminate HTML5 elements"

Browse source 
This led to a huge mess of conflicting CSS rule priorities.

This reverts commit 9fc8bc9368.
This commit is contained in:
John Firebaugh 2013-11-15 10:32:14 -08:00
parent 518a51712c
commit d920d94f69
6 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

40
app/views/layouts/_header.html.erb
View file

@ -1,4 +1,4 @@
<div id="header" class="closed">
<header class="closed">
<h1>
<a href="<%= root_path %>" class="geolink">
<%= image_tag "osm_logo.png", :alt => t('layouts.logo.alt_text'), :class => 'logo' %>
@ -6,7 +6,7 @@
</a>
</h1>
<a href="#" id="menu-icon"></a>
<div class='nav primary'>
<nav class='primary'>
<%= content_for :header %>
<ul>
<li id="edit_tab" class="dropdown <%= current_page_class(edit_path) %>">
@ -32,23 +32,23 @@
<%= link_to t('layouts.export'), export_path, :class => 'tab geolink' %>
</li>
</ul>
</div>
<div class='nav secondary'>
<ul class="compact-hide">
<li class="<%= current_page_class(traces_path) %>"><%= link_to t('layouts.gps_traces'), traces_path %></li>
<li class="<%= current_page_class(diary_path) %>"><%= link_to t('layouts.user_diaries'), diary_path %></li>
<li class="<%= current_page_class(help_path) %>"><%= link_to t('layouts.help'), help_path %></li>
<li class="<%= current_page_class(about_path) %>"><%= link_to t('layouts.about'), about_path %></li>
</nav>
<nav class='secondary'>
<ul>
<li class="compact-hide <%= current_page_class(traces_path) %>"><%= link_to t('layouts.gps_traces'), traces_path %></li>
<li class="compact-hide <%= current_page_class(diary_path) %>"><%= link_to t('layouts.user_diaries'), diary_path %></li>
<li class="compact-hide <%= current_page_class(help_path) %>"><%= link_to t('layouts.help'), help_path %></li>
<li class="compact-hide <%= current_page_class(about_path) %>"><%= link_to t('layouts.about'), about_path %></li>
<li id="compact-secondary-nav" class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">More <b class="caret"></b></a>
<ul class="dropdown-menu">
<li class="<%= current_page_class(traces_path) %>"><%= link_to t('layouts.gps_traces'), traces_path %></li>
<li class="<%= current_page_class(diary_path) %>"><%= link_to t('layouts.user_diaries'), diary_path %></li>
<li class="<%= current_page_class(help_path) %>"><%= link_to t('layouts.help'), help_path %></li>
<li class="<%= current_page_class(about_path) %>"><%= link_to t('layouts.about'), about_path %></li>
</ul>
</li>
</ul>
<div id="compact-secondary-nav" class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">More <b class="caret"></b></a>
<ul class="dropdown-menu">
<li class="<%= current_page_class(traces_path) %>"><%= link_to t('layouts.gps_traces'), traces_path %></li>
<li class="<%= current_page_class(diary_path) %>"><%= link_to t('layouts.user_diaries'), diary_path %></li>
<li class="<%= current_page_class(help_path) %>"><%= link_to t('layouts.help'), help_path %></li>
<li class="<%= current_page_class(about_path) %>"><%= link_to t('layouts.about'), about_path %></li>
</ul>
</div>
<% if @user %>
<div class='dropdown user-menu logged-in'>
<a class='dropdown-toggle' data-toggle='dropdown' href="#">
@ -85,5 +85,5 @@
<li><%= link_to t('layouts.sign_up'), user_new_path %></li>
</ul>
<% end %>
</div>
</div>
</nav>
</header>