diff --git a/CSS_VARIABLES.md b/CSS_VARIABLES.md
index 9f77e28e5..49cee7268 100644
--- a/CSS_VARIABLES.md
+++ b/CSS_VARIABLES.md
@@ -36,7 +36,6 @@ the old CSS Variables, please upgrade. Currently we have a compatibility layer t
- font-weight-primary
- font-weight-secondary
- font-size
- - line-height
- shadow
- spacing
- mini-unit
@@ -192,17 +191,17 @@ Different font weights with matching values for the fonts.
#### font-weight-primary
-`--font-weight-primary-bold: 700; /* Before 6.3.0: --font-weight-sans-bold */`
+`--font-weight-primary-bold: 700; /* Before 6.3.0: --font-weight-bold */`
-`--font-weight-primary-semi-bold: 600; /* Before 6.3.0: --font-weight-sans-medium */`
+`--font-weight-primary-semi-bold: 600; /* Before 6.3.0: --font-weight-medium */`
-`--font-weight-primary-regular: 300; /* Before 6.3.0: --font-weight-sans-regular */`
+`--font-weight-primary-regular: 300; /* Before 6.3.0: --font-weight-light */`
#### font-weight-secondary
-`--font-weight-secondary-bold: 700; /* Before 6.3.0: --font-weight-serif-bold */`
+`--font-weight-secondary-bold: 700; /* Before 6.3.0: --font-weight-bold */`
-`--font-weight-secondary-regular: 300; /* Before 6.3.0: --font-weight-serif-regular */`
+`--font-weight-secondary-regular: 300; /* Before 6.3.0: --font-weight-light */`
### font-size
@@ -234,28 +233,6 @@ Different font weights with matching values for the fonts.
`--font-size-icon-xs: 0.75rem;`
-### line-height
-
-`--line-height-comment-body: 1.45rem;`
-
-`--line-height-field-description: 1.3rem;`
-
-`--line-height-1: 0.75rem;`
-
-`--line-height-2: 0.875rem;`
-
-`--line-height-3: 1rem;`
-
-`--line-height-4: 1.125rem;`
-
-`--line-height-5: 1.25rem;`
-
-`--line-height-6: 1.5rem;`
-
-`--line-height-7: 1.75rem;`
-
-`--line-height-8: 2rem;`
-
### shadow
Different shadows that are currently used in Coral.
diff --git a/package-lock.json b/package-lock.json
index 92abb99ea..c777f6f65 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22020,28 +22020,28 @@
"dependencies": {
"abbrev": {
"version": "1.1.1",
- "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+ "resolved": false,
"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
"dev": true,
"optional": true
},
"ansi-regex": {
"version": "2.1.1",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+ "resolved": false,
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
"dev": true,
"optional": true
},
"aproba": {
"version": "1.2.0",
- "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+ "resolved": false,
"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
"dev": true,
"optional": true
},
"are-we-there-yet": {
"version": "1.1.5",
- "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+ "resolved": false,
"integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
"dev": true,
"optional": true,
@@ -22052,14 +22052,14 @@
},
"balanced-match": {
"version": "1.0.0",
- "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+ "resolved": false,
"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+ "resolved": false,
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"dev": true,
"optional": true,
@@ -22077,35 +22077,35 @@
},
"code-point-at": {
"version": "1.1.0",
- "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+ "resolved": false,
"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
- "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+ "resolved": false,
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
- "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+ "resolved": false,
"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
- "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+ "resolved": false,
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
"dev": true,
"optional": true
},
"debug": {
"version": "4.1.1",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+ "resolved": false,
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
"dev": true,
"optional": true,
@@ -22115,21 +22115,21 @@
},
"deep-extend": {
"version": "0.6.0",
- "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+ "resolved": false,
"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
"dev": true,
"optional": true
},
"delegates": {
"version": "1.0.0",
- "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+ "resolved": false,
"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
"dev": true,
"optional": true
},
"detect-libc": {
"version": "1.0.3",
- "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+ "resolved": false,
"integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
"dev": true,
"optional": true
@@ -22159,7 +22159,7 @@
},
"gauge": {
"version": "2.7.4",
- "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+ "resolved": false,
"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
"dev": true,
"optional": true,
@@ -22176,7 +22176,7 @@
},
"glob": {
"version": "7.1.3",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+ "resolved": false,
"integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
"dev": true,
"optional": true,
@@ -22191,14 +22191,14 @@
},
"has-unicode": {
"version": "2.0.1",
- "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+ "resolved": false,
"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
"dev": true,
"optional": true
},
"iconv-lite": {
"version": "0.4.24",
- "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+ "resolved": false,
"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
"dev": true,
"optional": true,
@@ -22208,7 +22208,7 @@
},
"ignore-walk": {
"version": "3.0.1",
- "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
+ "resolved": false,
"integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
"dev": true,
"optional": true,
@@ -22218,7 +22218,7 @@
},
"inflight": {
"version": "1.0.6",
- "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+ "resolved": false,
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
"dev": true,
"optional": true,
@@ -22229,21 +22229,21 @@
},
"inherits": {
"version": "2.0.3",
- "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+ "resolved": false,
"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
- "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+ "resolved": false,
"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
"dev": true,
"optional": true
},
"is-fullwidth-code-point": {
"version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+ "resolved": false,
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"dev": true,
"optional": true,
@@ -22253,14 +22253,14 @@
},
"isarray": {
"version": "1.0.0",
- "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "resolved": false,
"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
"dev": true,
"optional": true
},
"minimatch": {
"version": "3.0.4",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+ "resolved": false,
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"dev": true,
"optional": true,
@@ -22308,7 +22308,7 @@
},
"ms": {
"version": "2.1.1",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+ "resolved": false,
"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
"dev": true,
"optional": true
@@ -22322,7 +22322,7 @@
},
"needle": {
"version": "2.3.0",
- "resolved": "https://registry.npmjs.org/needle/-/needle-2.3.0.tgz",
+ "resolved": false,
"integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==",
"dev": true,
"optional": true,
@@ -22334,7 +22334,7 @@
},
"node-pre-gyp": {
"version": "0.12.0",
- "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz",
+ "resolved": false,
"integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==",
"dev": true,
"optional": true,
@@ -22353,7 +22353,7 @@
},
"nopt": {
"version": "4.0.1",
- "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+ "resolved": false,
"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
"dev": true,
"optional": true,
@@ -22364,14 +22364,14 @@
},
"npm-bundled": {
"version": "1.0.6",
- "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz",
+ "resolved": false,
"integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
"dev": true,
"optional": true
},
"npm-packlist": {
"version": "1.4.1",
- "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz",
+ "resolved": false,
"integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
"dev": true,
"optional": true,
@@ -22382,7 +22382,7 @@
},
"npmlog": {
"version": "4.1.2",
- "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+ "resolved": false,
"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
"dev": true,
"optional": true,
@@ -22395,21 +22395,21 @@
},
"number-is-nan": {
"version": "1.0.1",
- "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+ "resolved": false,
"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
- "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+ "resolved": false,
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
"dev": true,
"optional": true
},
"once": {
"version": "1.4.0",
- "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+ "resolved": false,
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
"dev": true,
"optional": true,
@@ -22419,21 +22419,21 @@
},
"os-homedir": {
"version": "1.0.2",
- "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+ "resolved": false,
"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
"dev": true,
"optional": true
},
"os-tmpdir": {
"version": "1.0.2",
- "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+ "resolved": false,
"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
"dev": true,
"optional": true
},
"osenv": {
"version": "0.1.5",
- "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+ "resolved": false,
"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
"dev": true,
"optional": true,
@@ -22444,21 +22444,21 @@
},
"path-is-absolute": {
"version": "1.0.1",
- "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+ "resolved": false,
"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
"dev": true,
"optional": true
},
"process-nextick-args": {
"version": "2.0.0",
- "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+ "resolved": false,
"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
"dev": true,
"optional": true
},
"rc": {
"version": "1.2.8",
- "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+ "resolved": false,
"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
"dev": true,
"optional": true,
@@ -22480,7 +22480,7 @@
},
"readable-stream": {
"version": "2.3.6",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+ "resolved": false,
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
"dev": true,
"optional": true,
@@ -22496,7 +22496,7 @@
},
"rimraf": {
"version": "2.6.3",
- "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+ "resolved": false,
"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
"dev": true,
"optional": true,
@@ -22506,49 +22506,49 @@
},
"safe-buffer": {
"version": "5.1.2",
- "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "resolved": false,
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
"dev": true,
"optional": true
},
"safer-buffer": {
"version": "2.1.2",
- "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+ "resolved": false,
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
"dev": true,
"optional": true
},
"sax": {
"version": "1.2.4",
- "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+ "resolved": false,
"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
"dev": true,
"optional": true
},
"semver": {
"version": "5.7.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+ "resolved": false,
"integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
"dev": true,
"optional": true
},
"set-blocking": {
"version": "2.0.0",
- "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+ "resolved": false,
"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
"dev": true,
"optional": true
},
"signal-exit": {
"version": "3.0.2",
- "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+ "resolved": false,
"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
"dev": true,
"optional": true
},
"string-width": {
"version": "1.0.2",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+ "resolved": false,
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"dev": true,
"optional": true,
@@ -22560,7 +22560,7 @@
},
"string_decoder": {
"version": "1.1.1",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "resolved": false,
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"dev": true,
"optional": true,
@@ -22570,7 +22570,7 @@
},
"strip-ansi": {
"version": "3.0.1",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+ "resolved": false,
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"optional": true,
@@ -22580,7 +22580,7 @@
},
"strip-json-comments": {
"version": "2.0.1",
- "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+ "resolved": false,
"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
"dev": true,
"optional": true
@@ -22603,14 +22603,14 @@
},
"util-deprecate": {
"version": "1.0.2",
- "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+ "resolved": false,
"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
"dev": true,
"optional": true
},
"wide-align": {
"version": "1.1.3",
- "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+ "resolved": false,
"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
"dev": true,
"optional": true,
@@ -22620,7 +22620,7 @@
},
"wrappy": {
"version": "1.0.2",
- "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+ "resolved": false,
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
"dev": true,
"optional": true
diff --git a/src/core/client/account/routes/NotFound.css b/src/core/client/account/routes/NotFound.css
index c2d433fe0..f9a26399a 100644
--- a/src/core/client/account/routes/NotFound.css
+++ b/src/core/client/account/routes/NotFound.css
@@ -3,7 +3,7 @@
font-style: normal;
font-weight: var(--font-weight-secondary-bold);
font-size: var(--font-size-6);
- line-height: var(--line-height-7);
+ line-height: 1.17;
color: var(--palette-text-500);
diff --git a/src/core/client/account/routes/download/Download/DownloadDescription.css b/src/core/client/account/routes/download/Download/DownloadDescription.css
index cf9cb0241..5ed33ecf8 100644
--- a/src/core/client/account/routes/download/Download/DownloadDescription.css
+++ b/src/core/client/account/routes/download/Download/DownloadDescription.css
@@ -3,7 +3,7 @@
font-style: normal;
font-weight: var(--font-weight-secondary-bold);
font-size: var(--font-size-6);
- line-height: var(--line-height-7);
+ line-height: 1.17;
color: var(--palette-text-500);
@@ -23,7 +23,7 @@
font-style: normal;
font-weight: var(--font-weight-primary-regular);
font-size: var(--font-size-3);
- line-height: var(--line-height-5);
+ line-height: 1.25;
color: var(--palette-text-500);
diff --git a/src/core/client/account/routes/email/Confirm/Confirm.css b/src/core/client/account/routes/email/Confirm/Confirm.css
index 3216ddebc..4a0c94d3b 100644
--- a/src/core/client/account/routes/email/Confirm/Confirm.css
+++ b/src/core/client/account/routes/email/Confirm/Confirm.css
@@ -3,7 +3,7 @@
font-style: normal;
font-weight: var(--font-weight-secondary-bold);
font-size: var(--font-size-6);
- line-height: var(--line-height-7);
+ line-height: 1.17;
color: var(--palette-text-500);
@@ -15,7 +15,7 @@
font-style: normal;
font-weight: var(--font-weight-primary-regular);
font-size: var(--font-size-3);
- line-height: var(--line-height-5);
+ line-height: 1.25;
color: var(--palette-text-500);
@@ -27,7 +27,7 @@
font-style: normal;
font-weight: var(--font-weight-primary-bold);
font-size: var(--font-size-2);
- line-height: var(--line-height-3);
+ line-height: 1.14;
color: var(--palette-text-500);
@@ -39,7 +39,7 @@
font-style: normal;
font-weight: var(--font-weight-primary-regular);
font-size: var(--font-size-2);
- line-height: var(--line-height-4);
+ line-height: 1.285;
color: var(--palette-text-100);
diff --git a/src/core/client/account/routes/notifications/Unsubscribe/Unsubscribe.css b/src/core/client/account/routes/notifications/Unsubscribe/Unsubscribe.css
index 3216ddebc..4a0c94d3b 100644
--- a/src/core/client/account/routes/notifications/Unsubscribe/Unsubscribe.css
+++ b/src/core/client/account/routes/notifications/Unsubscribe/Unsubscribe.css
@@ -3,7 +3,7 @@
font-style: normal;
font-weight: var(--font-weight-secondary-bold);
font-size: var(--font-size-6);
- line-height: var(--line-height-7);
+ line-height: 1.17;
color: var(--palette-text-500);
@@ -15,7 +15,7 @@
font-style: normal;
font-weight: var(--font-weight-primary-regular);
font-size: var(--font-size-3);
- line-height: var(--line-height-5);
+ line-height: 1.25;
color: var(--palette-text-500);
@@ -27,7 +27,7 @@
font-style: normal;
font-weight: var(--font-weight-primary-bold);
font-size: var(--font-size-2);
- line-height: var(--line-height-3);
+ line-height: 1.14;
color: var(--palette-text-500);
@@ -39,7 +39,7 @@
font-style: normal;
font-weight: var(--font-weight-primary-regular);
font-size: var(--font-size-2);
- line-height: var(--line-height-4);
+ line-height: 1.285;
color: var(--palette-text-100);
diff --git a/src/core/client/account/routes/password/Reset/Reset.css b/src/core/client/account/routes/password/Reset/Reset.css
index 3216ddebc..4a0c94d3b 100644
--- a/src/core/client/account/routes/password/Reset/Reset.css
+++ b/src/core/client/account/routes/password/Reset/Reset.css
@@ -3,7 +3,7 @@
font-style: normal;
font-weight: var(--font-weight-secondary-bold);
font-size: var(--font-size-6);
- line-height: var(--line-height-7);
+ line-height: 1.17;
color: var(--palette-text-500);
@@ -15,7 +15,7 @@
font-style: normal;
font-weight: var(--font-weight-primary-regular);
font-size: var(--font-size-3);
- line-height: var(--line-height-5);
+ line-height: 1.25;
color: var(--palette-text-500);
@@ -27,7 +27,7 @@
font-style: normal;
font-weight: var(--font-weight-primary-bold);
font-size: var(--font-size-2);
- line-height: var(--line-height-3);
+ line-height: 1.14;
color: var(--palette-text-500);
@@ -39,7 +39,7 @@
font-style: normal;
font-weight: var(--font-weight-primary-regular);
font-size: var(--font-size-2);
- line-height: var(--line-height-4);
+ line-height: 1.285;
color: var(--palette-text-100);
diff --git a/src/core/client/account/test/__snapshots__/confirmEmail.spec.tsx.snap b/src/core/client/account/test/__snapshots__/confirmEmail.spec.tsx.snap
index 5eabe32fb..2d2c387e4 100644
--- a/src/core/client/account/test/__snapshots__/confirmEmail.spec.tsx.snap
+++ b/src/core/client/account/test/__snapshots__/confirmEmail.spec.tsx.snap
@@ -36,6 +36,7 @@ exports[`renders form 1`] = `
= ({
diff --git a/src/core/client/admin/components/ConversationModal/ConversationModalHeaderContainer.css b/src/core/client/admin/components/ConversationModal/ConversationModalHeaderContainer.css
index f5539e475..1880bbb9d 100644
--- a/src/core/client/admin/components/ConversationModal/ConversationModalHeaderContainer.css
+++ b/src/core/client/admin/components/ConversationModal/ConversationModalHeaderContainer.css
@@ -4,7 +4,7 @@ $modal-header-text: var(--palette-text-900);
font-size: var(--font-size-4);
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-regular);
- line-height: var(--line-height-5);
+ line-height: 1.11;
color: $modal-header-text;
margin: 0;
}
diff --git a/src/core/client/admin/components/ConversationModal/ConversationModalHeaderContainer.tsx b/src/core/client/admin/components/ConversationModal/ConversationModalHeaderContainer.tsx
index 0394e85b1..1bba186d8 100644
--- a/src/core/client/admin/components/ConversationModal/ConversationModalHeaderContainer.tsx
+++ b/src/core/client/admin/components/ConversationModal/ConversationModalHeaderContainer.tsx
@@ -39,7 +39,12 @@ const ConversationModalHeaderContainer: FunctionComponent = ({
: comment.story.url}
diff --git a/src/core/client/admin/components/ConversationModal/ConversationModalRepliesContainer.tsx b/src/core/client/admin/components/ConversationModal/ConversationModalRepliesContainer.tsx
index b88f433fb..0c5c960be 100644
--- a/src/core/client/admin/components/ConversationModal/ConversationModalRepliesContainer.tsx
+++ b/src/core/client/admin/components/ConversationModal/ConversationModalRepliesContainer.tsx
@@ -62,7 +62,7 @@ const ConversationModalRepliesContainer: FunctionComponent = ({
{!showReplies && comment.replyCount > 0 && (
-
+
Show replies
@@ -71,7 +71,7 @@ const ConversationModalRepliesContainer: FunctionComponent
= ({
comment.replyCount > replies.length &&
replies.length > 0 && (
-
+
Show more replies
diff --git a/src/core/client/admin/components/ModalBodyText.css b/src/core/client/admin/components/ModalBodyText.css
index c90d133d2..408c5ec9a 100644
--- a/src/core/client/admin/components/ModalBodyText.css
+++ b/src/core/client/admin/components/ModalBodyText.css
@@ -4,6 +4,6 @@ $modal-body-text: $colors-mono-500;
font-size: var(--font-size-3);
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-regular);
- line-height: var(--line-height-field-description);
+ line-height: 1.3;
color: $modal-body-text;
}
diff --git a/src/core/client/admin/components/ModalHeader.css b/src/core/client/admin/components/ModalHeader.css
index 23c8ef641..934fddcb1 100644
--- a/src/core/client/admin/components/ModalHeader.css
+++ b/src/core/client/admin/components/ModalHeader.css
@@ -4,7 +4,7 @@ $modal-text: $colors-mono-500;
font-size: var(--font-size-5);
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-semi-bold);
- line-height: var(--line-height-title);
+ line-height: 1.2;
color: $modal-text;
margin: 0;
}
diff --git a/src/core/client/admin/components/ModerateCard/FlagDetailsCategory.css b/src/core/client/admin/components/ModerateCard/FlagDetailsCategory.css
index 12ea52f67..d87d79e0a 100644
--- a/src/core/client/admin/components/ModerateCard/FlagDetailsCategory.css
+++ b/src/core/client/admin/components/ModerateCard/FlagDetailsCategory.css
@@ -4,6 +4,6 @@ $moderateCardFlagsCategoryColor: var(--palette-text-500);
font-size: var(--font-size-3);
font-weight: var(--font-weight-primary-bold);
font-family: var(--font-family-primary);
- line-height: var(--line-height-6);
+ line-height: 1.5;
color: $moderateCardFlagsCategoryColor;
}
diff --git a/src/core/client/admin/components/ModerateCard/FlagDetailsEntry.css b/src/core/client/admin/components/ModerateCard/FlagDetailsEntry.css
index 840639e46..b078dde2e 100644
--- a/src/core/client/admin/components/ModerateCard/FlagDetailsEntry.css
+++ b/src/core/client/admin/components/ModerateCard/FlagDetailsEntry.css
@@ -6,7 +6,7 @@ $moderateCardReasonTextColor: var(--palette-text-500);
font-size: var(--font-size-2);
font-weight: var(--font-weight-secondary-bold);
font-family: var(--font-family-secondary);
- line-height: var(--line-height-3);
+ line-height: 1.14;
padding-right: calc(0.5 * var(--mini-unit));
}
@@ -17,11 +17,10 @@ $moderateCardReasonTextColor: var(--palette-text-500);
font-size: var(--font-size-2);
font-weight: var(--font-weight-primary-regular);
font-family: var(--font-family-primary);
- line-height: var(--line-height-3);
+ line-height: 1.14;
}
.flagger {
- line-height: var(--line-height-3);
margin-right: var(--mini-unit);
padding: var(--spacing-1);
margin-left: calc(-1 * var(--spacing-1));
diff --git a/src/core/client/admin/components/ModerateCard/ModerateCard.css b/src/core/client/admin/components/ModerateCard/ModerateCard.css
index 05f04033c..c6b7dbbcb 100644
--- a/src/core/client/admin/components/ModerateCard/ModerateCard.css
+++ b/src/core/client/admin/components/ModerateCard/ModerateCard.css
@@ -101,7 +101,7 @@ $moderateCardLinkTextColor: $colors-teal-700;
font-size: var(--font-size-1);
font-weight: var(--font-weight-primary-semi-bold);
font-family: var(--font-family-primary);
- line-height: var(--line-height-3);
+ line-height: 1.33;
color: $moderateCardLinkTextColor;
text-transform: uppercase;
}
@@ -115,7 +115,7 @@ $moderateCardLinkTextColor: $colors-teal-700;
font-size: var(--font-size-1);
font-weight: var(--font-weight-primary-semi-bold);
font-family: var(--font-family-primary);
- line-height: var(--line-height-3);
+ line-height: 1.33;
margin-bottom: var(--spacing-1);
text-transform: uppercase;
}
@@ -123,7 +123,7 @@ $moderateCardLinkTextColor: $colors-teal-700;
.commentOn {
font-size: var(--font-size-2);
font-family: var(--font-family-primary);
- line-height: var(--line-height-3);
+ line-height: 1.14;
margin-bottom: var(--spacing-1);
}
@@ -152,7 +152,7 @@ $moderateCardLinkTextColor: $colors-teal-700;
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-regular);
font-size: var(--font-size-1);
- line-height: var(--line-height-3);
+ line-height: 1.33;
}
.edited {
@@ -160,7 +160,7 @@ $moderateCardLinkTextColor: $colors-teal-700;
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-regular);
font-size: var(--font-size-1);
- line-height: var(--line-height-3);
+ line-height: 1.33;
padding-left: var(--spacing-2);
}
@@ -174,7 +174,7 @@ $moderateCardLinkTextColor: $colors-teal-700;
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-regular);
font-size: var(--font-size-1);
- line-height: var(--line-height-3);
+ line-height: 1.33;
padding-left: var(--spacing-2);
}
@@ -183,5 +183,5 @@ $moderateCardLinkTextColor: $colors-teal-700;
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-regular);
font-size: var(--font-size-2);
- line-height: var(--line-height-4);
+ line-height: 1.285;
}
diff --git a/src/core/client/admin/components/ModerateCard/ModeratedByContainer.css b/src/core/client/admin/components/ModerateCard/ModeratedByContainer.css
index 9e44da4a6..2d92c30ec 100644
--- a/src/core/client/admin/components/ModerateCard/ModeratedByContainer.css
+++ b/src/core/client/admin/components/ModerateCard/ModeratedByContainer.css
@@ -5,7 +5,7 @@ $moderated-by-username: var(--palette-text-900);
font-size: var(--font-size-1);
font-weight: var(--font-weight-primary-semi-bold);
font-family: var(--font-family-primary);
- line-height: var(--line-height-3);
+ line-height: 1.33;
color: $moderated-by;
text-transform: uppercase;
}
@@ -14,7 +14,7 @@ $moderated-by-username: var(--palette-text-900);
font-size: var(--font-size-2);
font-weight: var(--font-weight-secondary-bold);
font-family: var(--font-family-secondary);
- line-height: var(--line-height-3);
+ line-height: 1.14;
color: $moderated-by-username;
text-align: center;
padding-top: 1px;
diff --git a/src/core/client/admin/components/ModerateCard/ToxicityLabel.css b/src/core/client/admin/components/ModerateCard/ToxicityLabel.css
index a7052e98e..600b572af 100644
--- a/src/core/client/admin/components/ModerateCard/ToxicityLabel.css
+++ b/src/core/client/admin/components/ModerateCard/ToxicityLabel.css
@@ -5,7 +5,7 @@ $moderateCardToxicityColor: var(--palette-text-500);
font-size: var(--font-size-2);
font-weight: var(--font-weight-primary-semi-bold);
font-family: var(--font-family-primary);
- line-height: var(--line-height-4);
+ line-height: 1.285;
color: $moderateCardToxicityColor;
}
diff --git a/src/core/client/admin/components/PaginatedSelect/PaginatedSelect.css b/src/core/client/admin/components/PaginatedSelect/PaginatedSelect.css
index e75cff374..01bdb9518 100644
--- a/src/core/client/admin/components/PaginatedSelect/PaginatedSelect.css
+++ b/src/core/client/admin/components/PaginatedSelect/PaginatedSelect.css
@@ -20,7 +20,7 @@
width: calc(20 * var(--mini-unit));
margin-right: calc(var(--spacing-1) / 2);
font-size: var(--font-size-3);
- line-height: var(--line-height-min);
+ line-height: 1.2;
justify-content: space-between;
background: var(--palette-background-input);
}
diff --git a/src/core/client/admin/components/UserHistoryDrawer/ModeratorNote.css b/src/core/client/admin/components/UserHistoryDrawer/ModeratorNote.css
index 93586b917..4360632f5 100644
--- a/src/core/client/admin/components/UserHistoryDrawer/ModeratorNote.css
+++ b/src/core/client/admin/components/UserHistoryDrawer/ModeratorNote.css
@@ -10,7 +10,7 @@ $moderator-note-username: var(--palette-text-900);
font-family: var(--font-family-primary);
font-size: var(--font-size-3);
font-weight: var(--font-weight-primary-regular);
- line-height: var(--line-height-field-description);
+ line-height: 1.3;
background-color: $moderator-note-bg;
border-radius: 4px;
padding: var(--spacing-3);
@@ -25,7 +25,7 @@ $moderator-note-username: var(--palette-text-900);
font-family: var(--font-family-primary);
font-size: var(--font-size-2);
font-weight: var(--font-weight-primary-regular);
- line-height: var(--line-height-3);
+ line-height: 1.14;
padding-left: var(--spacing-4);
padding-right: var(--spacing-1);
position: relative;
@@ -47,8 +47,8 @@ $moderator-note-username: var(--palette-text-900);
.username {
font-family: var(--font-family-secondary);
font-weight: var(--font-weight-secondary-bold);
- line-height: var(--line-height-3);
font-size: var(--font-size-3);
+ line-height: 1;
color: $moderator-note-username;
}
diff --git a/src/core/client/admin/components/UserHistoryDrawer/RecentHistory.css b/src/core/client/admin/components/UserHistoryDrawer/RecentHistory.css
index af8329fb9..770a1b2d6 100644
--- a/src/core/client/admin/components/UserHistoryDrawer/RecentHistory.css
+++ b/src/core/client/admin/components/UserHistoryDrawer/RecentHistory.css
@@ -9,7 +9,7 @@ $recent-history-triggered: var(--palette-error-500);
font-weight: var(--font-weight-primary-bold);
font-size: var(--font-size-3);
margin: 0;
- line-height: var(--line-height-field-description);
+ line-height: 1.3;
color: $recent-history-title;
}
@@ -19,7 +19,7 @@ $recent-history-triggered: var(--palette-error-500);
font-weight: var(--font-weight-primary-regular);
font-size: var(--font-size-2);
margin: 0;
- line-height: var(--line-height-4);
+ line-height: 1.285;
}
.info {
@@ -29,8 +29,7 @@ $recent-history-triggered: var(--palette-error-500);
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-semi-bold);
font-size: var(--font-size-6);
- line-height: var(--line-height-3);
- line-height: var(--line-height-3);
+ line-height: 0.67;
color: $recent-history-info;
margin: 0;
}
diff --git a/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerContainer.css b/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerContainer.css
index 7b60fade2..16a9bec7e 100644
--- a/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerContainer.css
+++ b/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerContainer.css
@@ -29,7 +29,7 @@ $user-drawer-status-label: var(--palette-text-500);
font-family: var(--font-family-secondary);
font-weight: var(--font-weight-secondary-bold);
font-size: var(--font-size-6);
- line-height: var(--line-height-3);
+ line-height: 0.67;
}
.userDetail {
@@ -39,7 +39,7 @@ $user-drawer-status-label: var(--palette-text-500);
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-regular);
font-size: var(--font-size-3);
- line-height: var(--line-height-3);
+ line-height: 1;
color: $user-drawer-account-info;
}
@@ -61,7 +61,7 @@ $user-drawer-status-label: var(--palette-text-500);
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-bold);
font-size: var(--font-size-2);
- line-height: var(--line-height-3);
+ line-height: 1.14;
color: $user-drawer-status-label;
margin-right: var(--spacing-1);
}
diff --git a/src/core/client/admin/components/UserHistoryDrawer/UserStatusDetailsContainer.css b/src/core/client/admin/components/UserHistoryDrawer/UserStatusDetailsContainer.css
index b82130d3b..b3cc46dae 100644
--- a/src/core/client/admin/components/UserHistoryDrawer/UserStatusDetailsContainer.css
+++ b/src/core/client/admin/components/UserHistoryDrawer/UserStatusDetailsContainer.css
@@ -5,7 +5,7 @@ $user-status-details: var(--palette-text-500);
font-weight: var(--font-weight-primary-regular);
font-size: var(--font-size-2);
color: $user-status-details;
- line-height: var(--line-height-4);
+ line-height: 1.285;
margin: 0 0 var(--spacing-1) 0;
}
diff --git a/src/core/client/admin/components/UserStatus/BanModal.css b/src/core/client/admin/components/UserStatus/BanModal.css
index a453f0453..25ba6d3a2 100644
--- a/src/core/client/admin/components/UserStatus/BanModal.css
+++ b/src/core/client/admin/components/UserStatus/BanModal.css
@@ -4,7 +4,7 @@ $ban-modal-text: var(--palette-text-500);
font-size: var(--font-size-3);
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-regular);
- line-height: var(--line-height-field-description);
+ line-height: 1.3;
color: $ban-modal-text;
}
diff --git a/src/core/client/admin/components/UserStatus/SuspendForm.css b/src/core/client/admin/components/UserStatus/SuspendForm.css
index a6cb39b11..18a5af0af 100644
--- a/src/core/client/admin/components/UserStatus/SuspendForm.css
+++ b/src/core/client/admin/components/UserStatus/SuspendForm.css
@@ -19,7 +19,7 @@ $suspend-modal-text: var(--palette-text-500);
font-size: var(--font-size-4);
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-semi-bold);
- line-height: var(--line-height-5);
+ line-height: 1.11;
color: $suspend-modal-text;
margin: 0;
}
diff --git a/src/core/client/admin/components/UserStatus/SuspendModal.css b/src/core/client/admin/components/UserStatus/SuspendModal.css
index 0e4547822..01901bf8e 100644
--- a/src/core/client/admin/components/UserStatus/SuspendModal.css
+++ b/src/core/client/admin/components/UserStatus/SuspendModal.css
@@ -4,7 +4,7 @@ $suspend-modal-text: var(--palette-text-500);
font-size: var(--font-size-3);
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-regular);
- line-height: var(--line-height-field-description);
+ line-height: 1.3;
color: $suspend-modal-text;
}
@@ -12,7 +12,7 @@ $suspend-modal-text: var(--palette-text-500);
font-size: var(--font-size-4);
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-semi-bold);
- line-height: var(--line-height-5);
+ line-height: 1.11;
color: $suspend-modal-text;
margin: 0;
}
diff --git a/src/core/client/admin/components/UserStatus/UserStatus.css b/src/core/client/admin/components/UserStatus/UserStatus.css
index d0eb67503..eb3a18fad 100644
--- a/src/core/client/admin/components/UserStatus/UserStatus.css
+++ b/src/core/client/admin/components/UserStatus/UserStatus.css
@@ -2,7 +2,7 @@
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-semi-bold);
font-size: var(--font-size-2);
- line-height: var(--line-height-3);
+ line-height: 1.14;
}
.success {
diff --git a/src/core/client/admin/routes/AuthCheck/Restricted.css b/src/core/client/admin/routes/AuthCheck/Restricted.css
index af31aff80..50e407ade 100644
--- a/src/core/client/admin/routes/AuthCheck/Restricted.css
+++ b/src/core/client/admin/routes/AuthCheck/Restricted.css
@@ -3,7 +3,7 @@
font-family: var(--font-family-secondary);
color: var(--palette-text-100);
font-size: var(--font-size-3);
- line-height: var(--line-height-4);
+ line-height: 1.285;
padding-bottom: var(--spacing-3);
}
@@ -12,7 +12,7 @@
font-size: var(--font-size-6);
font-weight: var(--font-weight-secondary-bold);
font-family: var(--font-family-secondary);
- line-height: var(--line-height-7);
+ line-height: 1.17;
color: var(--palette-text-900);
text-align: center;
@@ -24,7 +24,7 @@
font-size: var(--font-size-3);
font-weight: var(--font-weight-primary-regular);
font-family: var(--font-family-primary);
- line-height: var(--line-height-4);
+ line-height: 1.125;
color: var(--palette-text-500);
text-align: center;
@@ -39,7 +39,7 @@
font-size: var(--font-size-4);
font-weight: var(--font-weight-primary-semi-bold);
font-family: var(--font-family-primary);
- line-height: var(--line-height-3);
+ line-height: 0.89;
color: var(--palette-text-900);
text-align: center;
diff --git a/src/core/client/admin/routes/Community/EmptyMessage.css b/src/core/client/admin/routes/Community/EmptyMessage.css
index 8a356e313..039cdedec 100644
--- a/src/core/client/admin/routes/Community/EmptyMessage.css
+++ b/src/core/client/admin/routes/Community/EmptyMessage.css
@@ -2,6 +2,6 @@
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-regular);
font-size: var(--font-size-3);
- line-height: var(--line-height-field-description);
+ line-height: 1.3;
text-align: center;
}
diff --git a/src/core/client/admin/routes/Community/InviteUsers/InviteUsersForm.css b/src/core/client/admin/routes/Community/InviteUsers/InviteUsersForm.css
index 3c153da83..9d26fe4dc 100644
--- a/src/core/client/admin/routes/Community/InviteUsers/InviteUsersForm.css
+++ b/src/core/client/admin/routes/Community/InviteUsers/InviteUsersForm.css
@@ -4,6 +4,6 @@ $invite-form-text: var(--palette-text-500);
font-size: var(--font-size-3);
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-regular);
- line-height: var(--line-height-field-description);
+ line-height: 1.3;
color: $invite-form-text;
}
diff --git a/src/core/client/admin/routes/Community/InviteUsers/InviteUsersModal.css b/src/core/client/admin/routes/Community/InviteUsers/InviteUsersModal.css
index 33752ab12..51ea72e0d 100644
--- a/src/core/client/admin/routes/Community/InviteUsers/InviteUsersModal.css
+++ b/src/core/client/admin/routes/Community/InviteUsers/InviteUsersModal.css
@@ -10,7 +10,7 @@ $invite-modal-text: var(--palette-text-500);
font-size: var(--font-size-5);
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-semi-bold);
- line-height: var(--line-height-6);
+ line-height: 1.2;
color: $invite-modal-text;
margin: 0;
}
diff --git a/src/core/client/admin/routes/Community/InviteUsers/RoleField.css b/src/core/client/admin/routes/Community/InviteUsers/RoleField.css
index 62c39bda7..9d1fa1d1f 100644
--- a/src/core/client/admin/routes/Community/InviteUsers/RoleField.css
+++ b/src/core/client/admin/routes/Community/InviteUsers/RoleField.css
@@ -4,6 +4,6 @@ $role-field-text: var(--palette-text-500);
font-size: var(--font-size-3);
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-semi-bold);
- line-height: var(--line-height-field-description);
+ line-height: 1.3;
color: $role-field-text;
}
diff --git a/src/core/client/admin/routes/Community/InviteUsers/Success.css b/src/core/client/admin/routes/Community/InviteUsers/Success.css
index 439d1fe33..cc0deddb4 100644
--- a/src/core/client/admin/routes/Community/InviteUsers/Success.css
+++ b/src/core/client/admin/routes/Community/InviteUsers/Success.css
@@ -7,7 +7,7 @@ $success-text: var(--palette-text-500);
font-size: var(--font-size-5);
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-semi-bold);
- line-height: var(--line-height-6);
+ line-height: 1.2;
color: $success-text;
margin: 0;
}
diff --git a/src/core/client/admin/routes/Community/UserRow.css b/src/core/client/admin/routes/Community/UserRow.css
index 328d15444..d4c0035d2 100644
--- a/src/core/client/admin/routes/Community/UserRow.css
+++ b/src/core/client/admin/routes/Community/UserRow.css
@@ -24,8 +24,8 @@
padding: 0px;
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-semi-bold);
- line-height: var(--line-height-3);
font-size: var(--font-size-2);
+ line-height: 1.14;
}
.username {
diff --git a/src/core/client/admin/routes/Configure/Header.css b/src/core/client/admin/routes/Configure/Header.css
index a59ce55d0..92f62e90d 100644
--- a/src/core/client/admin/routes/Configure/Header.css
+++ b/src/core/client/admin/routes/Configure/Header.css
@@ -6,6 +6,6 @@ $configureHeadingForegroundColor: var(--palette-text-000);
color: $configureHeadingForegroundColor;
font-size: var(--font-size-3);
font-weight: var(--font-weight-primary-bold);
- line-height: var(--line-height-3);
+ line-height: 1;
font-family: var(--font-family-primary);
}
diff --git a/src/core/client/admin/routes/Configure/HelperText.css b/src/core/client/admin/routes/Configure/HelperText.css
index d77967b50..20d867763 100644
--- a/src/core/client/admin/routes/Configure/HelperText.css
+++ b/src/core/client/admin/routes/Configure/HelperText.css
@@ -3,5 +3,5 @@
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-regular);
font-size: var(--font-size-2);
- line-height: var(--line-height-4);
+ line-height: 1.285;
}
diff --git a/src/core/client/admin/routes/Configure/Link.css b/src/core/client/admin/routes/Configure/Link.css
index 7a0f729d3..b4ee73db7 100644
--- a/src/core/client/admin/routes/Configure/Link.css
+++ b/src/core/client/admin/routes/Configure/Link.css
@@ -7,7 +7,7 @@ $sideNavActiveColor: var(--palette-text-500);
color: $sideNavItemColor;
font-family: var(--font-family-primary);
font-size: var(--font-size-4);
- line-height: var(--line-height-5);
+ line-height: 1.11;
font-weight: var(--font-weight-primary-regular);
display: inline-block;
padding: var(--spacing-2) var(--spacing-2)
diff --git a/src/core/client/admin/routes/Configure/sections/Auth/SSOSigningSecretRotation/DateField.css b/src/core/client/admin/routes/Configure/sections/Auth/SSOSigningSecretRotation/DateField.css
index 6235185b9..891f902d4 100644
--- a/src/core/client/admin/routes/Configure/sections/Auth/SSOSigningSecretRotation/DateField.css
+++ b/src/core/client/admin/routes/Configure/sections/Auth/SSOSigningSecretRotation/DateField.css
@@ -6,5 +6,5 @@
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-regular);
font-size: var(--font-size-2);
- line-height: var(--line-height-3);
+ line-height: 1.14;
}
diff --git a/src/core/client/admin/routes/Configure/sections/Auth/SSOSigningSecretRotation/StatusField.css b/src/core/client/admin/routes/Configure/sections/Auth/SSOSigningSecretRotation/StatusField.css
index a18a75c1b..b92dc9e9c 100644
--- a/src/core/client/admin/routes/Configure/sections/Auth/SSOSigningSecretRotation/StatusField.css
+++ b/src/core/client/admin/routes/Configure/sections/Auth/SSOSigningSecretRotation/StatusField.css
@@ -2,7 +2,7 @@
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-regular);
font-size: var(--font-size-2);
- line-height: var(--line-height-3);
+ line-height: 1.14;
border-radius: 2px;
padding-left: var(--spacing-1);
diff --git a/src/core/client/admin/routes/Configure/sections/General/AnnouncementFormModal.css b/src/core/client/admin/routes/Configure/sections/General/AnnouncementFormModal.css
index 0e88f87b5..011f5acab 100644
--- a/src/core/client/admin/routes/Configure/sections/General/AnnouncementFormModal.css
+++ b/src/core/client/admin/routes/Configure/sections/General/AnnouncementFormModal.css
@@ -9,7 +9,7 @@ $announcement-modal-text: var(--palette-text-500);
font-size: var(--font-size-5);
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-semi-bold);
- line-height: var(--line-height-6);
+ line-height: 1.2;
color: $announcement-modal-text;
margin: 0;
}
diff --git a/src/core/client/admin/routes/Configure/sections/General/AnnouncementFormModal.tsx b/src/core/client/admin/routes/Configure/sections/General/AnnouncementFormModal.tsx
index 6386a3ac0..1a2745713 100644
--- a/src/core/client/admin/routes/Configure/sections/General/AnnouncementFormModal.tsx
+++ b/src/core/client/admin/routes/Configure/sections/General/AnnouncementFormModal.tsx
@@ -122,7 +122,7 @@ const AnnouncementForm: FunctionComponent = ({
-
+
Cancel
diff --git a/src/core/client/admin/routes/Configure/sections/General/CommentLengthConfig.css b/src/core/client/admin/routes/Configure/sections/General/CommentLengthConfig.css
index 6f2d77803..4431095a6 100644
--- a/src/core/client/admin/routes/Configure/sections/General/CommentLengthConfig.css
+++ b/src/core/client/admin/routes/Configure/sections/General/CommentLengthConfig.css
@@ -7,5 +7,5 @@
font-size: var(--font-size-3);
font-weight: var(--font-weight-primary-regular);
font-family: var(--font-family-primary);
- line-height: var(--line-height-4);
+ line-height: 1.125;
}
diff --git a/src/core/client/admin/routes/Configure/sections/ModerationPhases/ConfigureExternalModerationPhase/RotateSigningSecretModal.css b/src/core/client/admin/routes/Configure/sections/ModerationPhases/ConfigureExternalModerationPhase/RotateSigningSecretModal.css
index b7107ef8b..a20dbef52 100644
--- a/src/core/client/admin/routes/Configure/sections/ModerationPhases/ConfigureExternalModerationPhase/RotateSigningSecretModal.css
+++ b/src/core/client/admin/routes/Configure/sections/ModerationPhases/ConfigureExternalModerationPhase/RotateSigningSecretModal.css
@@ -6,5 +6,5 @@
font-size: var(--font-size-5);
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-semi-bold);
- line-height: var(--line-height-6);
+ line-height: 1.2;
}
diff --git a/src/core/client/admin/routes/Configure/sections/ModerationPhases/ExternalModerationPhaseRow.css b/src/core/client/admin/routes/Configure/sections/ModerationPhases/ExternalModerationPhaseRow.css
index 034ce371b..aac981aa3 100644
--- a/src/core/client/admin/routes/Configure/sections/ModerationPhases/ExternalModerationPhaseRow.css
+++ b/src/core/client/admin/routes/Configure/sections/ModerationPhases/ExternalModerationPhaseRow.css
@@ -5,6 +5,6 @@
.detailsButton {
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-semi-bold);
- line-height: var(--line-height-3);
font-size: var(--font-size-2);
+ line-height: 1.14;
}
diff --git a/src/core/client/admin/routes/Configure/sections/Sites/CreateSiteForm.tsx b/src/core/client/admin/routes/Configure/sections/Sites/CreateSiteForm.tsx
index 37c70577a..781143fae 100644
--- a/src/core/client/admin/routes/Configure/sections/Sites/CreateSiteForm.tsx
+++ b/src/core/client/admin/routes/Configure/sections/Sites/CreateSiteForm.tsx
@@ -114,7 +114,7 @@ const CreateSiteForm: FunctionComponent = ({ onCreate }) => {
Enabled
@@ -591,7 +590,7 @@ address from the site and the database.
htmlFor="auth.integrations.local.targetFilter.admin"
>
Coral Admin
@@ -617,7 +616,7 @@ address from the site and the database.
htmlFor="auth.integrations.local.targetFilter.stream"
>
Comment Stream
@@ -666,7 +665,7 @@ integration to register for a new account.
htmlFor="auth.integrations.local.allowRegistration"
>
Allow Registration
@@ -715,7 +714,7 @@ integration to register for a new account.
htmlFor="auth.integrations.oidc.enabled"
>
Enabled
@@ -773,7 +772,6 @@ integration to register for a new account.
Coral Admin
@@ -1138,7 +1135,7 @@ the remaining fields. You may also enter the information manually.
htmlFor="auth.integrations.oidc.targetFilter.stream"
>
Comment Stream
@@ -1187,7 +1184,7 @@ integration to register for a new account.
htmlFor="auth.integrations.oidc.allowRegistration"
>
Allow Registration
@@ -1236,7 +1233,7 @@ integration to register for a new account.
htmlFor="auth.integrations.sso.enabled"
>
Enabled
@@ -1371,7 +1368,6 @@ more about creating a JWT Token with
Coral Admin
@@ -1538,7 +1533,7 @@ more about creating a JWT Token with
htmlFor="auth.integrations.sso.targetFilter.stream"
>
Comment Stream
@@ -1587,7 +1582,7 @@ integration to register for a new account.
htmlFor="auth.integrations.sso.allowRegistration"
>
Allow Registration
@@ -1636,7 +1631,7 @@ integration to register for a new account.
htmlFor="auth.integrations.google.enabled"
>
Enabled
@@ -1697,7 +1692,6 @@ to create and set up a web application. For more information visit:
Coral Admin
@@ -1859,7 +1853,7 @@ to create and set up a web application. For more information visit:
htmlFor="auth.integrations.google.targetFilter.stream"
>
Comment Stream
@@ -1908,7 +1902,7 @@ integration to register for a new account.
htmlFor="auth.integrations.google.allowRegistration"
>
Allow Registration
@@ -1957,7 +1951,7 @@ integration to register for a new account.
htmlFor="auth.integrations.facebook.enabled"
>
Enabled
@@ -2018,7 +2012,6 @@ For more information visit:
Coral Admin
@@ -2180,7 +2173,7 @@ For more information visit:
htmlFor="auth.integrations.facebook.targetFilter.stream"
>
Comment Stream
@@ -2229,7 +2222,7 @@ integration to register for a new account.
htmlFor="auth.integrations.facebook.allowRegistration"
>
Allow Registration
diff --git a/src/core/client/admin/test/configure/__snapshots__/general.spec.tsx.snap b/src/core/client/admin/test/configure/__snapshots__/general.spec.tsx.snap
index 19e2d8063..f459a5fcb 100644
--- a/src/core/client/admin/test/configure/__snapshots__/general.spec.tsx.snap
+++ b/src/core/client/admin/test/configure/__snapshots__/general.spec.tsx.snap
@@ -123,7 +123,6 @@ exports[`renders configure general 1`] = `
>
Strikethrough
@@ -691,7 +689,7 @@ here:
htmlFor="rte.spoiler"
>
Spoiler
@@ -945,7 +943,7 @@ moderation panel.
>
icon
@@ -1400,7 +1402,7 @@ each other's comments.
className="SelectField-root"
>
diff --git a/src/core/client/admin/test/configure/__snapshots__/moderation.spec.tsx.snap b/src/core/client/admin/test/configure/__snapshots__/moderation.spec.tsx.snap
index 555177120..6681d1e07 100644
--- a/src/core/client/admin/test/configure/__snapshots__/moderation.spec.tsx.snap
+++ b/src/core/client/admin/test/configure/__snapshots__/moderation.spec.tsx.snap
@@ -123,7 +123,6 @@ exports[`renders configure moderation 1`] = `
>
= ({ main }) => {
className={styles.root}
>
Coral by Vox Media
-
+
Please tell us the name of your organization. This will appear
in emails when inviting new team members.
diff --git a/src/core/client/install/App/steps/FinalStep.tsx b/src/core/client/install/App/steps/FinalStep.tsx
index 7655c27e1..2963e21b9 100644
--- a/src/core/client/install/App/steps/FinalStep.tsx
+++ b/src/core/client/install/App/steps/FinalStep.tsx
@@ -1,5 +1,4 @@
import { Localized } from "@fluent/react/compat";
-import { Link } from "found";
import React, { Component } from "react";
import { urls } from "coral-framework/helpers";
@@ -9,14 +8,10 @@ class FinalStep extends Component {
public render() {
return (
- {urls.admin.moderate}}
- >
+
- Thanks for installing Coral! We sent an email to verify your email
- address. While you finish setting up the account, you can start
- engaging with your readers now.
+ Continue to Coral Admin to complete the setup of your organization
+ and site.
diff --git a/src/core/client/install/App/steps/PermittedDomainsStep.tsx b/src/core/client/install/App/steps/PermittedDomainsStep.tsx
index 075afaa1a..dc34d4e65 100644
--- a/src/core/client/install/App/steps/PermittedDomainsStep.tsx
+++ b/src/core/client/install/App/steps/PermittedDomainsStep.tsx
@@ -68,7 +68,7 @@ class PermittedDomainsStep extends Component {
-
+
Enter the domains you would like to permit for Coral, e.g.
your local, staging and production environments including the
scheme (ex. http://localhost:3000, https://staging.domain.com,
diff --git a/src/core/client/install/App/steps/SelectLanguageStep.tsx b/src/core/client/install/App/steps/SelectLanguageStep.tsx
index 1140b23cd..a899ccb4b 100644
--- a/src/core/client/install/App/steps/SelectLanguageStep.tsx
+++ b/src/core/client/install/App/steps/SelectLanguageStep.tsx
@@ -57,7 +57,7 @@ const SelectLanguageStep: FunctionComponent = (props) => {
-
+
Choose the language to be used during the installation process.
This will also be the default language for your Coral community.
diff --git a/src/core/client/stream/App/TabBar.css b/src/core/client/stream/App/TabBar.css
index 2dc586490..9e729616a 100644
--- a/src/core/client/stream/App/TabBar.css
+++ b/src/core/client/stream/App/TabBar.css
@@ -8,7 +8,7 @@
.smallText {
font-family: var(--font-family-secondary);
font-size: var(--font-size-1);
- line-height: var(--line-height-1);
+ line-height: 1;
padding-top: var(--spacing-1);
}
diff --git a/src/core/client/stream/classes.ts b/src/core/client/stream/classes.ts
index 1fa655e54..72b0a2cd5 100644
--- a/src/core/client/stream/classes.ts
+++ b/src/core/client/stream/classes.ts
@@ -7,7 +7,10 @@ const CLASSES = {
/**
* guidlines represents the box containing the guidlines.
*/
- guidelines: "coral coral-guidelines",
+ guidelines: {
+ container: "coral coral-guidelines",
+ content: "coral coral-guidelines-content",
+ },
/**
* guidlines represents the box containing the guidlines.
@@ -30,6 +33,11 @@ const CLASSES = {
*/
counter: "coral coral-counter",
+ /**
+ * commentForm is the border div around the RTE.
+ */
+ commentForm: "coral coral-commentForm",
+
/**
* rte represents the rich-text-editor
*/
@@ -279,6 +287,12 @@ const CLASSES = {
*/
$root: "coral coral-comment",
+ /**
+ * highlight is attached to the comment container if the single
+ * conversation view is shown for this comment.
+ */
+ highlight: "coral coral-comment-highlight",
+
/**
* reacted signifies the number of reactions of the comment.
* The no of reactions is appended: e.g. `coral-reacted-1`.
@@ -558,7 +572,8 @@ const CLASSES = {
*/
sharePopover: {
$root: "coral coral-sharePopover",
- copyButton: "coral coral-sharePopover-copyButotn",
+ copyButton:
+ "coral coral-sharePopover-copyButotn coral-sharePopover-copyButton",
},
/**
@@ -616,6 +631,7 @@ const CLASSES = {
logoutButton: "coral coral-viewerBox-logoutButton",
signInButton: "coral coral-viewerBox-signInButton",
registerButton: "coral coral-viewerBox-registerButton",
+ username: "coral coral-viewerBox-username",
},
/**
diff --git a/src/core/client/stream/common/UserBox/UserBoxAuthenticated.css b/src/core/client/stream/common/UserBox/UserBoxAuthenticated.css
index 260a3e689..9e98ce7aa 100644
--- a/src/core/client/stream/common/UserBox/UserBoxAuthenticated.css
+++ b/src/core/client/stream/common/UserBox/UserBoxAuthenticated.css
@@ -6,7 +6,7 @@
font-family: var(--font-family-primary);
font-weight: var(--font-weight-primary-semi-bold);
font-size: var(--font-size-2);
- line-height: var(--line-height-2);
+ line-height: 1;
color: var(--palette-text-100);
@@ -17,7 +17,7 @@
font-family: var(--font-family-secondary);
font-weight: var(--font-weight-secondary-bold);
font-size: var(--font-size-4);
- line-height: var(--line-height-4);
+ line-height: 0.89;
color: var(--palette-text-900);
@@ -31,7 +31,7 @@
}
.userBoxButton {
- line-height: var(--line-height-2);
+ line-height: 1;
padding-left: var(--spacing-1);
}
diff --git a/src/core/client/stream/common/UserBox/UserBoxAuthenticated.tsx b/src/core/client/stream/common/UserBox/UserBoxAuthenticated.tsx
index f3dd43963..4484db213 100644
--- a/src/core/client/stream/common/UserBox/UserBoxAuthenticated.tsx
+++ b/src/core/client/stream/common/UserBox/UserBoxAuthenticated.tsx
@@ -18,7 +18,9 @@ const UserBoxAuthenticated: FunctionComponent = (
props
) => {
const Username = () => (
- {props.username}
+
+ {props.username}
+
);
return (
@@ -26,7 +28,7 @@ const UserBoxAuthenticated: FunctionComponent = (
Signed in as
-
+
{props.showLogoutButton && (
@@ -57,7 +57,7 @@ exports[`renders correctly without logout button 1`] = `
diff --git a/src/core/client/stream/shared/htmlContent.css b/src/core/client/stream/shared/htmlContent.css
index e6c4e0915..7c589f5dc 100644
--- a/src/core/client/stream/shared/htmlContent.css
+++ b/src/core/client/stream/shared/htmlContent.css
@@ -7,7 +7,7 @@ $commentsLinkColorHovered: var(--palette-primary-700);
font-style: normal;
font-weight: var(--font-weight-primary-regular);
font-size: var(--font-size-3);
- line-height: var(--line-height-comment-body);
+ line-height: 1.45;
color: var(--palette-text-500);
overflow-wrap: break-word;
diff --git a/src/core/client/stream/tabs/Comments/Comment/Comment.css b/src/core/client/stream/tabs/Comments/Comment/Comment.css
index a2f657663..66463538d 100644
--- a/src/core/client/stream/tabs/Comments/Comment/Comment.css
+++ b/src/core/client/stream/tabs/Comments/Comment/Comment.css
@@ -20,6 +20,6 @@ $commentTimestampColor: var(--palette-grey-500);
font-style: normal;
font-weight: var(--font-weight-primary-semi-bold);
font-size: var(--font-size-2);
- line-height: var(--line-height-3);
+ line-height: 1.14;
color: $commentTimestampColor;
}
diff --git a/src/core/client/stream/tabs/Comments/Comment/Comment.tsx b/src/core/client/stream/tabs/Comments/Comment/Comment.tsx
index 0eb316adf..298f8c655 100644
--- a/src/core/client/stream/tabs/Comments/Comment/Comment.tsx
+++ b/src/core/client/stream/tabs/Comments/Comment/Comment.tsx
@@ -34,6 +34,7 @@ const Comment: FunctionComponent = (props) => {
size="half"
className={cn(styles.root, {
[styles.highlight]: props.highlight,
+ [CLASSES.comment.highlight]: props.highlight,
})}
>
{
{commentTags}
{editable && (
-
+
edit