govuk_frontend_toolkit 4.18.1 → 4.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecf9346cf0f092e1b0ba59783c3f6cb44300271c
-  data.tar.gz: c96bef394f4a177ce2f6bef6d76bafb9e738646e
+  metadata.gz: 69f29797348ec404bd8eff1ab334c112ddcb9d97
+  data.tar.gz: ba0f6485cef046dfda13fad5a545061663c97f75
 SHA512:
-  metadata.gz: 7a6ee536d2c4a02cc80b71781f90171760a2a759ef1b7f8025018806e2fcfde41689b8045b3a6a473de8f723fb397e378e8ccd2957928d0c3e912875b5e4f1dd
-  data.tar.gz: 23469211cf831ebe46594297243034d33a6dc6ae4b940b112c9bcff21bd21dd8561abb7860fbb6f77175e33e5c21d33350b0b3fa36a7a7bd6a66d655da985380
+  metadata.gz: efd223fcb38ac707cdc3ad5c7a95c9f2748158479332e6a90985b7ecae3ab2b1743566138f71b290060c863e88bf759feebf1326a4eb24c24ee441f17aa895f6
+  data.tar.gz: ddb0056d66c87762147b11a4de3d77c3ca698b7d5fea3171bd44c293b2cd57264dd3b03b71258a1c88f620332b9333c095ff17d07a673508becb2fb58841c016

data/app/assets/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 4.18.2
+
+- Remove unnecessary print font fallback that causes regression downstream ([PR #328](https://github.com/alphagov/govuk_frontend_toolkit/pull/328))
+- Update tooling to use npm script rather than grunt-shell ([PR #327](https://github.com/alphagov/govuk_frontend_toolkit/pull/327))
+
 # 4.18.1
 
 - Fix error in IE - remove trailing comma from shimLinksWithButtonRole JavaScript ([PR #323](https://github.com/alphagov/govuk_frontend_toolkit/pull/323)).

data/app/assets/Gruntfile.js

@@ -49,16 +49,8 @@ module.exports = function(grunt) {
           loadPath: [
             './stylesheets'
           ],
-          style: 'nested',
+          style: 'nested'
         }
-      },
-    },
-    shell: {
-      multiple: {
-        command: [
-          'bundle',
-          'bundle exec govuk-lint-sass stylesheets'
-        ].join('&&')
       }
     }
   });
@@ -66,8 +58,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-jasmine');
   grunt.loadNpmTasks('grunt-contrib-sass');
-  grunt.loadNpmTasks('grunt-shell');
 
-  grunt.registerTask('test', ['sass', 'clean', 'jasmine', 'shell']);
+  grunt.registerTask('test', ['sass', 'clean', 'jasmine']);
   grunt.registerTask('default', ['test']);
 };

data/app/assets/VERSION.txt

@@ -1 +1 @@
-4.18.1
+4.18.2

data/app/assets/package.json

@@ -8,10 +8,10 @@
     "grunt-contrib-clean":"~0.6.0",
     "grunt-contrib-jasmine": "^1.0.0",
     "grunt-contrib-sass": "0.7.4",
-    "grunt-shell": "^1.1.2",
     "jquery": "~1.11.3"
   },
   "scripts": {
-    "test": "node_modules/.bin/grunt test"
+    "test": "grunt test && npm run lint --silent",
+    "lint": "bundle && bundle exec govuk-lint-sass stylesheets"
   }
 }

data/app/assets/stylesheets/_typography.scss

@@ -35,18 +35,21 @@ $is-print: false !default;
       }
     }
   }
-  font-size: $font-size-640;
-  line-height: $line-height-640;
   font-weight: $font-weight;
   text-transform: none;
 
-  @include media(tablet) {
-    font-size: $font-size;
-    line-height: $line-height;
-  }
-
   @if $is-print {
     font-size: $font-size-print;
+    line-height: $line-height;
+
+  } @else {
+    font-size: $font-size-640;
+    line-height: $line-height-640;
+
+    @include media(tablet) {
+      font-size: $font-size;
+      line-height: $line-height;
+    }
   }
 }
 // scss-lint:enable NameFormat

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_frontend_toolkit
 version: !ruby/object:Gem::Version
-  version: 4.18.1
+  version: 4.18.2
 platform: ruby
 authors:
 - Government Digital Service
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails