govuk_frontend_toolkit 1.5.0 → 1.6.0

data/app/assets/.travis.yml

@@ -1,3 +1,7 @@
 language: node_js
 node_js:
   - "0.10"
+rvm:
+  - 2.1.0
+before_install:
+  - gem install sass

data/app/assets/Gruntfile.js

@@ -1,5 +1,31 @@
 module.exports = function(grunt) {
+  var allSassFiles = [];
+
+  var path = require('path');
+
+  grunt.file.recurse(
+    "./stylesheets/",
+    function(abspath, rootdir, subdir, filename) {
+      if(typeof subdir !== 'undefined'){
+        var relpath = subdir + '/' + filename;
+      } else {
+        var relpath = filename;
+      }
+      if (filename.match(/\.scss/)) {
+        allSassFiles.push("@import '" + relpath + "';");
+      }
+    }
+  );
+
+  grunt.file.write(
+    "./spec/stylesheets/test.scss",
+    allSassFiles.join("\n")
+  );
+
   grunt.initConfig({
+    clean: {
+      sass: ["spec/stylesheets/test*css"]
+    },
     jasmine: {
       javascripts: {
         src: [
@@ -11,9 +37,24 @@ module.exports = function(grunt) {
           helpers: 'spec/unit/*Helper.js'
         }
       }
+    },
+    sass: {
+      development: {
+        files: {
+          './spec/stylesheets/test-out.css': './spec/stylesheets/test.scss'
+        },
+        options: {
+          loadPath: [
+            './stylesheets'
+          ],
+          style: 'nested',
+        }
+      },
     }
   });
+  grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-jasmine');
-  grunt.registerTask('test', ['jasmine']);
+  grunt.loadNpmTasks('grunt-contrib-sass');
+  grunt.registerTask('test', ['sass', 'clean', 'jasmine']);
   grunt.registerTask('default', ['test']);
 };

data/app/assets/README.md

@@ -21,6 +21,14 @@ follow the [installation instructions][toolkit_gem_github_readme].
 [toolkit_npm_github]: https://github.com/alphagov/govuk_frontend_toolkit_npm
 [toolkit_npm]: https://npmjs.org/package/govuk_frontend_toolkit
 
+### Composer
+
+[govuk_frontend_toolkit_composer][toolkit_composer_github] is an composer package that can be
+[added to your composer.json][toolkit_composer_github_usage]
+
+[toolkit_composer_github]: https://github.com/PurpleBooth/govuk_frontend_toolkit_composer
+[toolkit_composer_github_usage]: https://github.com/PurpleBooth/govuk_frontend_toolkit_composer#installing
+
 ### Other projects
 
 You can include the toolkit as a [git submodule][].

data/app/assets/javascripts/govuk/selection-buttons.js

@@ -55,22 +55,20 @@
     this.focusEvents = 'focus blur';
   };
   RadioButtons.prototype.getSelections = function () {
-    var selectionEventHandler = this.markSelected.bind(this),
-        selections = {};
+    var selectionEventHandler = this.markSelected.bind(this);
 
+    this.selections = {};
     $.each(this.$elms, function (index, elm) {
       var $elm = $(elm),
           radioName = $elm.attr('name');
 
-      if (typeof selections[radioName] === 'undefined') {
-        selections[radioName] = false;
+      if (typeof this.selections[radioName] === 'undefined') {
+        this.selections[radioName] = false;
       }
       if ($elm.is(':checked')) {
         selectionEventHandler($elm);
-        selections[radioName] = $elm;
       }
-    });
-    this.selections = selections;
+    }.bind(this));
   };
   RadioButtons.prototype.bindEvents = function () {
     BaseButtons.prototype.bindEvents.call(this);

data/app/assets/package.json

@@ -5,7 +5,9 @@
   "devDependencies": {
     "grunt": "~0.4.2",
     "grunt-cli": "0.1.11",
+    "grunt-contrib-clean":"~0.6.0",
     "grunt-contrib-jasmine": "~0.5.2",
+    "grunt-contrib-sass": "0.7.4",
     "jquery-browser": "~1.7.2-3"
   },
   "scripts": {

data/app/assets/spec/manifest.js

@@ -5,11 +5,13 @@ var manifest = {
     '../../javascripts/govuk/multivariate-test.js',
     '../../javascripts/govuk/primary-links.js',
     '../../javascripts/govuk/stick-at-top-when-scrolling.js',
-    '../../javascripts/govuk/stop-scrolling-at-footer.js'
+    '../../javascripts/govuk/stop-scrolling-at-footer.js',
+    '../../javascripts/govuk/selection-buttons.js'
   ],
   test : [
     '../unit/MultivariateTestSpec.js',
     '../unit/PrimaryLinksSpec.js',
-    '../unit/StickAtTopWhenScrollingSpec.js'
+    '../unit/StickAtTopWhenScrollingSpec.js',
+    '../unit/SelectionButtonSpec.js'
   ]
 };

data/app/assets/spec/{SelectionButtonSpec.js → unit/SelectionButtonSpec.js}

@@ -69,14 +69,16 @@ describe("selection-buttons", function () {
     describe("getSelections method", function () {
       it("Should mark the label of any checked radios as selected", function () {
         var radioButtonsMock = {
-              'markSelected' : function () {},
-              '$elms' : $radioButtons
+              'markSelected' : GOVUK.RadioButtons.prototype.markSelected,
+              '$elms' : $radioButtons,
+              'selectedClass' : 'selected'
             };
 
         $radioButtons.eq(0).attr('checked', true);
-        spyOn(radioButtonsMock, 'markSelected');
+        spyOn(radioButtonsMock, 'markSelected').andCallThrough();
         GOVUK.RadioButtons.prototype.getSelections.call(radioButtonsMock);
         expect(radioButtonsMock.markSelected).toHaveBeenCalled();
+        expect($radioButtons.eq(0).parent('label').hasClass('selected')).toBe(true);
       });
     });
 

data/app/assets/stylesheets/_typography.scss

@@ -17,204 +17,113 @@
 
 $is-print: false !default;
 
-@mixin core-80($line-height: (80 / 80), $line-height-640: (55 / 53), $tabular-numbers: false) {
+@mixin _core-font-generator($font-size: 19px, $font-size-640: 16px, $font-size-print: 14pt, $line-height: (25 / 19), $line-height-640: (20 / 16), $tabular-numbers: false, $font-weight: 400) {
   @if $tabular-numbers == true {
     font-family: $NTA-Light-Tabular;
   } @else {
     font-family: $NTA-Light;
   }
   @if $is-print == false {
-    font-size: 80px;
+    font-size: $font-size;
   } @else {
-    font-size: 28pt;
+    font-size: $font-size-print;
   }
   line-height: $line-height;
-  font-weight: 400;
+  font-weight: $font-weight;
   text-transform: none;
   @media (max-width: 640px) {
-    font-size: 53px;
+    font-size: $font-size-640;
     line-height: $line-height-640;
   }
 }
 
-@mixin core-48($line-height: (50 / 48), $line-height-640: (35 / 32), $tabular-numbers: false) {
-  @if $tabular-numbers == true {
-    font-family: $NTA-Light-Tabular;
-  } @else {
-    font-family: $NTA-Light;
-  }
-  @if $is-print == false {
-    font-size: 48px;
-  } @else {
-    font-size: 18pt;
-  }
-  line-height: $line-height;
-  font-weight: 400;
-  text-transform: none;
-  @media (max-width: 640px) {
-    font-size: 32px;
-    line-height: $line-height-640;
-  }
+
+@mixin core-80($line-height: (80 / 80), $line-height-640: (55 / 53), $tabular-numbers: false, $font-weight: 400) {
+  $font-size: 80px;
+  $font-size-640: 53px;
+  $font-size-print: 28pt;
+  @include _core-font-generator($font-size, $font-size-640, $font-size-print, $line-height, $line-height-640, $tabular-numbers, $font-weight);
 }
 
-@mixin core-36($line-height: (40 / 36), $line-height-640: (25 / 24), $tabular-numbers: false) {
-  @if $tabular-numbers == true {
-    font-family: $NTA-Light-Tabular;
-  } @else {
-    font-family: $NTA-Light;
-  }
-  @if $is-print == false {
-    font-size: 36px;
-  } @else {
-    font-size: 18pt;
-  }
-  line-height: $line-height;
-  font-weight: 400;
-  text-transform: none;
-  @media (max-width: 640px) {
-    font-size: 24px;
-    line-height: $line-height-640;
-  }
+@mixin core-48($line-height: (50 / 48), $line-height-640: (35 / 32), $tabular-numbers: false, $font-weight: 400) {
+  $font-size: 48px;
+  $font-size-640: 32px;
+  $font-size-print: 18pt;
+  @include _core-font-generator($font-size, $font-size-640, $font-size-print, $line-height, $line-height-640, $tabular-numbers, $font-weight);
 }
 
-@mixin core-27($line-height: (30 / 27), $line-height-640: (20 / 18), $tabular-numbers: false) {
-  @if $tabular-numbers == true {
-    font-family: $NTA-Light-Tabular;
-  } @else {
-    font-family: $NTA-Light;
-  }
-  @if $is-print == false {
-    font-size: 27px;
-  } @else {
-    font-size: 16pt;
-  }
-  line-height: $line-height;
-  font-weight: 400;
-  text-transform: none;
-  @media (max-width: 640px) {
-    font-size: 18px;
-    line-height: $line-height-640;
-  }
+@mixin core-36($line-height: (40 / 36), $line-height-640: (25 / 24), $tabular-numbers: false, $font-weight: 400) {
+  $font-size: 36px;
+  $font-size-640: 24px;
+  $font-size-print: 18pt;
+  @include _core-font-generator($font-size, $font-size-640, $font-size-print, $line-height, $line-height-640, $tabular-numbers, $font-weight);
 }
 
-@mixin core-24($line-height: (30 / 24), $line-height-640: (24 / 20), $tabular-numbers: false) {
-  @if $tabular-numbers == true {
-    font-family: $NTA-Light-Tabular;
-  } @else {
-    font-family: $NTA-Light;
-  }
-  @if $is-print == false {
-    font-size: 24px;
-  } @else {
-    font-size: 16pt;
-  }
-  line-height: $line-height;
-  font-weight: 400;
-  text-transform: none;
-  @media (max-width: 640px) {
-    font-size: 20px;
-    line-height: $line-height-640;
-  }
+@mixin core-27($line-height: (30 / 27), $line-height-640: (20 / 18), $tabular-numbers: false, $font-weight: 400) {
+  $font-size: 27px;
+  $font-size-640: 20px;
+  $font-size-print: 16pt;
+  @include _core-font-generator($font-size, $font-size-640, $font-size-print, $line-height, $line-height-640, $tabular-numbers, $font-weight);
 }
 
-@mixin core-19($line-height: (25 / 19), $line-height-640: (20 / 16), $tabular-numbers: false) {
-  @if $tabular-numbers == true {
-    font-family: $NTA-Light-Tabular;
-  } @else {
-    font-family: $NTA-Light;
-  }
-  @if $is-print == false {
-    font-size: 19px;
-  } @else {
-    font-size: 14pt;
-  }
-  line-height: $line-height;
-  font-weight: 400;
-  text-transform: none;
-  @media (max-width: 640px) {
-    font-size: 16px;
-    line-height: $line-height-640;
-  }
+@mixin core-24($line-height: (30 / 24), $line-height-640: (24 / 20), $tabular-numbers: false, $font-weight: 400) {
+  $font-size: 24px;
+  $font-size-640: 18px;
+  $font-size-print: 16pt;
+  @include _core-font-generator($font-size, $font-size-640, $font-size-print, $line-height, $line-height-640, $tabular-numbers, $font-weight);
 }
 
-@mixin core-16($line-height: (20 / 16), $line-height-640: (16 / 14), $tabular-numbers: false) {
-  @if $tabular-numbers == true {
-    font-family: $NTA-Light-Tabular;
-  } @else {
-    font-family: $NTA-Light;
-  }
-  @if $is-print == false {
-    font-size: 16px;
-  } @else {
-    font-size: 12pt;
-  }
-  line-height: $line-height;
-  font-weight: 300;
-  text-transform: none;
-  @media (max-width: 640px) {
-    font-size: 14px;
-    line-height: $line-height-640;
-  }
+@mixin core-19($line-height: (25 / 19), $line-height-640: (20 / 16), $tabular-numbers: false, $font-weight: 400) {
+  $font-size: 19px;
+  $font-size-640: 16px;
+  $font-size-print: 14pt;
+  @include _core-font-generator($font-size, $font-size-640, $font-size-print, $line-height, $line-height-640, $tabular-numbers, $font-weight);
 }
 
-@mixin core-14($line-height: (20 / 14), $line-height-640: (15 / 12), $tabular-numbers: false) {
-  @if $tabular-numbers == true {
-    font-family: $NTA-Light-Tabular;
-  } @else {
-    font-family: $NTA-Light;
-  }
-  @if $is-print == false {
-    font-size: 14px;
-  } @else {
-    font-size: 11pt;
-  }
-  line-height: $line-height;
-  font-weight: 400;
-  text-transform: none;
-  @media (max-width: 640px) {
-    font-size: 12px;
-    line-height: $line-height-640;
-  }
+@mixin core-16($line-height: (20 / 16), $line-height-640: (16 / 14), $tabular-numbers: false, $font-weight: 400) {
+  $font-size: 16px;
+  $font-size-640: 14px;
+  $font-size-print: 12pt;
+  @include _core-font-generator($font-size, $font-size-640, $font-size-print, $line-height, $line-height-640, $tabular-numbers, $font-weight);
+}
+
+@mixin core-14($line-height: (20 / 14), $line-height-640: (15 / 12), $tabular-numbers: false, $font-weight: 400) {
+  $font-size: 14px;
+  $font-size-640: 12px;
+  $font-size-print: 11pt;
+  @include _core-font-generator($font-size, $font-size-640, $font-size-print, $line-height, $line-height-640, $tabular-numbers, $font-weight);
 }
 
 @mixin bold-80($line-height: (80 / 80), $line-height-640: (55 / 53), $tabular-numbers: false) {
-  @include core-80($line-height, $line-height-640, $tabular-numbers: $tabular-numbers);
-  font-weight: 700;
+  @include core-80($line-height, $line-height-640, $tabular-numbers: $tabular-numbers, $font-weight: 700);
 }
 
 @mixin bold-48($line-height: (50 / 48), $line-height-640: (35 / 32), $tabular-numbers: false) {
-  @include core-48($line-height, $line-height-640, $tabular-numbers: $tabular-numbers);
-  font-weight: 700;
+  @include core-48($line-height, $line-height-640, $tabular-numbers: $tabular-numbers, $font-weight: 700);
 }
 
 @mixin bold-36($line-height: (40 / 36), $line-height-640: (25 / 24), $tabular-numbers: false) {
-  @include core-36($line-height, $line-height-640, $tabular-numbers: $tabular-numbers);
-  font-weight: 700;
+  @include core-36($line-height, $line-height-640, $tabular-numbers: $tabular-numbers, $font-weight: 700);
 }
 
 @mixin bold-27($line-height: (30 / 27), $line-height-640: (20 / 18), $tabular-numbers: false) {
-  @include core-27($line-height, $line-height-640, $tabular-numbers: $tabular-numbers);
-  font-weight: 700;
+  @include core-27($line-height, $line-height-640, $tabular-numbers: $tabular-numbers, $font-weight: 700);
 }
 
 @mixin bold-24($line-height: (30 / 24), $line-height-640: (24 / 20), $tabular-numbers: false) {
-  @include core-24($line-height, $line-height-640, $tabular-numbers: $tabular-numbers);
-  font-weight: 700;
+  @include core-24($line-height, $line-height-640, $tabular-numbers: $tabular-numbers, $font-weight: 700);
 }
 
 @mixin bold-19($line-height: (25 / 19), $line-height-640: (20 / 16), $tabular-numbers: false) {
-  @include core-19($line-height, $line-height-640, $tabular-numbers: $tabular-numbers);
-  font-weight: 700;
+  @include core-19($line-height, $line-height-640, $tabular-numbers: $tabular-numbers, $font-weight: 700);
 }
 
 @mixin bold-16($line-height: (20 / 16), $line-height-640: (16 / 14), $tabular-numbers: false) {
-  @include core-16($line-height, $line-height-640, $tabular-numbers: $tabular-numbers);
-  font-weight: 700;
+  @include core-16($line-height, $line-height-640, $tabular-numbers: $tabular-numbers, $font-weight: 700);
 }
 
 @mixin bold-14($line-height: (20 / 14), $line-height-640: (15 / 12), $tabular-numbers: false) {
-  @include core-14($line-height, $line-height-640, $tabular-numbers: $tabular-numbers);
-  font-weight: 700;
+  @include core-14($line-height, $line-height-640, $tabular-numbers: $tabular-numbers, $font-weight: 700);
 }
 
 @mixin heading-80($tabular-numbers: false) {

data/lib/govuk_frontend_toolkit/version.rb

@@ -1,3 +1,3 @@
 module GovUKFrontendToolkit
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_frontend_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &19233640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.0
+  version_requirements: *19233640
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &19322160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,44 +32,29 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.0
+  version_requirements: *19322160
 - !ruby/object:Gem::Dependency
   name: gem_publisher
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &19320800 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.1
+  version_requirements: *19320800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &19319600 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.2.2
+  version_requirements: *19319600
 description: 
 email: bradley.wright@digital.cabinet-office.gov.uk
 executables: []
@@ -233,7 +213,6 @@ files:
 - app/assets/javascripts/vendor/polyfills/bind.js
 - app/assets/jenkins.sh
 - app/assets/package.json
-- app/assets/spec/SelectionButtonSpec.js
 - app/assets/spec/manifest.js
 - app/assets/spec/support/LocalTestRunner.html
 - app/assets/spec/support/console-runner.js
@@ -241,6 +220,7 @@ files:
 - app/assets/spec/support/run_jasmine_test.js
 - app/assets/spec/unit/MultivariateTestSpec.js
 - app/assets/spec/unit/PrimaryLinksSpec.js
+- app/assets/spec/unit/SelectionButtonSpec.js
 - app/assets/spec/unit/StickAtTopWhenScrollingSpec.js
 - app/assets/stylesheets/.gitkeep
 - app/assets/stylesheets/_colours.scss
@@ -272,7 +252,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1799776564228403607
+      hash: -4285435164895981672
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -281,10 +261,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1799776564228403607
+      hash: -4285435164895981672
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Tools for building frontend applications