govuk_frontend_toolkit 4.9.1 → 4.10.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/assets/CHANGELOG.md +5 -0
- data/app/assets/VERSION.txt +1 -1
- data/app/assets/docs/mixins.md +9 -0
- data/app/assets/stylesheets/_font_stack.scss +7 -18
- data/app/assets/stylesheets/_typography.scss +2 -2
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1ea847b65179be950d4cf6f0eb2f3f4313d95b10
|
|
4
|
+
data.tar.gz: 8eabc8fe99058e67f86f73ae885eaa0516af255e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f900b8e9eaa6343c43ee4abcbf54c6dd4d515c5417510a86aff924979be54be35d9efd53c16f08d0a6d11fbdf38fa0193ac966f45249c09ecbded549d30c049a
|
|
7
|
+
data.tar.gz: c948aacba2defb436e09bbf1146823f6705e1d9ff3dc21872064581e247c87adac06721fd74c375f2edb8db7de5eff9d4985d46f49687358bfe759860110a7b4
|
data/app/assets/CHANGELOG.md
CHANGED
data/app/assets/VERSION.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
4.
|
|
1
|
+
4.10.0
|
data/app/assets/docs/mixins.md
CHANGED
|
@@ -286,6 +286,15 @@ A collection of font-mixins. There are two different types of font mixins.
|
|
|
286
286
|
consistent baseline vertical grid.
|
|
287
287
|
2. Core styles which are base font styles with no extra padding.
|
|
288
288
|
|
|
289
|
+
#### Changing font
|
|
290
|
+
|
|
291
|
+
Typography mixins use a “New Transport” font stack by default.
|
|
292
|
+
|
|
293
|
+
If you are using the toolkit on projects that aren’t GOVUK branded you can
|
|
294
|
+
override the font using two variables: `$toolkit-font-stack` and
|
|
295
|
+
`$toolkit-font-stack-tabular`. These must be declared before they are used, eg by
|
|
296
|
+
the core typography mixins.
|
|
297
|
+
|
|
289
298
|
#### Heading and Copy styles
|
|
290
299
|
|
|
291
300
|
The following heading and copy styles exist:
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
// GOV.UK font stacks, referred to in typography.scss
|
|
2
2
|
|
|
3
|
-
|
|
4
3
|
// Font stack weirdness
|
|
5
4
|
//
|
|
6
5
|
// To ensure embedded fonts fall back to appropriate
|
|
@@ -14,22 +13,15 @@
|
|
|
14
13
|
// scss-lint:disable NameFormat
|
|
15
14
|
|
|
16
15
|
// New Transport Light
|
|
16
|
+
$NTA-Light: "nta", Arial, sans-serif;
|
|
17
|
+
$NTA-Light-Tabular: "ntatabularnumbers", $NTA-Light;
|
|
17
18
|
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
// New Transport Light with Tabular
|
|
24
|
-
|
|
25
|
-
$NTA-Light-Tabular:
|
|
26
|
-
"ntatabularnumbers",
|
|
27
|
-
"nta",
|
|
28
|
-
Arial,
|
|
29
|
-
sans-serif;
|
|
19
|
+
// Allow font stack to be overridden
|
|
20
|
+
// Not all apps using toolkit use New Transport
|
|
21
|
+
$toolkit-font-stack: $NTA-Light !default;
|
|
22
|
+
$toolkit-font-stack-tabular: $NTA-Light-Tabular !default;
|
|
30
23
|
|
|
31
24
|
// Helvetica Regular
|
|
32
|
-
|
|
33
25
|
@font-face {
|
|
34
26
|
font-family: GDS-Logo;
|
|
35
27
|
src: local("HelveticaNeue"),
|
|
@@ -38,10 +30,7 @@ $NTA-Light-Tabular:
|
|
|
38
30
|
local("Helvetica");
|
|
39
31
|
}
|
|
40
32
|
|
|
41
|
-
$Helvetica-Regular:
|
|
42
|
-
"GDS-Logo",
|
|
43
|
-
sans-serif;
|
|
33
|
+
$Helvetica-Regular: "GDS-Logo", sans-serif;
|
|
44
34
|
|
|
45
35
|
// Font reset for print
|
|
46
|
-
|
|
47
36
|
$Print-reset: sans-serif;
|
|
@@ -22,11 +22,11 @@ $is-print: false !default;
|
|
|
22
22
|
|
|
23
23
|
@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) {
|
|
24
24
|
@if $tabular-numbers == true {
|
|
25
|
-
font-family: $
|
|
25
|
+
font-family: $toolkit-font-stack-tabular;
|
|
26
26
|
} @else if $is-print {
|
|
27
27
|
font-family: $Print-reset;
|
|
28
28
|
} @else {
|
|
29
|
-
font-family: $
|
|
29
|
+
font-family: $toolkit-font-stack;
|
|
30
30
|
}
|
|
31
31
|
font-size: $font-size-640;
|
|
32
32
|
line-height: $line-height-640;
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: govuk_frontend_toolkit
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 4.
|
|
4
|
+
version: 4.10.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Bradley Wright
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-
|
|
11
|
+
date: 2016-04-20 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|