From ef10e0b41632161483390333d38704ab38d9fc2a Mon Sep 17 00:00:00 2001 From: Paul Hayes Date: Thu, 31 Dec 2015 13:47:07 +0000 Subject: [PATCH 1/3] Pin to 3.3.5.1 Use 3.3.5.1 rather than 3.3.5 as this contains a necessary Sass dependency fix: https://rubygems.org/gems/bootstrap-sass/versions/3.3.5.1 Pinning because bootstrap-sass has a tendency to release breaking changes in point releases. --- govuk_admin_template.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/govuk_admin_template.gemspec b/govuk_admin_template.gemspec index 466974d..117155c 100644 --- a/govuk_admin_template.gemspec +++ b/govuk_admin_template.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |gem| gem.required_ruby_version = '>= 1.9.3' gem.add_dependency 'rails', '>= 3.2.0' - gem.add_dependency 'bootstrap-sass', '3.3.5' + gem.add_dependency 'bootstrap-sass', '3.3.5.1' gem.add_dependency 'jquery-rails', '~> 3.1.3' gem.add_development_dependency 'sass-rails', '3.2.6' From a75bbee4f290b52ce1139f6d224be775dd1d675b Mon Sep 17 00:00:00 2001 From: Paul Hayes Date: Thu, 31 Dec 2015 13:57:13 +0000 Subject: [PATCH 2/3] Move navbar logic into variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Clarify which bits are dependent on navbar content being present. Fixes a bug where the collapsed nav icon wouldn’t shown when there are no navbar items but there is a sign out link. --- app/views/layouts/govuk_admin_template.html.erb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/govuk_admin_template.html.erb b/app/views/layouts/govuk_admin_template.html.erb index 8df74c1..e5b9c20 100644 --- a/app/views/layouts/govuk_admin_template.html.erb +++ b/app/views/layouts/govuk_admin_template.html.erb @@ -3,6 +3,7 @@ environment_label = GovukAdminTemplate.environment_label app_home_path = content_for?(:app_home_path) ? yield(:app_home_path) : root_path app_title = content_for?(:app_title) ? yield(:app_title) : GovukAdminTemplate::Config.app_title + has_navbar_content = GovukAdminTemplate::Config.show_signout || content_for?(:navbar_right) || content_for?(:navbar_items) %> @@ -51,7 +52,7 @@ add-bottom-margin" role="banner">
- <% if content_for?(:navbar_right) || content_for?(:navbar_items) %> + <% if has_navbar_content %> <%# Bootstrap toggle for collapsed navbar content, used at smaller widths %> Toggle navigation @@ -67,7 +68,7 @@
<% end %>
- <% if GovukAdminTemplate::Config.show_signout || content_for?(:navbar_right) || content_for?(:navbar_items) %> + <% if has_navbar_content %>