From de66255eabf31845851da49737c901e0c1f40496 Mon Sep 17 00:00:00 2001 From: Denis Hernandez Date: Wed, 5 Jun 2019 11:38:14 +0100 Subject: [PATCH 1/6] Update Typography values --- .../utilities/gel-foundations/CHANGELOG.md | 1 + .../gel-foundations/package-lock.json | 2 +- .../utilities/gel-foundations/package.json | 2 +- .../src/scripts/arabic-pashto.js | 58 +++++++------- .../gel-foundations/src/scripts/arabic.js | 76 +++++++++---------- .../gel-foundations/src/scripts/bengali.js | 40 +++++----- .../gel-foundations/src/scripts/burmese.js | 44 +++++------ .../src/scripts/devanagari-and-gurmukhi.js | 16 ++-- .../src/scripts/latin-and-cyrillic.js | 6 +- .../src/scripts/latin-with-diacritics.js | 8 +- .../src/scripts/no-ascenders-or-descenders.js | 24 +++--- .../gel-foundations/src/scripts/sinhalese.js | 24 +++--- .../gel-foundations/src/scripts/tamil.js | 44 +++++------ .../gel-foundations/src/scripts/thai.js | 14 ++-- .../tests/getTypeSizes.test.js | 2 +- 15 files changed, 181 insertions(+), 180 deletions(-) diff --git a/packages/utilities/gel-foundations/CHANGELOG.md b/packages/utilities/gel-foundations/CHANGELOG.md index c9ce0ac81e..7c2e47ef12 100644 --- a/packages/utilities/gel-foundations/CHANGELOG.md +++ b/packages/utilities/gel-foundations/CHANGELOG.md @@ -2,6 +2,7 @@ | Version | Description | |---------|-------------| +| 2.1.0 | [PR#XXX](https://github.com/bbc/psammead/pull/XXX) Update GEL Types values | | 2.0.0 | [PR#517](https://github.com/bbc/psammead/pull/517) Remove unused GEL Types | | 1.2.0 | [PR#431](https://github.com/bbc/psammead/pull/431) Add custom scripts propTypes | | 1.1.0 | [PR#424](https://github.com/bbc/psammead/pull/424) Add Snyk badge to readme | diff --git a/packages/utilities/gel-foundations/package-lock.json b/packages/utilities/gel-foundations/package-lock.json index fbc0430567..a4cf09c6c1 100644 --- a/packages/utilities/gel-foundations/package-lock.json +++ b/packages/utilities/gel-foundations/package-lock.json @@ -1,6 +1,6 @@ { "name": "@bbc/gel-foundations", - "version": "2.0.0", + "version": "2.1.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/utilities/gel-foundations/package.json b/packages/utilities/gel-foundations/package.json index 300a0fd4a5..3c8bde8a43 100644 --- a/packages/utilities/gel-foundations/package.json +++ b/packages/utilities/gel-foundations/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/gel-foundations", - "version": "2.0.0", + "version": "2.1.0", "description": "A range of string constants for use in CSS, intended to help implement BBC GEL-compliant webpages and components.", "repository": { "type": "git", diff --git a/packages/utilities/gel-foundations/src/scripts/arabic-pashto.js b/packages/utilities/gel-foundations/src/scripts/arabic-pashto.js index 9e08800cda..e4c20e8292 100644 --- a/packages/utilities/gel-foundations/src/scripts/arabic-pashto.js +++ b/packages/utilities/gel-foundations/src/scripts/arabic-pashto.js @@ -5,7 +5,7 @@ const arabicPashtoTypography = { lineHeight: '42', }, groupB: { - fontSize: '36', + fontSize: '38', lineHeight: '46', }, groupD: { @@ -19,12 +19,12 @@ const arabicPashtoTypography = { lineHeight: '34', }, groupB: { - fontSize: '26', - lineHeight: '36', + fontSize: '32', + lineHeight: '38', }, groupD: { - fontSize: '38', - lineHeight: '48', + fontSize: '36', + lineHeight: '50', }, }, paragon: { @@ -34,25 +34,25 @@ const arabicPashtoTypography = { }, groupB: { fontSize: '28', - lineHeight: '38', + lineHeight: '40', }, groupD: { - fontSize: '34', - lineHeight: '44', + fontSize: '32', + lineHeight: '40', }, }, doublePica: { groupA: { fontSize: '24', - lineHeight: '34', + lineHeight: '32', }, groupB: { fontSize: '26', lineHeight: '36', }, groupD: { - fontSize: '30', - lineHeight: '40', + fontSize: '28', + lineHeight: '36', }, }, greatPrimer: { @@ -62,11 +62,11 @@ const arabicPashtoTypography = { }, groupB: { fontSize: '24', - lineHeight: '30', + lineHeight: '32', }, groupD: { fontSize: '26', - lineHeight: '32', + lineHeight: '34', }, }, bodyCopy: { @@ -76,11 +76,11 @@ const arabicPashtoTypography = { }, groupB: { fontSize: '20', - lineHeight: '30', + lineHeight: '32', }, groupD: { fontSize: '22', - lineHeight: '34', + lineHeight: '32', }, }, pica: { @@ -89,12 +89,12 @@ const arabicPashtoTypography = { lineHeight: '26', }, groupB: { - fontSize: '16', + fontSize: '20', lineHeight: '26', }, groupD: { - fontSize: '22', - lineHeight: '32', + fontSize: '20', + lineHeight: '26', }, }, longPrimer: { @@ -107,8 +107,8 @@ const arabicPashtoTypography = { lineHeight: '24', }, groupD: { - fontSize: '20', - lineHeight: '26', + fontSize: '18', + lineHeight: '24', }, }, brevier: { @@ -117,26 +117,26 @@ const arabicPashtoTypography = { lineHeight: '20', }, groupB: { - fontSize: '16', - lineHeight: '20', + fontSize: '18', + lineHeight: '24', }, groupD: { fontSize: '18', - lineHeight: '22', + lineHeight: '24', }, }, minion: { groupA: { - fontSize: '14', - lineHeight: '20', + fontSize: '12', + lineHeight: '16', }, groupB: { - fontSize: '14', - lineHeight: '20', + fontSize: '12', + lineHeight: '16', }, groupD: { - fontSize: '14', - lineHeight: '20', + fontSize: '12', + lineHeight: '16', }, }, }; diff --git a/packages/utilities/gel-foundations/src/scripts/arabic.js b/packages/utilities/gel-foundations/src/scripts/arabic.js index 5195a9a1d9..f30a21c001 100644 --- a/packages/utilities/gel-foundations/src/scripts/arabic.js +++ b/packages/utilities/gel-foundations/src/scripts/arabic.js @@ -5,7 +5,7 @@ const arabicTypography = { lineHeight: '42', }, groupB: { - fontSize: '36', + fontSize: '38', lineHeight: '46', }, groupD: { @@ -19,26 +19,26 @@ const arabicTypography = { lineHeight: '34', }, groupB: { - fontSize: '26', - lineHeight: '36', + fontSize: '32', + lineHeight: '38', }, groupD: { - fontSize: '38', - lineHeight: '48', + fontSize: '36', + lineHeight: '50', }, }, paragon: { groupA: { - fontSize: '20', + fontSize: '24', lineHeight: '30', }, groupB: { - fontSize: '24', - lineHeight: '34', + fontSize: '28', + lineHeight: '40', }, groupD: { - fontSize: '34', - lineHeight: '44', + fontSize: '32', + lineHeight: '40', }, }, doublePica: { @@ -47,26 +47,26 @@ const arabicTypography = { lineHeight: '32', }, groupB: { - fontSize: '24', - lineHeight: '28', + fontSize: '26', + lineHeight: '36', }, groupD: { - fontSize: '24', - lineHeight: '28', + fontSize: '28', + lineHeight: '36', }, }, greatPrimer: { groupA: { - fontSize: '18', - lineHeight: '26', + fontSize: '22', + lineHeight: '28', }, groupB: { - fontSize: '20', - lineHeight: '24', + fontSize: '24', + lineHeight: '32', }, groupD: { - fontSize: '20', - lineHeight: '26', + fontSize: '26', + lineHeight: '34', }, }, bodyCopy: { @@ -75,12 +75,12 @@ const arabicTypography = { lineHeight: '28', }, groupB: { - fontSize: '20', - lineHeight: '30', + fontSize: '22', + lineHeight: '32', }, groupD: { fontSize: '22', - lineHeight: '34', + lineHeight: '32', }, }, pica: { @@ -89,12 +89,12 @@ const arabicTypography = { lineHeight: '26', }, groupB: { - fontSize: '18', - lineHeight: '24', + fontSize: '20', + lineHeight: '26', }, groupD: { - fontSize: '22', - lineHeight: '28', + fontSize: '20', + lineHeight: '26', }, }, longPrimer: { @@ -107,8 +107,8 @@ const arabicTypography = { lineHeight: '24', }, groupD: { - fontSize: '20', - lineHeight: '26', + fontSize: '18', + lineHeight: '24', }, }, brevier: { @@ -117,26 +117,26 @@ const arabicTypography = { lineHeight: '20', }, groupB: { - fontSize: '16', - lineHeight: '20', + fontSize: '18', + lineHeight: '24', }, groupD: { fontSize: '18', - lineHeight: '22', + lineHeight: '24', }, }, minion: { groupA: { - fontSize: '14', - lineHeight: '20', + fontSize: '12', + lineHeight: '16', }, groupB: { - fontSize: '14', - lineHeight: '20', + fontSize: '12', + lineHeight: '16', }, groupD: { - fontSize: '14', - lineHeight: '20', + fontSize: '12', + lineHeight: '16', }, }, }; diff --git a/packages/utilities/gel-foundations/src/scripts/bengali.js b/packages/utilities/gel-foundations/src/scripts/bengali.js index e55ee360a2..a11d4d1be8 100644 --- a/packages/utilities/gel-foundations/src/scripts/bengali.js +++ b/packages/utilities/gel-foundations/src/scripts/bengali.js @@ -15,11 +15,11 @@ const bengaliTypography = { }, trafalgar: { groupA: { - fontSize: '20', - lineHeight: '30', + fontSize: '28', + lineHeight: '32', }, groupB: { - fontSize: '26', + fontSize: '32', lineHeight: '36', }, groupD: { @@ -29,36 +29,36 @@ const bengaliTypography = { }, paragon: { groupA: { - fontSize: '22', - lineHeight: '28', + fontSize: '26', + lineHeight: '30', }, groupB: { - fontSize: '22', - lineHeight: '28', + fontSize: '28', + lineHeight: '32', }, groupD: { - fontSize: '28', - lineHeight: '36', + fontSize: '32', + lineHeight: '40', }, }, doublePica: { groupA: { - fontSize: '20', + fontSize: '26', lineHeight: '30', }, groupB: { - fontSize: '20', + fontSize: '26', lineHeight: '30', }, groupD: { - fontSize: '32', - lineHeight: '40', + fontSize: '28', + lineHeight: '32', }, }, greatPrimer: { groupA: { - fontSize: '24', - lineHeight: '30', + fontSize: '22', + lineHeight: '28', }, groupB: { fontSize: '24', @@ -66,7 +66,7 @@ const bengaliTypography = { }, groupD: { fontSize: '26', - lineHeight: '32', + lineHeight: '30', }, }, bodyCopy: { @@ -75,8 +75,8 @@ const bengaliTypography = { lineHeight: '23', }, groupB: { - fontSize: '16', - lineHeight: '22', + fontSize: '20', + lineHeight: '26', }, groupD: { fontSize: '22', @@ -93,8 +93,8 @@ const bengaliTypography = { lineHeight: '23', }, groupD: { - fontSize: '22', - lineHeight: '28', + fontSize: '20', + lineHeight: '24', }, }, longPrimer: { diff --git a/packages/utilities/gel-foundations/src/scripts/burmese.js b/packages/utilities/gel-foundations/src/scripts/burmese.js index 703b049e3d..62975c48a7 100644 --- a/packages/utilities/gel-foundations/src/scripts/burmese.js +++ b/packages/utilities/gel-foundations/src/scripts/burmese.js @@ -15,16 +15,16 @@ const burmeseTypography = { }, trafalgar: { groupA: { - fontSize: '18', - lineHeight: '28', + fontSize: '20', + lineHeight: '30', }, groupB: { - fontSize: '22', - lineHeight: '30', + fontSize: '24', + lineHeight: '36', }, groupD: { - fontSize: '28', - lineHeight: '42', + fontSize: '38', + lineHeight: '60', }, }, paragon: { @@ -34,11 +34,11 @@ const burmeseTypography = { }, groupB: { fontSize: '22', - lineHeight: '32', + lineHeight: '30', }, groupD: { fontSize: '28', - lineHeight: '42', + lineHeight: '48', }, }, doublePica: { @@ -51,22 +51,22 @@ const burmeseTypography = { lineHeight: '30', }, groupD: { - fontSize: '24', - lineHeight: '36', + fontSize: '26', + lineHeight: '44', }, }, greatPrimer: { groupA: { - fontSize: '18', - lineHeight: '28', + fontSize: '16', + lineHeight: '26', }, groupB: { fontSize: '18', - lineHeight: '30', + lineHeight: '28', }, groupD: { - fontSize: '20', - lineHeight: '30', + fontSize: '22', + lineHeight: '32', }, }, bodyCopy: { @@ -79,22 +79,22 @@ const burmeseTypography = { lineHeight: '28', }, groupD: { - fontSize: '16', - lineHeight: '30', + fontSize: '18', + lineHeight: '32', }, }, pica: { groupA: { fontSize: '15', - lineHeight: '20', + lineHeight: '25', }, groupB: { fontSize: '16', - lineHeight: '26', + lineHeight: '28', }, groupD: { fontSize: '16', - lineHeight: '28', + lineHeight: '30', }, }, longPrimer: { @@ -104,11 +104,11 @@ const burmeseTypography = { }, groupB: { fontSize: '15', - lineHeight: '24', + lineHeight: '25', }, groupD: { fontSize: '15', - lineHeight: '24', + lineHeight: '25', }, }, brevier: { diff --git a/packages/utilities/gel-foundations/src/scripts/devanagari-and-gurmukhi.js b/packages/utilities/gel-foundations/src/scripts/devanagari-and-gurmukhi.js index 3d9c1b11a5..52d126da87 100644 --- a/packages/utilities/gel-foundations/src/scripts/devanagari-and-gurmukhi.js +++ b/packages/utilities/gel-foundations/src/scripts/devanagari-and-gurmukhi.js @@ -34,7 +34,7 @@ const devanagariAndGurmukhiTypography = { paragon: { groupA: { fontSize: '20', - lineHeight: '30', + lineHeight: '28', }, groupB: { fontSize: '22', @@ -48,21 +48,21 @@ const devanagariAndGurmukhiTypography = { doublePica: { groupA: { fontSize: '20', - lineHeight: '30', + lineHeight: '28', }, groupB: { fontSize: '20', - lineHeight: '30', + lineHeight: '28', }, groupD: { fontSize: '24', - lineHeight: '32', + lineHeight: '36', }, }, greatPrimer: { groupA: { - fontSize: '18', - lineHeight: '26', + fontSize: '16', + lineHeight: '22', }, groupB: { fontSize: '18', @@ -97,8 +97,8 @@ const devanagariAndGurmukhiTypography = { lineHeight: '24', }, groupD: { - fontSize: '18', - lineHeight: '26', + fontSize: '16', + lineHeight: '22', }, }, longPrimer: { diff --git a/packages/utilities/gel-foundations/src/scripts/latin-and-cyrillic.js b/packages/utilities/gel-foundations/src/scripts/latin-and-cyrillic.js index f434fbf633..5310692a13 100644 --- a/packages/utilities/gel-foundations/src/scripts/latin-and-cyrillic.js +++ b/packages/utilities/gel-foundations/src/scripts/latin-and-cyrillic.js @@ -46,8 +46,8 @@ const latinAndCyrillicTypography = { }, doublePica: { groupA: { - fontSize: '20', - lineHeight: '24', + fontSize: '18', + lineHeight: '22', }, groupB: { fontSize: '20', @@ -117,7 +117,7 @@ const latinAndCyrillicTypography = { brevier: { groupA: { fontSize: '14', - lineHeight: '16', + lineHeight: '18', }, groupB: { fontSize: '14', diff --git a/packages/utilities/gel-foundations/src/scripts/latin-with-diacritics.js b/packages/utilities/gel-foundations/src/scripts/latin-with-diacritics.js index 22f23fa106..a6f332d40d 100644 --- a/packages/utilities/gel-foundations/src/scripts/latin-with-diacritics.js +++ b/packages/utilities/gel-foundations/src/scripts/latin-with-diacritics.js @@ -13,8 +13,8 @@ const latinWithDiacriticsTypography = { lineHeight: '28', }, groupD: { - fontSize: '38', - lineHeight: '42', + fontSize: '44', + lineHeight: '52', }, }, trafalgar: { @@ -104,11 +104,11 @@ const latinWithDiacriticsTypography = { longPrimer: { groupA: { fontSize: '15', - lineHeight: '18', + lineHeight: '20', }, groupB: { fontSize: '15', - lineHeight: '18', + lineHeight: '20', }, groupD: { fontSize: '14', diff --git a/packages/utilities/gel-foundations/src/scripts/no-ascenders-or-descenders.js b/packages/utilities/gel-foundations/src/scripts/no-ascenders-or-descenders.js index f00bba17ca..cd13c21a89 100644 --- a/packages/utilities/gel-foundations/src/scripts/no-ascenders-or-descenders.js +++ b/packages/utilities/gel-foundations/src/scripts/no-ascenders-or-descenders.js @@ -15,13 +15,13 @@ const noAscOrDescTypography = { }, trafalgar: { groupA: { - fontSize: '20', - lineHeight: '26', - }, - groupB: { fontSize: '24', lineHeight: '30', }, + groupB: { + fontSize: '26', + lineHeight: '32', + }, groupD: { fontSize: '32', lineHeight: '42', @@ -29,15 +29,15 @@ const noAscOrDescTypography = { }, paragon: { groupA: { - fontSize: '24', - lineHeight: '30', + fontSize: '20', + lineHeight: '26', }, groupB: { - fontSize: '26', - lineHeight: '32', + fontSize: '24', + lineHeight: '30', }, groupD: { - fontSize: '30', + fontSize: '28', lineHeight: '38', }, }, @@ -57,8 +57,8 @@ const noAscOrDescTypography = { }, greatPrimer: { groupA: { - fontSize: '18', - lineHeight: '24', + fontSize: '16', + lineHeight: '22', }, groupB: { fontSize: '18', @@ -66,7 +66,7 @@ const noAscOrDescTypography = { }, groupD: { fontSize: '20', - lineHeight: '30', + lineHeight: '24', }, }, bodyCopy: { diff --git a/packages/utilities/gel-foundations/src/scripts/sinhalese.js b/packages/utilities/gel-foundations/src/scripts/sinhalese.js index 312624fa12..1485ac3349 100644 --- a/packages/utilities/gel-foundations/src/scripts/sinhalese.js +++ b/packages/utilities/gel-foundations/src/scripts/sinhalese.js @@ -19,8 +19,8 @@ const sinhaleseTypography = { lineHeight: '24', }, groupB: { - fontSize: '28', - lineHeight: '28', + fontSize: '32', + lineHeight: '36', }, groupD: { fontSize: '40', @@ -33,26 +33,26 @@ const sinhaleseTypography = { lineHeight: '24', }, groupB: { - fontSize: '24', - lineHeight: '24', + fontSize: '28', + lineHeight: '32', }, groupD: { fontSize: '34', - lineHeight: '36', + lineHeight: '38', }, }, doublePica: { groupA: { - fontSize: '24', - lineHeight: '24', + fontSize: '22', + lineHeight: '22', }, groupB: { - fontSize: '24', - lineHeight: '24', + fontSize: '26', + lineHeight: '30', }, groupD: { fontSize: '30', - lineHeight: '30', + lineHeight: '34', }, }, greatPrimer: { @@ -80,13 +80,13 @@ const sinhaleseTypography = { }, groupD: { fontSize: '22', - lineHeight: '24', + lineHeight: '28', }, }, pica: { groupA: { fontSize: '22', - lineHeight: '24', + lineHeight: '28', }, groupB: { fontSize: '22', diff --git a/packages/utilities/gel-foundations/src/scripts/tamil.js b/packages/utilities/gel-foundations/src/scripts/tamil.js index ef8507e62c..490c2be4a8 100644 --- a/packages/utilities/gel-foundations/src/scripts/tamil.js +++ b/packages/utilities/gel-foundations/src/scripts/tamil.js @@ -19,54 +19,54 @@ const tamilTypography = { lineHeight: '24', }, groupB: { - fontSize: '18', - lineHeight: '26', - }, - groupD: { fontSize: '22', lineHeight: '30', }, + groupD: { + fontSize: '28', + lineHeight: '38', + }, }, paragon: { groupA: { - fontSize: '18', - lineHeight: '26', + fontSize: '16', + lineHeight: '24', }, groupB: { fontSize: '18', lineHeight: '26', }, groupD: { - fontSize: '20', - lineHeight: '28', + fontSize: '22', + lineHeight: '30', }, }, doublePica: { groupA: { - fontSize: '16', - lineHeight: '24', + fontSize: '14', + lineHeight: '22', }, groupB: { fontSize: '16', lineHeight: '24', }, groupD: { - fontSize: '16', - lineHeight: '24', + fontSize: '18', + lineHeight: '26', }, }, greatPrimer: { groupA: { - fontSize: '14', - lineHeight: '21', + fontSize: '12', + lineHeight: '20', }, groupB: { - fontSize: '13', - lineHeight: '20', + fontSize: '14', + lineHeight: '24', }, groupD: { - fontSize: '14', - lineHeight: '21', + fontSize: '16', + lineHeight: '24', }, }, bodyCopy: { @@ -75,7 +75,7 @@ const tamilTypography = { lineHeight: '22', }, groupB: { - fontSize: '13', + fontSize: '14', lineHeight: '22', }, groupD: { @@ -89,12 +89,12 @@ const tamilTypography = { lineHeight: '21', }, groupB: { - fontSize: '13', - lineHeight: '20', + fontSize: '14', + lineHeight: '22', }, groupD: { fontSize: '14', - lineHeight: '21', + lineHeight: '22', }, }, longPrimer: { diff --git a/packages/utilities/gel-foundations/src/scripts/thai.js b/packages/utilities/gel-foundations/src/scripts/thai.js index b61e09eed5..96f8bdd224 100644 --- a/packages/utilities/gel-foundations/src/scripts/thai.js +++ b/packages/utilities/gel-foundations/src/scripts/thai.js @@ -9,7 +9,7 @@ const thaiTypography = { lineHeight: '42', }, groupD: { - fontSize: '44', + fontSize: '46', lineHeight: '58', }, }, @@ -57,8 +57,8 @@ const thaiTypography = { }, greatPrimer: { groupA: { - fontSize: '18', - lineHeight: '24', + fontSize: '16', + lineHeight: '20', }, groupB: { fontSize: '18', @@ -86,15 +86,15 @@ const thaiTypography = { pica: { groupA: { fontSize: '16', - lineHeight: '22', + lineHeight: '20', }, groupB: { fontSize: '16', - lineHeight: '24', + lineHeight: '22', }, groupD: { - fontSize: '18', - lineHeight: '28', + fontSize: '16', + lineHeight: '22', }, }, longPrimer: { diff --git a/packages/utilities/gel-foundations/tests/getTypeSizes.test.js b/packages/utilities/gel-foundations/tests/getTypeSizes.test.js index 58f8679224..cd729d3279 100644 --- a/packages/utilities/gel-foundations/tests/getTypeSizes.test.js +++ b/packages/utilities/gel-foundations/tests/getTypeSizes.test.js @@ -10,7 +10,7 @@ describe('getTypeSizes', () => { line-height: 2.625rem; ${MEDIA_QUERY_TYPOGRAPHY.SMART_PHONE_ONLY} { - font-size: 2.25rem; + font-size: 2.375rem; line-height: 2.875rem; } From 0e3d80596924aa87a4ab1882f112cf4de2f6d030 Mon Sep 17 00:00:00 2001 From: Denis Hernandez Date: Wed, 5 Jun 2019 11:45:05 +0100 Subject: [PATCH 2/6] Update PR number --- .../utilities/gel-foundations/CHANGELOG.md | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/packages/utilities/gel-foundations/CHANGELOG.md b/packages/utilities/gel-foundations/CHANGELOG.md index 7c2e47ef12..ee46016169 100644 --- a/packages/utilities/gel-foundations/CHANGELOG.md +++ b/packages/utilities/gel-foundations/CHANGELOG.md @@ -1,20 +1,19 @@ # Gel Foundations Changelog -| Version | Description | -|---------|-------------| -| 2.1.0 | [PR#XXX](https://github.com/bbc/psammead/pull/XXX) Update GEL Types values | -| 2.0.0 | [PR#517](https://github.com/bbc/psammead/pull/517) Remove unused GEL Types | -| 1.2.0 | [PR#431](https://github.com/bbc/psammead/pull/431) Add custom scripts propTypes | -| 1.1.0 | [PR#424](https://github.com/bbc/psammead/pull/424) Add Snyk badge to readme | -| 1.0.0 | [PR#353](https://github.com/BBC/psammead/pull/353) Add support for different scripts typographies | -| 0.3.0 | [PR#360](https://github.com/BBC/psammead/pull/360) Move to using rems for breakpoints | -| 0.2.5 | [PR#349](https://github.com/BBC/psammead/pull/349) Add GEL Group A breakpoint | -| 0.2.4 | [PR#323](https://github.com/BBC/psammead/pull/323) Update readme storybook badge | -| 0.2.3 | [PR#264](https://github.com/BBC/psammead/pull/319) Resolving package-lock issues. | -| 0.2.2 | [PR#304](https://github.com/BBC-News/psammead/pull/304) Add font family definitions, which include GEL-defined font fallbacks. | -| 0.2.1 | [PR#303](https://github.com/BBC-News/psammead/pull/303) Bump to ensure correct build is published | -| 0.2.0 | [PR#290](https://github.com/BBC-News/psammead/pull/290) Move typography font-sizes to use rem instead of em | -| 0.1.4 | [PR#224](https://github.com/BBC-News/psammead/pull/224) Add tests for the exported values, coverage 100% :tada: | -| 0.1.1 | [PR#212](https://github.com/BBC-News/psammead/pull/212) Update package description and README. | +| Version | Description | +| ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| 2.1.0 | [PR#586](https://github.com/bbc/psammead/pull/586) Update GEL Types values | +| 2.0.0 | [PR#517](https://github.com/bbc/psammead/pull/517) Remove unused GEL Types | +| 1.2.0 | [PR#431](https://github.com/bbc/psammead/pull/431) Add custom scripts propTypes | +| 1.1.0 | [PR#424](https://github.com/bbc/psammead/pull/424) Add Snyk badge to readme | +| 1.0.0 | [PR#353](https://github.com/BBC/psammead/pull/353) Add support for different scripts typographies | +| 0.3.0 | [PR#360](https://github.com/BBC/psammead/pull/360) Move to using rems for breakpoints | +| 0.2.5 | [PR#349](https://github.com/BBC/psammead/pull/349) Add GEL Group A breakpoint | +| 0.2.4 | [PR#323](https://github.com/BBC/psammead/pull/323) Update readme storybook badge | +| 0.2.3 | [PR#264](https://github.com/BBC/psammead/pull/319) Resolving package-lock issues. | +| 0.2.2 | [PR#304](https://github.com/BBC-News/psammead/pull/304) Add font family definitions, which include GEL-defined font fallbacks. | +| 0.2.1 | [PR#303](https://github.com/BBC-News/psammead/pull/303) Bump to ensure correct build is published | +| 0.2.0 | [PR#290](https://github.com/BBC-News/psammead/pull/290) Move typography font-sizes to use rem instead of em | +| 0.1.4 | [PR#224](https://github.com/BBC-News/psammead/pull/224) Add tests for the exported values, coverage 100% :tada: | +| 0.1.1 | [PR#212](https://github.com/BBC-News/psammead/pull/212) Update package description and README. | | 0.1.0 | [PR#221](https://github.com/BBC-News/psammead/pull/221) Create initial package, pulled in from gel-constants and gel-foundations-styled-components packages. | - From 80631e46091a14bfeda827e77458580986db0ab5 Mon Sep 17 00:00:00 2001 From: Denis Hernandez Date: Fri, 7 Jun 2019 10:46:45 +0100 Subject: [PATCH 3/6] Update latin diacritics values --- .../src/scripts/latin-with-diacritics.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/utilities/gel-foundations/src/scripts/latin-with-diacritics.js b/packages/utilities/gel-foundations/src/scripts/latin-with-diacritics.js index a6f332d40d..b3c6280f48 100644 --- a/packages/utilities/gel-foundations/src/scripts/latin-with-diacritics.js +++ b/packages/utilities/gel-foundations/src/scripts/latin-with-diacritics.js @@ -9,8 +9,8 @@ const latinWithDiacriticsTypography = { lineHeight: '32', }, groupB: { - fontSize: '24', - lineHeight: '28', + fontSize: '32', + lineHeight: '38', }, groupD: { fontSize: '44', @@ -23,12 +23,12 @@ const latinWithDiacriticsTypography = { lineHeight: '24', }, groupB: { - fontSize: '22', - lineHeight: '26', + fontSize: '24', + lineHeight: '30', }, groupD: { - fontSize: '30', - lineHeight: '34', + fontSize: '32', + lineHeight: '38', }, }, paragon: { @@ -38,11 +38,11 @@ const latinWithDiacriticsTypography = { }, groupB: { fontSize: '22', - lineHeight: '26', + lineHeight: '28', }, groupD: { fontSize: '28', - lineHeight: '32', + lineHeight: '34', }, }, doublePica: { @@ -56,7 +56,7 @@ const latinWithDiacriticsTypography = { }, groupD: { fontSize: '24', - lineHeight: '28', + lineHeight: '30', }, }, greatPrimer: { From afb11aa295a05f888c5634cc6f5ca3bda22678d7 Mon Sep 17 00:00:00 2001 From: Denis Hernandez Date: Tue, 11 Jun 2019 19:09:42 +0100 Subject: [PATCH 4/6] Update Tamil values --- .../utilities/gel-foundations/src/scripts/tamil.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/utilities/gel-foundations/src/scripts/tamil.js b/packages/utilities/gel-foundations/src/scripts/tamil.js index 490c2be4a8..2558f0aa3c 100644 --- a/packages/utilities/gel-foundations/src/scripts/tamil.js +++ b/packages/utilities/gel-foundations/src/scripts/tamil.js @@ -57,8 +57,8 @@ const tamilTypography = { }, greatPrimer: { groupA: { - fontSize: '12', - lineHeight: '20', + fontSize: '13', + lineHeight: '22', }, groupB: { fontSize: '14', @@ -71,12 +71,12 @@ const tamilTypography = { }, bodyCopy: { groupA: { - fontSize: '13', - lineHeight: '22', + fontSize: '12', + lineHeight: '20', }, groupB: { fontSize: '14', - lineHeight: '22', + lineHeight: '24', }, groupD: { fontSize: '14', @@ -85,8 +85,8 @@ const tamilTypography = { }, pica: { groupA: { - fontSize: '14', - lineHeight: '21', + fontSize: '12', + lineHeight: '20', }, groupB: { fontSize: '14', From c7a346e62f636ab32cd2d597214875c415ecd9a7 Mon Sep 17 00:00:00 2001 From: Denis Hernandez Date: Wed, 12 Jun 2019 10:11:43 +0100 Subject: [PATCH 5/6] Add prettier ignore to the CHANGELOG --- .../utilities/gel-foundations/CHANGELOG.md | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/packages/utilities/gel-foundations/CHANGELOG.md b/packages/utilities/gel-foundations/CHANGELOG.md index ee46016169..9b7a819cbd 100644 --- a/packages/utilities/gel-foundations/CHANGELOG.md +++ b/packages/utilities/gel-foundations/CHANGELOG.md @@ -1,19 +1,20 @@ # Gel Foundations Changelog -| Version | Description | -| ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| 2.1.0 | [PR#586](https://github.com/bbc/psammead/pull/586) Update GEL Types values | -| 2.0.0 | [PR#517](https://github.com/bbc/psammead/pull/517) Remove unused GEL Types | -| 1.2.0 | [PR#431](https://github.com/bbc/psammead/pull/431) Add custom scripts propTypes | -| 1.1.0 | [PR#424](https://github.com/bbc/psammead/pull/424) Add Snyk badge to readme | -| 1.0.0 | [PR#353](https://github.com/BBC/psammead/pull/353) Add support for different scripts typographies | -| 0.3.0 | [PR#360](https://github.com/BBC/psammead/pull/360) Move to using rems for breakpoints | -| 0.2.5 | [PR#349](https://github.com/BBC/psammead/pull/349) Add GEL Group A breakpoint | -| 0.2.4 | [PR#323](https://github.com/BBC/psammead/pull/323) Update readme storybook badge | -| 0.2.3 | [PR#264](https://github.com/BBC/psammead/pull/319) Resolving package-lock issues. | -| 0.2.2 | [PR#304](https://github.com/BBC-News/psammead/pull/304) Add font family definitions, which include GEL-defined font fallbacks. | -| 0.2.1 | [PR#303](https://github.com/BBC-News/psammead/pull/303) Bump to ensure correct build is published | -| 0.2.0 | [PR#290](https://github.com/BBC-News/psammead/pull/290) Move typography font-sizes to use rem instead of em | -| 0.1.4 | [PR#224](https://github.com/BBC-News/psammead/pull/224) Add tests for the exported values, coverage 100% :tada: | -| 0.1.1 | [PR#212](https://github.com/BBC-News/psammead/pull/212) Update package description and README. | -| 0.1.0 | [PR#221](https://github.com/BBC-News/psammead/pull/221) Create initial package, pulled in from gel-constants and gel-foundations-styled-components packages. | + +| Version | Description | +|---------|-------------| +| 2.1.0 | [PR#586](https://github.com/bbc/psammead/pull/586) Update GEL Types values | +| 2.0.0 | [PR#517](https://github.com/bbc/psammead/pull/517) Remove unused GEL Types | +| 1.2.0 | [PR#431](https://github.com/bbc/psammead/pull/431) Add custom scripts propTypes | +| 1.1.0 | [PR#424](https://github.com/bbc/psammead/pull/424) Add Snyk badge to readme | +| 1.0.0 | [PR#353](https://github.com/BBC/psammead/pull/353) Add support for different scripts typographies | +| 0.3.0 | [PR#360](https://github.com/BBC/psammead/pull/360) Move to using rems for breakpoints | +| 0.2.5 | [PR#349](https://github.com/BBC/psammead/pull/349) Add GEL Group A breakpoint | +| 0.2.4 | [PR#323](https://github.com/BBC/psammead/pull/323) Update readme storybook badge | +| 0.2.3 | [PR#264](https://github.com/BBC/psammead/pull/319) Resolving package-lock issues. | +| 0.2.2 | [PR#304](https://github.com/BBC-News/psammead/pull/304) Add font family definitions, which include GEL-defined font fallbacks. | +| 0.2.1 | [PR#303](https://github.com/BBC-News/psammead/pull/303) Bump to ensure correct build is published | +| 0.2.0 | [PR#290](https://github.com/BBC-News/psammead/pull/290) Move typography font-sizes to use rem instead of em | +| 0.1.4 | [PR#224](https://github.com/BBC-News/psammead/pull/224) Add tests for the exported values, coverage 100% :tada: | +| 0.1.1 | [PR#212](https://github.com/BBC-News/psammead/pull/212) Update package description and README. | +| 0.1.0 | [PR#221](https://github.com/BBC-News/psammead/pull/221) Create initial package, pulled in from gel-constants and gel-foundations-styled-components packages. | From 6ab3b56f87dcb8cf821b6a3770beabb241e4a3e0 Mon Sep 17 00:00:00 2001 From: Denis Hernandez Date: Wed, 12 Jun 2019 13:32:21 +0100 Subject: [PATCH 6/6] Bump major version --- packages/utilities/gel-foundations/CHANGELOG.md | 2 +- packages/utilities/gel-foundations/package-lock.json | 2 +- packages/utilities/gel-foundations/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/utilities/gel-foundations/CHANGELOG.md b/packages/utilities/gel-foundations/CHANGELOG.md index 9b7a819cbd..ec447acd04 100644 --- a/packages/utilities/gel-foundations/CHANGELOG.md +++ b/packages/utilities/gel-foundations/CHANGELOG.md @@ -3,7 +3,7 @@ | Version | Description | |---------|-------------| -| 2.1.0 | [PR#586](https://github.com/bbc/psammead/pull/586) Update GEL Types values | +| 3.0.0 | [PR#586](https://github.com/bbc/psammead/pull/586) Update GEL Types values | | 2.0.0 | [PR#517](https://github.com/bbc/psammead/pull/517) Remove unused GEL Types | | 1.2.0 | [PR#431](https://github.com/bbc/psammead/pull/431) Add custom scripts propTypes | | 1.1.0 | [PR#424](https://github.com/bbc/psammead/pull/424) Add Snyk badge to readme | diff --git a/packages/utilities/gel-foundations/package-lock.json b/packages/utilities/gel-foundations/package-lock.json index a4cf09c6c1..9f5fed77de 100644 --- a/packages/utilities/gel-foundations/package-lock.json +++ b/packages/utilities/gel-foundations/package-lock.json @@ -1,6 +1,6 @@ { "name": "@bbc/gel-foundations", - "version": "2.1.0", + "version": "3.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/utilities/gel-foundations/package.json b/packages/utilities/gel-foundations/package.json index 3c8bde8a43..b763a8385b 100644 --- a/packages/utilities/gel-foundations/package.json +++ b/packages/utilities/gel-foundations/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/gel-foundations", - "version": "2.1.0", + "version": "3.0.0", "description": "A range of string constants for use in CSS, intended to help implement BBC GEL-compliant webpages and components.", "repository": { "type": "git",