govuk_frontend_toolkit 3.0.1 → 3.1.0

data/README.md

@@ -51,14 +51,8 @@ conditionals and typography mixins you should add:
 
 ## Updating the version of the toolkit that's included with the gem
 
-1. Find the commit of [the toolkit][govuk_frontend_toolkit] you want to update to. In this
-   repository, `cd app/assets` and then run `git checkout <NEW TOOLKIT COMMIT>` to change
-   the git submodule
-2. Update the version number in `lib/govuk_frontend_toolkit/version.rb`
-3. Commit those two changes together and push them.
-
-Do not create a version tag in this repository - that's handled automatically by the
-job that publishes the gem to RubyGems.
+You shouldn't need to touch this repository. New versions are published automatically
+based on the `VERSION.txt` in [the frontend toolkit repo][govuk_frontend_toolkit].
 
 ## Licence
 

data/app/assets/.gitignore

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

data/app/assets/.scss-lint.yaml

@@ -0,0 +1,107 @@
+linters:
+  BangFormat:
+    enabled: true
+
+  DuplicateProperty:
+    enabled: true
+
+  EmptyRule:
+    enabled: true
+
+  FinalNewline:
+    enabled: true
+
+  Indentation:
+    character: space
+    enabled: true
+    exclude:
+      - 'stylesheets/_css3.scss'
+
+  MergeableSelector:
+    enabled: true
+
+  PropertySpelling:
+    enabled: true
+
+  SingleLinePerProperty:
+    enabled: true
+
+  TrailingSemicolon:
+    enabled: true
+
+  UrlFormat:
+    enabled: true
+
+  UrlQuotes:
+    enabled: true
+
+  # Disabled rules
+
+  BorderZero:
+    enabled: false
+  ColorKeyword:
+    enabled: false
+  Comment:
+    enabled: false
+  Compass Linters:
+    enabled: false
+  DebugStatement:
+    enabled: false
+  DeclarationOrder:
+    enabled: false
+  ElsePlacement:
+    enabled: false
+  EmptyLineBetweenBlocks:
+    enabled: false
+  HexLength:
+    enabled: false
+  HexNotation:
+    enabled: false
+  HexValidation:
+    enabled: false
+  IdWithExtraneousSelector:
+    enabled: false
+  ImportPath:
+    enabled: false
+  LeadingZero:
+    enabled: false
+  NameFormat:
+    enabled: false
+  NestingDepth:
+    enabled: false
+  PlaceholderInExtend:
+    enabled: false
+  PropertySortOrder:
+    enabled: false
+  QualifyingElement:
+    enabled: false
+  SelectorDepth:
+    enabled: false
+  SelectorFormat:
+    enabled: false
+  Shorthand:
+    enabled: false
+  SingleLinePerSelector:
+    enabled: false
+  SpaceAfterComma:
+    enabled: false
+  SpaceAfterPropertyColon:
+    enabled: false
+  SpaceAfterPropertyName:
+    enabled: false
+  SpaceBeforeBrace:
+    enabled: false
+  SpaceBetweenParens:
+    enabled: false
+  StringQuotes:
+    enabled: false
+  TrailingZero:
+    enabled: false
+  UnnecessaryMantissa:
+    enabled: false
+  UnnecessaryParentReference:
+    enabled: false
+  VendorPrefixes:
+    enabled: false
+  ZeroUnit:
+    enabled: false

data/app/assets/.travis.yml

@@ -4,4 +4,4 @@ node_js:
 rvm:
   - 2.1.0
 before_install:
-  - gem install sass
+  - bundle install

data/app/assets/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 3.1.0
+
+- Fix: outdent to add right margin rather than only left
+- Fix: add missing semi-colons in JavaScript files
+- Fix: use box-sizing mixin in column mixin to support more browsers
+- Add: ability to specify float direction on column mixin
+- Add: Sass-lint tests
+
 # 3.0.1
 
 - Fix a bug with the npm publishing. npm requires a version change to publish a package.

data/app/assets/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'sass', '3.4.9'
+gem 'scss-lint', '0.30.0'

data/app/assets/Gruntfile.js

@@ -50,11 +50,24 @@ module.exports = function(grunt) {
           style: 'nested',
         }
       },
+    },
+    scsslint: {
+      allFiles: [
+        'stylesheets/*.scss',
+        'stylesheets/**/*.scss'
+      ],
+      options: {
+        bundleExec: true,
+        config: '.scss-lint.yaml'
+      }
     }
   });
+
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-jasmine');
   grunt.loadNpmTasks('grunt-contrib-sass');
-  grunt.registerTask('test', ['sass', 'clean', 'jasmine']);
+  grunt.loadNpmTasks('grunt-scss-lint');
+
+  grunt.registerTask('test', ['sass', 'clean', 'jasmine', 'scsslint']);
   grunt.registerTask('default', ['test']);
 };

data/app/assets/README.md

@@ -1,7 +1,14 @@
-# GOV.UK Frontend Toolkit
+# GOV.UK frontend toolkit
 
-A collection of Sass and Javascript tools for generating frontend
-code.
+A collection of Sass and JavaScript files for using as part of your
+application's frontend.
+
+This project is not tied to a specific language and is designed to be used
+as a dependency in as many different languages as needed.
+
+There's a `Gemfile` and a `package.json` in this directory, but they are only
+for running tests and are not an indication that this project prefers
+Ruby or Node.js.
 
 ## Installing
 
@@ -37,7 +44,7 @@ You can include the toolkit as a [git submodule][].
 
 To add the submodule to your project run the following command substituting the path to a subdirectory in your project's assets directory:
 
-    $ git submodule add https://github.com/alphagov/govuk_frontend_toolkit.git ./path/to/assets/govuk_toolkit
+    $ git submodule add https://github.com/alphagov/govuk_frontend_toolkit.git ./path/to/assets/govuk_frontend_toolkit
 
 We recommend you use `https` rather than `ssh` for submodules as they don't require key exchanges when deploying to remote servers.
 
@@ -51,10 +58,16 @@ To update the toolkit to the latest version you can use:
 
 ## Running tests
 
-Install Node 0.8 or higher and PhantomJS.
+Tests for this project use Jasmine for the JavaScript and Ruby's `scss` and `scss-lint`
+to check the stylesheets.
 
-    $ npm install
-    $ npm test
+The requirements are Node.js 0.8 or higher and PhantomJS, and Ruby:
+
+```bash
+bundle install
+npm install
+npm test
+```
 
 ### Using the local test runner
 
@@ -79,11 +92,11 @@ If you are compiling Sass from the [command-line tool](http://sass-lang.com/docs
 
 In development:
 
-    sass --style expanded --line-numbers --load-path [path to]/govuk_toolkit/stylesheets input.scss output.css
+    sass --style expanded --line-numbers --load-path [path to]/govuk_frontend_toolkit/stylesheets input.scss output.css
 
 In production:
 
-    sass --style compressed --load-path [path to]/govuk_toolkit/stylesheets input.scss output.css
+    sass --style compressed --load-path [path to]/govuk_frontend_toolkit/stylesheets input.scss output.css
 
 
 

data/app/assets/VERSION.txt

@@ -1 +1 @@
-3.0.1
+3.1.0

data/app/assets/javascripts/govuk/primary-links.js

@@ -11,7 +11,7 @@
       this.addToggleLink();
       this.hideExtraLinks();
     }
-  }
+  };
   PrimaryList.prototype = {
     toggleText: function(){
       if(this.$extraLinks.length > 1){
@@ -21,7 +21,7 @@
       }
     },
     addToggleLink: function(){
-      this.$toggleLink = $('<a href="#">'+ this.toggleText() + '</a>')
+      this.$toggleLink = $('<a href="#">'+ this.toggleText() + '</a>');
       this.$toggleLink.click($.proxy(this.toggleLinks, this));
       this.$toggleLink.insertAfter(this.$el);
     },
@@ -32,11 +32,11 @@
     },
     hideExtraLinks: function(){
       this.$extraLinks.addClass('visuallyhidden');
-      $(window).trigger('govuk.pageSizeChanged')
+      $(window).trigger('govuk.pageSizeChanged');
     },
     showExtraLinks: function(){
       this.$extraLinks.removeClass('visuallyhidden');
-      $(window).trigger('govuk.pageSizeChanged')
+      $(window).trigger('govuk.pageSizeChanged');
     }
   };
   GOVUK.PrimaryList = PrimaryList;
@@ -47,5 +47,5 @@
         new GOVUK.PrimaryList(el, selector);
       });
     }
-  }
+  };
 }());

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

@@ -1,5 +1,5 @@
 (function () {
-  "use strict"
+  "use strict";
   var root = this,
       $ = root.jQuery;
 
@@ -52,7 +52,7 @@
     var radioName;
 
     if ($elm.attr('type') === 'radio') {
-      radioName = $elm.attr('name'),
+      radioName = $elm.attr('name');
       $($elm[0].form).find('input[name="' + radioName + '"]')
         .parent('label')
         .removeClass(this.selectedClass);
@@ -87,7 +87,7 @@
     }.bind(this);
   };
   SelectionButtons.prototype.getFocusHandler = function (opts) {
-    var focusEvent = (opts.level === 'document') ? 'focusin' : 'focus'
+    var focusEvent = (opts.level === 'document') ? 'focusin' : 'focus';
 
     return function (e) {
       var state = (e.type === focusEvent) ? 'focused' : 'blurred';

data/app/assets/javascripts/govuk/stick-at-top-when-scrolling.js

@@ -1,5 +1,5 @@
 (function () {
-  "use strict"
+  "use strict";
   var root = this,
       $ = root.jQuery;
   if(typeof root.GOVUK === 'undefined') { root.GOVUK = {}; }
@@ -71,6 +71,6 @@
         $el.siblings('.shim').remove();
       }
     }
-  }
+  };
   root.GOVUK.stickAtTopWhenScrolling = sticky;
 }).call(this);

data/app/assets/javascripts/govuk/stop-scrolling-at-footer.js

@@ -12,7 +12,7 @@
 
 
 (function () {
-  "use strict"
+  "use strict";
   var root = this,
       $ = root.jQuery;
   if(typeof root.GOVUK === 'undefined') { root.GOVUK = {}; }

data/app/assets/package.json

@@ -8,6 +8,7 @@
     "grunt-contrib-clean":"~0.6.0",
     "grunt-contrib-jasmine": "~0.5.2",
     "grunt-contrib-sass": "0.7.4",
+    "grunt-scss-lint": "0.3.4",
     "jquery-browser": "~1.7.2-3"
   },
   "scripts": {

data/app/assets/spec/support/load.js

@@ -1,5 +1,5 @@
 (function (root) {
-  "use strict"
+  "use strict";
   var loadedScripts = 0,
       totalScripts,
       merge,
@@ -39,7 +39,7 @@
     return script;
   };
   runJasmine = function () {
-    var console_reporter = new jasmine.ConsoleReporter()
+    var console_reporter = new jasmine.ConsoleReporter();
     jasmine.getEnv().addReporter(new jasmine.TrivialReporter());
     jasmine.getEnv().addReporter(console_reporter);
     jasmine.getEnv().execute();

data/app/assets/spec/unit/MultivariateTestSpec.js

@@ -47,7 +47,6 @@ describe("MultivariateTest", function() {
       GOVUK.cookie.andReturn('foo');
       var test = new GOVUK.MultivariateTest({
         name: 'stuff',
-        customVarIndex: 1,
         cohorts: {
           foo: {},
           bar: {}
@@ -116,7 +115,7 @@ describe("MultivariateTest", function() {
         },
         runImmediately: false
       });
-      test.fooCallback = jasmine.createSpy('fooCallback')
+      test.fooCallback = jasmine.createSpy('fooCallback');
       test.run();
       expect(test.fooCallback).toHaveBeenCalled();
     });

data/app/assets/spec/unit/SelectionButtonSpec.js

@@ -585,7 +585,7 @@ describe("selection-buttons", function () {
           $radioButtons = $("label.selectable input[type='radio']");
           $radioLabels = $radioButtons.parent('label');
           $radioButtons.eq(0).focus();
-          expect($radioLabels.eq(0).hasClass('focused')).toBe(true)
+          expect($radioLabels.eq(0).hasClass('focused')).toBe(true);
         });
 
         it("Should add a custom focused class to the radio if sent in as an option", function () {
@@ -598,7 +598,7 @@ describe("selection-buttons", function () {
           $radioButtons = $("label.selectable input[type='radio']");
           $radioLabels = $radioButtons.parent('label');
           $radioButtons.eq(0).focus();
-          expect($radioLabels.eq(0).hasClass('selectable-focused')).toBe(true)
+          expect($radioLabels.eq(0).hasClass('selectable-focused')).toBe(true);
         });
 
         it("Should remove the focused class from a radio when it loses focus", function () {
@@ -611,9 +611,9 @@ describe("selection-buttons", function () {
           $radioButtons = $("label.selectable input[type='radio']");
           $radioLabels = $radioButtons.parent('label');
           $radioButtons.eq(0).focus();
-          expect($radioLabels.eq(0).hasClass('focused')).toBe(true)
+          expect($radioLabels.eq(0).hasClass('focused')).toBe(true);
           $radioButtons.eq(0).blur();
-          expect($radioLabels.eq(0).hasClass('focused')).toBe(false)
+          expect($radioLabels.eq(0).hasClass('focused')).toBe(false);
         });
       });
     });

data/app/assets/stylesheets/_grid_layout.scss

@@ -1,4 +1,5 @@
 @import '_conditionals.scss';
+@import '_css3.scss';
 @import '_measurements.scss';
 @import '_shims.scss';
 
@@ -41,7 +42,7 @@ $site-width: 960px;
 // }
 %outdent-to-full-width {
   margin-left: -$gutter-half;
-  margin-left: -$gutter-half;
+  margin-right: -$gutter-half;
   @include media(tablet){
     margin-left: -$gutter;
     margin-right: -$gutter;
@@ -85,9 +86,9 @@ $site-width: 960px;
 //     @include grid-column( 1/3, $full-width: desktop );
 //   }
 
-@mixin grid-column($width, $full-width: tablet) {
+@mixin grid-column($width, $full-width: tablet, $float: left) {
   @include media($full-width){
-    float: left;
+    float: $float;
     width: percentage($width);
   }
   @include ie-lte(7){
@@ -95,7 +96,7 @@ $site-width: 960px;
   }
 
   padding: 0 $gutter-half;
-  box-sizing: border-box;
+  @include box-sizing(border-box);
 }
 
 

data/app/assets/stylesheets/_typography.scss

@@ -235,7 +235,7 @@ $is-print: false !default;
   }
 
   @if $top-hover == top {
-    $top-hover: $top
+    $top-hover: $top;
   }
 
   &:hover:after {

data/app/assets/stylesheets/design-patterns/_media-player.scss

@@ -118,16 +118,20 @@
 
       .muted {
         color: $light-blue;
+
+        ~ * {
+          opacity: 0.333;
+        }
+
+        ~ .vol-display {
+          text-decoration: line-through;
+        }
       }
 
       .muted::after {
         content: "d";
       }
 
-      .muted ~ * {
-        opacity: 0.333;
-      }
-
       .vol-down, .vol-up {
         position: absolute;
         bottom: 0;
@@ -171,10 +175,6 @@
         background-position: center left;
         background-image: file-url('player-icon-volume.png');
       }
-
-      .muted ~ .vol-display {
-        text-decoration: line-through;
-      }
     }
 
     .current-time {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_frontend_toolkit
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-21 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &10600520 !ruby/object:Gem::Requirement
+  requirement: &11238300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *10600520
+  version_requirements: *11238300
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &10620160 !ruby/object:Gem::Requirement
+  requirement: &11236700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *10620160
+  version_requirements: *11236700
 - !ruby/object:Gem::Dependency
   name: gem_publisher
-  requirement: &10619560 !ruby/object:Gem::Requirement
+  requirement: &11235360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *10619560
+  version_requirements: *11235360
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &10618980 !ruby/object:Gem::Requirement
+  requirement: &11234200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,7 +54,7 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *10618980
+  version_requirements: *11234200
 description: 
 email: bradley.wright@digital.cabinet-office.gov.uk
 executables: []
@@ -74,9 +74,12 @@ files:
 - lib/govuk_frontend_toolkit/engine.rb
 - lib/govuk_frontend_toolkit/version.rb
 - app/assets/.gitignore
+- app/assets/.scss-lint.yaml
 - app/assets/.travis.yml
 - app/assets/CHANGELOG.md
 - app/assets/CONTRIBUTING.md
+- app/assets/Gemfile
+- app/assets/Gemfile.lock
 - app/assets/Gruntfile.js
 - app/assets/LICENCE
 - app/assets/README.md
@@ -254,7 +257,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2986948619087384107
+      hash: -4114693619292822888
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -263,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2986948619087384107
+      hash: -4114693619292822888
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11