Bump govuk_frontend_toolkit to 3.1.0

# 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
theboypayne · Dec 2, 2014 · adf9e75 · adf9e75
1 parent 9f7497f
commit adf9e75
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 25 deletions.
diff --git a/govuk/public/javascripts/govuk/primary-links.js b/govuk/public/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);
       });
     }
-  }
+  };
 }());
diff --git a/govuk/public/javascripts/govuk/selection-buttons.js b/govuk/public/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';

diff --git a/govuk/public/javascripts/govuk/stick-at-top-when-scrolling.js b/govuk/public/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);
diff --git a/govuk/public/javascripts/govuk/stop-scrolling-at-footer.js b/govuk/public/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 = {}; }

diff --git a/govuk/public/sass/_grid_layout.scss b/govuk/public/sass/_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,17 +86,17 @@ $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){
     width: (($site-width + $gutter) * $width) - $gutter;
   }
 
   padding: 0 $gutter-half;
-  box-sizing: border-box;
+  @include box-sizing(border-box);
 }
 
 

diff --git a/govuk/public/sass/_typography.scss b/govuk/public/sass/_typography.scss
@@ -235,7 +235,7 @@ $is-print: false !default;
   }
 
   @if $top-hover == top {
-    $top-hover: $top
+    $top-hover: $top;
   }
 
   &:hover:after {

diff --git a/govuk/public/sass/design-patterns/_media-player.scss b/govuk/public/sass/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 {

diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
     "consolidate": "0.x",
     "readdir": "0.0.6",
     "node-sass": "^1.1.4",
-    "govuk_frontend_toolkit": "^3.0.1",
+    "govuk_frontend_toolkit": "^3.1.0",
     "govuk_template_mustache": "^0.10.1",
     "grunt": "0.4.2",
     "grunt-contrib-clean": "0.5.0",