govuk_frontend_toolkit 4.9.1 → 4.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 904cb3761c37d4594245c0b113f8186ab4fbe8ca
-  data.tar.gz: 9ae43f63e9ebc12b5b36dce2188183c4ddd4a065
+  metadata.gz: 1ea847b65179be950d4cf6f0eb2f3f4313d95b10
+  data.tar.gz: 8eabc8fe99058e67f86f73ae885eaa0516af255e
 SHA512:
-  metadata.gz: 66cfa4d877d5052b66a2383ce764bcf9ba090126da8c2597639cd26fdb6831b3c8cf7fc8b930cae5eaf64175ebe484019b13e99c3c4bea0545914c2ab68665ac
-  data.tar.gz: 5f117c65ff5312fb6a231c39c725362750ae55a7b2d6ef42a3e1bdf4cddb2da5a41587d2cb51a5c1b17fe1bad7526e274a4d3b1eb6ab11af60a9b6913c781147
+  metadata.gz: f900b8e9eaa6343c43ee4abcbf54c6dd4d515c5417510a86aff924979be54be35d9efd53c16f08d0a6d11fbdf38fa0193ac966f45249c09ecbded549d30c049a
+  data.tar.gz: c948aacba2defb436e09bbf1146823f6705e1d9ff3dc21872064581e247c87adac06721fd74c375f2edb8db7de5eff9d4985d46f49687358bfe759860110a7b4

data/app/assets/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 4.10.0
+
+- Allow New Transport font stack to be overridden by apps using `$toolkit-font-stack`
+and `$toolkit-font-stack-tabular` (PR #230)
+
 # 4.9.1
 
 - Fix phase banner alignment (PR #266)

data/app/assets/VERSION.txt

@@ -1 +1 @@
-4.9.1
+4.10.0

data/app/assets/docs/mixins.md

@@ -286,6 +286,15 @@ A collection of font-mixins. There are two different types of font mixins.
    consistent baseline vertical grid.
 2. Core styles which are base font styles with no extra padding.
 
+#### Changing font
+
+Typography mixins use a “New Transport” font stack by default.
+
+If you are using the toolkit on projects that aren’t GOVUK branded you can
+override the font using two variables: `$toolkit-font-stack` and
+`$toolkit-font-stack-tabular`. These must be declared before they are used, eg by
+the core typography mixins.
+
 #### Heading and Copy styles
 
 The following heading and copy styles exist:

data/app/assets/stylesheets/_font_stack.scss

@@ -1,6 +1,5 @@
 //  GOV.UK font stacks, referred to in typography.scss
 
-
 //  Font stack weirdness
 //
 //  To ensure embedded fonts fall back to appropriate
@@ -14,22 +13,15 @@
 // scss-lint:disable NameFormat
 
 // New Transport Light
+$NTA-Light: "nta", Arial, sans-serif;
+$NTA-Light-Tabular: "ntatabularnumbers", $NTA-Light;
 
-$NTA-Light:
-  "nta",
-  Arial,
-  sans-serif;
-
-// New Transport Light with Tabular
-
-$NTA-Light-Tabular:
-  "ntatabularnumbers",
-  "nta",
-  Arial,
-  sans-serif;
+// Allow font stack to be overridden
+// Not all apps using toolkit use New Transport
+$toolkit-font-stack: $NTA-Light !default;
+$toolkit-font-stack-tabular: $NTA-Light-Tabular !default;
 
 // Helvetica Regular
-
 @font-face {
   font-family: GDS-Logo;
   src: local("HelveticaNeue"),
@@ -38,10 +30,7 @@ $NTA-Light-Tabular:
        local("Helvetica");
 }
 
-$Helvetica-Regular:
-  "GDS-Logo",
-  sans-serif;
+$Helvetica-Regular: "GDS-Logo", sans-serif;
 
 // Font reset for print
-
 $Print-reset: sans-serif;

data/app/assets/stylesheets/_typography.scss

@@ -22,11 +22,11 @@ $is-print: false !default;
 
 @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;
+    font-family: $toolkit-font-stack-tabular;
   } @else if $is-print {
     font-family: $Print-reset;
   } @else {
-    font-family: $NTA-Light;
+    font-family: $toolkit-font-stack;
   }
   font-size: $font-size-640;
   line-height: $line-height-640;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_frontend_toolkit
 version: !ruby/object:Gem::Version
-  version: 4.9.1
+  version: 4.10.0
 platform: ruby
 authors:
 - Bradley Wright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails