govuk_admin_template 1.0.1 → 1.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/CHANGELOG.md CHANGED
@@ -1,3 +1,7 @@
1
+ # 1.0.2
2
+
3
+ * Fix rendering of an empty navbar
4
+
1
5
  # 1.0.1
2
6
 
3
7
  * Fix rendering of media queries in <= IE8
@@ -16,6 +16,12 @@
16
16
  }
17
17
  }
18
18
 
19
+ // Prevent navbar height from collapsing when there's
20
+ // no navbar_right or navbar_items
21
+ header .navbar-header {
22
+ min-height: 50px;
23
+ }
24
+
19
25
  @media (max-width: 768px) {
20
26
  .navbar .container .navbar-brand {
21
27
  margin-left: 15px;
@@ -40,13 +40,15 @@
40
40
  add-bottom-margin" role="banner">
41
41
  <div class="container">
42
42
  <div class="navbar-header">
43
- <%# Bootstrap toggle for collapsed navbar content, used at smaller widths %>
44
- <a class="navbar-toggle" data-toggle="collapse" data-target="header .navbar-collapse">
45
- <span class="sr-only">Toggle navigation</span>
46
- <span class="icon-bar"></span>
47
- <span class="icon-bar"></span>
48
- <span class="icon-bar"></span>
49
- </a>
43
+ <% if content_for?(:navbar_right) || content_for?(:navbar_items) %>
44
+ <%# Bootstrap toggle for collapsed navbar content, used at smaller widths %>
45
+ <a class="navbar-toggle" data-toggle="collapse" data-target="header .navbar-collapse">
46
+ <span class="sr-only">Toggle navigation</span>
47
+ <span class="icon-bar"></span>
48
+ <span class="icon-bar"></span>
49
+ <span class="icon-bar"></span>
50
+ </a>
51
+ <% end %>
50
52
  <%= link_to content_for?(:app_title) ? yield(:app_title) : "GOV.UK", root_path, :class => 'navbar-brand' %>
51
53
  <% if environment_label %>
52
54
  <div class="environment-label">
@@ -54,18 +56,20 @@
54
56
  </div>
55
57
  <% end %>
56
58
  </div>
57
- <nav role="navigation" class="collapse navbar-collapse">
58
- <% if content_for?(:navbar_items) %>
59
- <ul class="nav navbar-nav">
60
- <%= yield :navbar_items %>
61
- </ul>
62
- <% end %>
63
- <% if content_for?(:navbar_right) %>
64
- <div class="navbar-text pull-right">
65
- <%= yield :navbar_right %>
66
- </div>
67
- <% end %>
68
- </nav>
59
+ <% if content_for?(:navbar_right) || content_for?(:navbar_items) %>
60
+ <nav role="navigation" class="collapse navbar-collapse">
61
+ <% if content_for?(:navbar_items) %>
62
+ <ul class="nav navbar-nav">
63
+ <%= yield :navbar_items %>
64
+ </ul>
65
+ <% end %>
66
+ <% if content_for?(:navbar_right) %>
67
+ <div class="navbar-text pull-right">
68
+ <%= yield :navbar_right %>
69
+ </div>
70
+ <% end %>
71
+ </nav>
72
+ <% end %>
69
73
  </div>
70
74
  </header>
71
75
  <section class="container">
@@ -1,3 +1,3 @@
1
1
  module GovukAdminTemplate
2
- VERSION = "1.0.1"
2
+ VERSION = "1.0.2"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: govuk_admin_template
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.1
4
+ version: 1.0.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-06-26 00:00:00.000000000 Z
12
+ date: 2014-07-01 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
@@ -200,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
200
200
  version: '0'
201
201
  segments:
202
202
  - 0
203
- hash: 3493522119861089579
203
+ hash: -3242357147137915122
204
204
  required_rubygems_version: !ruby/object:Gem::Requirement
205
205
  none: false
206
206
  requirements:
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
209
209
  version: '0'
210
210
  segments:
211
211
  - 0
212
- hash: 3493522119861089579
212
+ hash: -3242357147137915122
213
213
  requirements: []
214
214
  rubyforge_project:
215
215
  rubygems_version: 1.8.23