Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tidy up navbar when no navigation specified #28

Merged
merged 2 commits into from Jul 1, 2014
Merged

Tidy up navbar when no navigation specified #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef31a94
Don't include main nav when none specified
fofr Jun 30, 2014
f2af61d
Prevent navbar height from collapsing when empty
fofr Jun 30, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions app/assets/stylesheets/govuk_admin_template/navbar.css.scss
View file
Open in desktop
Expand Up @@ -16,6 +16,12 @@
}
}

// Prevent navbar height from collapsing when there's
// no navbar_right or navbar_items
header .navbar-header {
min-height: 50px;
}

@media (max-width: 768px) {
.navbar .container .navbar-brand {
margin-left: 15px;
Expand Down
42 changes: 23 additions & 19 deletions app/views/layouts/govuk_admin_template.html.erb
View file
Open in desktop
Expand Up @@ -40,32 +40,36 @@
add-bottom-margin" role="banner">
<div class="container">
<div class="navbar-header">
<%# Bootstrap toggle for collapsed navbar content, used at smaller widths %>
<a class="navbar-toggle" data-toggle="collapse" data-target="header .navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<% if content_for?(:navbar_right) || content_for?(:navbar_items) %>
<%# Bootstrap toggle for collapsed navbar content, used at smaller widths %>
<a class="navbar-toggle" data-toggle="collapse" data-target="header .navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<% end %>
<%= link_to content_for?(:app_title) ? yield(:app_title) : "GOV.UK", root_path, :class => 'navbar-brand' %>
<% if environment_label %>
<div class="environment-label">
<%= environment_label %>
</div>
<% end %>
</div>
<nav role="navigation" class="collapse navbar-collapse">
<% if content_for?(:navbar_items) %>
<ul class="nav navbar-nav">
<%= yield :navbar_items %>
</ul>
<% end %>
<% if content_for?(:navbar_right) %>
<div class="navbar-text pull-right">
<%= yield :navbar_right %>
</div>
<% end %>
</nav>
<% if content_for?(:navbar_right) || content_for?(:navbar_items) %>
<nav role="navigation" class="collapse navbar-collapse">
<% if content_for?(:navbar_items) %>
<ul class="nav navbar-nav">
<%= yield :navbar_items %>
</ul>
<% end %>
<% if content_for?(:navbar_right) %>
<div class="navbar-text pull-right">
<%= yield :navbar_right %>
</div>
<% end %>
</nav>
<% end %>
</div>
</header>
<section class="container">
Expand Down