govuk_frontend_toolkit 4.12.0 → 4.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6018c04b8e25bcebf8556fa5ecb88f36c6fe477c
-  data.tar.gz: 4ee1ed175655a4ed066e43aab3a67ba105e185b9
+  metadata.gz: fdab1cc5481c808d894dabec2ec8377f3f07e21b
+  data.tar.gz: ad538d6e392ef3ae4408d8df873580f938234488
 SHA512:
-  metadata.gz: 5acf8775d116bfebecc2e656283301fe8ad2f0ee3a78d8fbe0f6d174ebee5d2b3f4f48987fc998a1dc0b0f404357cb6874866c337d18378fb9fe2bafb4a1ae7a
-  data.tar.gz: ff0613b171c289a4fa89d47c965c958301b83ac747527af9a3bca4b425bfab0b927618b6b6fd4ecebbe72ed8e97185acc72be113edc5552a98b10e1031e3f122
+  metadata.gz: f1fd18797d04ab572d43c1cde7fdae57ff2bc3cf4ed5aa0834ee881bfe15744d1d92222d2e08718ae3325dd9c8d987ca280b8edab770bf0debb6034b912bbf8f
+  data.tar.gz: d3bc7e3a5dbf7a5e92a42ac7b80a9c5d571c80dd3f71e215f7b429e3af509fc90982a4712aa7b206243fbcc944af7e4b928213c81cb38f002630f3920035dfab

data/app/assets/.gitignore

@@ -1,4 +1,4 @@
 node_modules/
 .sass-cache
 npm-debug.log
-/spec/stylesheets/test-out.css.map
+spec/stylesheets

data/app/assets/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 4.13.0
+
+- Make headings block-level by default (PR #200). If you are styling elements you want to be inline with heading includes, you’ll need to explicitly make them inline in your CSS.
+
 # 4.12.0
 
 - Increase button padding to match padding from GOV.UK elements (PR #275).

data/app/assets/VERSION.txt

@@ -1 +1 @@
-4.12.0
+4.13.0

data/app/assets/docs/javascript.md

@@ -39,8 +39,8 @@ module.start(element);
 Running `GOVUK.modules.start()` multiple times will have no additional affect. When a module is started a flag is set on the element using the data attribute `module-started`. `data-module-started` is a reserved attribute. It can however be called with an element as the first argument, to allow modules to be started in dynamically loaded content:
 
 ```javascript
-var container = $('.dynamic-content');
-GOVUK.modules.start(container);
+var $container = $('.dynamic-content');
+GOVUK.modules.start($container);
 ```
 
 ### Module structure
@@ -52,7 +52,7 @@ The simplest module looks like:
 (function(Modules) {
   "use strict";
   Modules.SomeModule = function() {
-    this.start = function(element) {
+    this.start = function($element) {
       // module code
     }
   };
@@ -79,9 +79,9 @@ Make it clear where a javascript module will be applying behaviour:
 Beginning with a set of event listeners clearly indicates the module’s intentions.
 
 ```js
-this.start = function(element) {
-  element.on('click', '.js-toggle', toggle);
-  element.on('click', '.js-cancel', cancel);
+this.start = function($element) {
+  $element.on('click', '.js-toggle', toggle);
+  $element.on('click', '.js-cancel', cancel);
 }
 ```
 

data/app/assets/docs/mixins.md

@@ -67,16 +67,32 @@ edge of smaller screens.
 Media query and IE helpers. These make producing responsive layouts and
 attaching IE specific styles to elements really easy.
 
-To use the IE conditionals you will need to add extra stylesheets for each IE which look like:
+To use the IE conditionals you will need to add extra stylesheets for each IE,
+there's an example of how to do this in the [GOV.UK template](https://github.com/alphagov/govuk_template/blob/master/source/views/layouts/govuk_template.html.erb#L9-L12).
 
-    // BASE STYLESHEET FOR IE 6 COMPILER
+    <!--[if gt IE 8]><!--><link href="<%= asset_path "govuk-template.css" %>" media="screen" rel="stylesheet" type="text/css" /><!--<![endif]-->
+    <!--[if IE 6]><link href="<%= asset_path "govuk-template-ie6.css" %>" media="screen" rel="stylesheet" type="text/css" /><![endif]-->
+    <!--[if IE 7]><link href="<%= asset_path "govuk-template-ie7.css" %>" media="screen" rel="stylesheet" type="text/css" /><![endif]-->
+    <!--[if IE 8]><link href="<%= asset_path "govuk-template-ie8.css" %>" media="screen" rel="stylesheet" type="text/css" /><![endif]-->
+
+The conditional logic ensures that only one stylesheet is downloaded.
+
+    <!--[if gt IE 8]><!--> // [1]
+        <link href="<%= asset_path "govuk-template.css" %>" media="screen" rel="stylesheet" type="text/css" />
+    <!--<![endif]--> // [1]
+
+    [1] Note the comment syntax to hide this stylesheet from IE 6-8.
+
+At the top of each stylesheet, you will need:
 
     $is-ie: true;
-    $ie-version: 6;
+    $ie-version: 6; // [1]
+    @import "application.scss"; // [2]
 
-    @import "application.scss";
+  [1] This example is for ie6.css, use 6, 7 or 8 as required here
+  [2] Here `application.scss` is the name of your main stylesheet
 
-Where `application.scss` is the name of your base stylesheet.
+There are examples for [an IE 6 stylesheet](https://github.com/alphagov/govuk_elements/blob/master/public/sass/main-ie6.scss), [an IE 7 stylesheet](https://github.com/alphagov/govuk_elements/blob/master/public/sass/main-ie7.scss) and [an IE 8 stylesheet](https://github.com/alphagov/govuk_elements/blob/master/public/sass/main-ie8.scss).
 
 #### media
 

data/app/assets/jenkins.sh

@@ -20,5 +20,8 @@ if [ "$MASTER_SHA" == "$HEAD_SHA" ]; then
     echo "Creating new tag: $VERSION_TAG"
     git tag $VERSION_TAG
     git push origin $VERSION_TAG
+
+    # Alias branch for the most recently released tag, for easier diffing
+    git push origin master:latest-release
   fi
 fi

data/app/assets/stylesheets/_font_stack.scss

@@ -1,14 +1,5 @@
 //  GOV.UK font stacks, referred to in typography.scss
 
-//  Font stack weirdness
-//
-//  To ensure embedded fonts fall back to appropriate
-//  system fonts (eg, bold embedded font falls back to
-//  bold system font, without anyone getting horrible
-//  artificially emboldened weights) we're setting
-//  the font-stack in a font-face declaration rather
-//  than with the usual font-family.
-
 // Allow uppercase letters in font stack variable names
 // scss-lint:disable NameFormat
 

data/app/assets/stylesheets/_typography.scss

@@ -143,6 +143,8 @@ $is-print: false !default;
 @mixin heading-80($tabular-numbers: false) {
   @include core-80($tabular-numbers: $tabular-numbers);
 
+  display: block;
+
   padding-top: 8px;
   padding-bottom: 7px;
 
@@ -155,6 +157,8 @@ $is-print: false !default;
 @mixin heading-48($tabular-numbers: false) {
   @include core-48($tabular-numbers: $tabular-numbers);
 
+  display: block;
+
   padding-top: 10px;
   padding-bottom: 10px;
 
@@ -167,6 +171,8 @@ $is-print: false !default;
 @mixin heading-36($tabular-numbers: false) {
   @include core-36($tabular-numbers: $tabular-numbers);
 
+  display: block;
+
   padding-top: 8px;
   padding-bottom: 7px;
 
@@ -179,6 +185,8 @@ $is-print: false !default;
 @mixin heading-27($tabular-numbers: false) {
   @include core-27($tabular-numbers: $tabular-numbers);
 
+  display: block;
+
   padding-top: 8px;
   padding-bottom: 7px;
 
@@ -191,6 +199,8 @@ $is-print: false !default;
 @mixin heading-24($tabular-numbers: false) {
   @include core-24($tabular-numbers: $tabular-numbers);
 
+  display: block;
+
   padding-top: 9px;
   padding-bottom: 6px;
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_frontend_toolkit
 version: !ruby/object:Gem::Version
-  version: 4.12.0
+  version: 4.13.0
 platform: ruby
 authors:
 - Bradley Wright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails