govuk_admin_template 1.0.1 → 1.0.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.0.2
+
+* Fix rendering of an empty navbar
+
 # 1.0.1
 
 * Fix rendering of media queries in <= IE8

data/app/assets/stylesheets/govuk_admin_template/navbar.css.scss

@@ -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;

data/app/views/layouts/govuk_admin_template.html.erb

@@ -40,13 +40,15 @@
       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">
@@ -54,18 +56,20 @@
             </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">

data/lib/govuk_admin_template/version.rb

@@ -1,3 +1,3 @@
 module GovukAdminTemplate
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_admin_template
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -200,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3493522119861089579
+      hash: -3242357147137915122
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3493522119861089579
+      hash: -3242357147137915122
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23