opacity: 0.6;
}
-header {
+#header {
height: $headerHeight;
position: relative;
z-index: 1001;
font-size: 13px;
- h1, nav, nav > ul, nav > ul > li, .dropdown {
+ h1, .nav, .nav > ul, .nav > ul > li, .user-menu {
display: inline-block;
}
padding: $lineheight/2;
}
- h1, nav.primary {
+ h1, .nav.primary {
float: left;
}
}
}
-nav.primary {
+.nav.primary {
> ul {
$border: 1px solid $green;
}
}
-nav.secondary {
+.nav.secondary {
position: absolute;
right: 0;
- > ul {
+ > ul,
+ > #compact-secondary-nav {
vertical-align: middle;
a, .dropdown-toggle {
display: inline-block;
display: inline-block;
}
.compact-hide {
- display: none;
+ display: none !important;
}
}
/* Rules for the search box */
-header .search_form {
+#header .search_form {
display: none;
}
-<header class="closed">
+<div id="header" class="closed">
<h1>
<a href="<%= root_path %>" class="geolink">
<%= image_tag "osm_logo.png", :alt => t('layouts.logo.alt_text'), :class => 'logo' %>
</a>
</h1>
<a href="#" id="menu-icon"></a>
- <nav class='primary'>
+ <div class='nav primary'>
<%= content_for :header %>
<ul>
<li id="edit_tab" class="dropdown <%= current_page_class(edit_path) %>">
<%= link_to t('layouts.export'), export_path, :class => 'tab geolink' %>
</li>
</ul>
- </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>
+ </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>
</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="#">
<li><%= link_to t('layouts.sign_up'), user_new_path %></li>
</ul>
<% end %>
- </nav>
-</header>
+ </div>
+</div>