govuk_admin_template 1.1.1 → 1.1.2

Sign up to get free protection for your applications and to get access to all the features.
data/CHANGELOG.md CHANGED
@@ -1,3 +1,8 @@
1
+ # 1.1.2
2
+
3
+ * Add full width page option
4
+ * Rename SASS partials to begin with underscores
5
+
1
6
  # 1.1.1
2
7
 
3
8
  * When filtering tables, allow users to easily go to the first item
data/README.md CHANGED
@@ -76,6 +76,7 @@ The gem [uses nested layouts](http://guides.rubyonrails.org/layouts_and_renderin
76
76
  `:footer_top` (optional) | Footer content before copyright text
77
77
  `:footer_version` (optional) | Text indicating the release, eg commit SHA
78
78
  `:body_end` (optional) | Just before the `</body>` tag
79
+ `:full_width` (optional, boolean) | Expand content to edges of screen. Must be used on a per-page basis. Apps must not be full width by default.
79
80
 
80
81
  Example navbar_items:
81
82
  ```erb
@@ -2,7 +2,8 @@
2
2
  Navbar
3
3
  ========================================================================== */
4
4
 
5
- .navbar .container .navbar-brand {
5
+ .navbar .container .navbar-brand,
6
+ .navbar .container-fluid .navbar-brand {
6
7
  background: url("/assets/govuk_admin_template/header-crown.png") 0 0.67em no-repeat;
7
8
  color: #fff;
8
9
  font-family: $font-family-gill-sans;
@@ -24,6 +25,7 @@ header .navbar-header {
24
25
  }
25
26
 
26
27
  @media (max-width: 768px) {
28
+ .navbar .container-fluid .navbar-brand,
27
29
  .navbar .container .navbar-brand {
28
30
  margin-left: 15px;
29
31
  }
@@ -22,9 +22,7 @@
22
22
  %>
23
23
  <% end %>
24
24
  <%= yield :head %>
25
- <%
26
- # CSS resets and fixes for Bootstrap 3 in IE7
27
- %>
25
+ <%# CSS resets and fixes for Bootstrap 3 in IE7 %>
28
26
  <!--[if lte IE 7]>
29
27
  <%= stylesheet_link_tag "govuk_admin_template/bootstrap-ie7" %>
30
28
  <![endif]-->
@@ -45,7 +43,7 @@
45
43
  navbar-static-top
46
44
  <% if environment_style %>environment-indicator<% end %>
47
45
  add-bottom-margin" role="banner">
48
- <div class="container">
46
+ <div class="<%= content_for?(:full_width) ? 'container-fluid' : 'container' %>">
49
47
  <div class="navbar-header">
50
48
  <% if content_for?(:navbar_right) || content_for?(:navbar_items) %>
51
49
  <%# Bootstrap toggle for collapsed navbar content, used at smaller widths %>
@@ -79,7 +77,7 @@
79
77
  <% end %>
80
78
  </div>
81
79
  </header>
82
- <section class="container">
80
+ <section class="<%= content_for?(:full_width) ? 'container-fluid' : 'container' %>">
83
81
  <main role="main">
84
82
  <%= content_for?(:content) ? yield(:content) : yield %>
85
83
  </main>
@@ -1,3 +1,3 @@
1
1
  module GovukAdminTemplate
2
- VERSION = "1.1.1"
2
+ VERSION = "1.1.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.1.1
4
+ version: 1.1.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-07-23 00:00:00.000000000 Z
12
+ date: 2014-08-27 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
@@ -164,19 +164,19 @@ extra_rdoc_files: []
164
164
  files:
165
165
  - app/views/layouts/govuk_admin_template.html.erb
166
166
  - app/views/govuk_admin_template/style_guide/index.html.erb
167
- - app/assets/stylesheets/govuk_admin_template/theme.css.scss
168
- - app/assets/stylesheets/govuk_admin_template/nav_list.css.scss
169
- - app/assets/stylesheets/govuk_admin_template/tables.css.scss
170
- - app/assets/stylesheets/govuk_admin_template/bootstrap_overrides.css.scss
167
+ - app/assets/stylesheets/govuk_admin_template/_base.css.scss
168
+ - app/assets/stylesheets/govuk_admin_template/_buttons.css.scss
169
+ - app/assets/stylesheets/govuk_admin_template/_bootstrap_overrides.css.scss
171
170
  - app/assets/stylesheets/govuk_admin_template/bootstrap-ie7.scss
172
- - app/assets/stylesheets/govuk_admin_template/style_guide.css.scss
173
- - app/assets/stylesheets/govuk_admin_template/navbar.css.scss
174
- - app/assets/stylesheets/govuk_admin_template/bootstrap_colour_overrides.css.scss
175
- - app/assets/stylesheets/govuk_admin_template/toggles.css.scss
176
- - app/assets/stylesheets/govuk_admin_template/base.css.scss
177
- - app/assets/stylesheets/govuk_admin_template/buttons.css.scss
178
- - app/assets/stylesheets/govuk_admin_template/mixins.css.scss
179
- - app/assets/stylesheets/govuk_admin_template/input_helpers.css.scss
171
+ - app/assets/stylesheets/govuk_admin_template/_style_guide.css.scss
172
+ - app/assets/stylesheets/govuk_admin_template/_tables.css.scss
173
+ - app/assets/stylesheets/govuk_admin_template/_mixins.css.scss
174
+ - app/assets/stylesheets/govuk_admin_template/_toggles.css.scss
175
+ - app/assets/stylesheets/govuk_admin_template/_navbar.css.scss
176
+ - app/assets/stylesheets/govuk_admin_template/_input_helpers.css.scss
177
+ - app/assets/stylesheets/govuk_admin_template/_nav_list.css.scss
178
+ - app/assets/stylesheets/govuk_admin_template/_bootstrap_colour_overrides.css.scss
179
+ - app/assets/stylesheets/govuk_admin_template/_theme.css.scss
180
180
  - app/assets/stylesheets/govuk_admin_template.scss
181
181
  - app/assets/images/govuk_admin_template/favicon-preview.png
182
182
  - app/assets/images/govuk_admin_template/favicon.png
@@ -219,7 +219,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
219
219
  version: '0'
220
220
  segments:
221
221
  - 0
222
- hash: -3613484220432523315
222
+ hash: 4055554137707764025
223
223
  required_rubygems_version: !ruby/object:Gem::Requirement
224
224
  none: false
225
225
  requirements:
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
228
228
  version: '0'
229
229
  segments:
230
230
  - 0
231
- hash: -3613484220432523315
231
+ hash: 4055554137707764025
232
232
  requirements: []
233
233
  rubyforge_project:
234
234
  rubygems_version: 1.8.23