michael/cinny
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity

Change font to Public Sans

Browse source
This commit is contained in:
Ajay Bura 2022-08-22 20:05:06 +05:30
parent fd79ea4b9b
commit 6c8434a1cf
4 changed files with 52 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
package-lock.json generated
View file

@ -9,8 +9,8 @@
"version": "2.1.2", "version": "2.1.2",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@fontsource/inter": "^4.5.12", "@fontsource/noto-sans": "^4.5.11",
"@fontsource/roboto": "^4.5.8", "@fontsource/public-sans": "^4.5.10",
"@khanacademy/simple-markdown": "^0.8.3", "@khanacademy/simple-markdown": "^0.8.3",
"@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.12.tgz", "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.12.tgz",
"@tippyjs/react": "^4.2.6", "@tippyjs/react": "^4.2.6",
@ -1831,15 +1831,15 @@
"url": "https://github.com/sponsors/sindresorhus" "url": "https://github.com/sponsors/sindresorhus"
} }
}, },
"node_modules/@fontsource/inter": { "node_modules/@fontsource/noto-sans": {
"version": "4.5.12", "version": "4.5.11",
"resolved": "https://registry.npmjs.org/@fontsource/inter/-/inter-4.5.12.tgz", "resolved": "https://registry.npmjs.org/@fontsource/noto-sans/-/noto-sans-4.5.11.tgz",
"integrity": "sha512-bGKk4/8tube/nCk8hav0ZDBVbzJzc7m0Vt4xF5p15IN4YImwGdtKG38Oq5bU8xHNS+VfvbFFCepgQNj7Pr/Lvg==" "integrity": "sha512-lBX7FCjIjSrQ+iMuXUuO+mbjbnUsJyZANg/04PgkeeAYe+cwnX81ibbgrAk1F56M6/btIrWQoDjxsK6Sz8KoVQ=="
}, },
"node_modules/@fontsource/roboto": { "node_modules/@fontsource/public-sans": {
"version": "4.5.8", "version": "4.5.10",
"resolved": "https://registry.npmjs.org/@fontsource/roboto/-/roboto-4.5.8.tgz", "resolved": "https://registry.npmjs.org/@fontsource/public-sans/-/public-sans-4.5.10.tgz",
"integrity": "sha512-CnD7zLItIzt86q4Sj3kZUiLcBk1dSk81qcqgMGaZe7SQ1P8hFNxhMl5AZthK1zrDM5m74VVhaOpuMGIL4gagaA==" "integrity": "sha512-WHqsfQXyjrIy9cQVnsVvnNRIvqB5K9+4OieYSZGRkOhAe7XSR6ghiwjkXVwF6Sc6iGE0YSBpktPymYt2USbHYw=="
}, },
"node_modules/@humanwhocodes/config-array": { "node_modules/@humanwhocodes/config-array": {
"version": "0.10.4", "version": "0.10.4",
@ -3025,8 +3025,6 @@
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz",
"integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==", "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==",
"dev": true, "dev": true,
"optional": true,
"peer": true,
"dependencies": { "dependencies": {
"fast-deep-equal": "^3.1.1", "fast-deep-equal": "^3.1.1",
"json-schema-traverse": "^1.0.0", "json-schema-traverse": "^1.0.0",
@ -3042,9 +3040,7 @@
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
"dev": true, "dev": true
"optional": true,
"peer": true
}, },
"node_modules/ajv-keywords": { "node_modules/ajv-keywords": {
"version": "3.5.2", "version": "3.5.2",
@ -14830,15 +14826,15 @@
} }
} }
}, },
"@fontsource/inter": { "@fontsource/noto-sans": {
"version": "4.5.12", "version": "4.5.11",
"resolved": "https://registry.npmjs.org/@fontsource/inter/-/inter-4.5.12.tgz", "resolved": "https://registry.npmjs.org/@fontsource/noto-sans/-/noto-sans-4.5.11.tgz",
"integrity": "sha512-bGKk4/8tube/nCk8hav0ZDBVbzJzc7m0Vt4xF5p15IN4YImwGdtKG38Oq5bU8xHNS+VfvbFFCepgQNj7Pr/Lvg==" "integrity": "sha512-lBX7FCjIjSrQ+iMuXUuO+mbjbnUsJyZANg/04PgkeeAYe+cwnX81ibbgrAk1F56M6/btIrWQoDjxsK6Sz8KoVQ=="
}, },
"@fontsource/roboto": { "@fontsource/public-sans": {
"version": "4.5.8", "version": "4.5.10",
"resolved": "https://registry.npmjs.org/@fontsource/roboto/-/roboto-4.5.8.tgz", "resolved": "https://registry.npmjs.org/@fontsource/public-sans/-/public-sans-4.5.10.tgz",
"integrity": "sha512-CnD7zLItIzt86q4Sj3kZUiLcBk1dSk81qcqgMGaZe7SQ1P8hFNxhMl5AZthK1zrDM5m74VVhaOpuMGIL4gagaA==" "integrity": "sha512-WHqsfQXyjrIy9cQVnsVvnNRIvqB5K9+4OieYSZGRkOhAe7XSR6ghiwjkXVwF6Sc6iGE0YSBpktPymYt2USbHYw=="
}, },
"@humanwhocodes/config-array": { "@humanwhocodes/config-array": {
"version": "0.10.4", "version": "0.10.4",
@ -15823,14 +15819,15 @@
"resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
"integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
"dev": true, "dev": true,
"requires": {}, "requires": {
"ajv": "^8.0.0"
},
"dependencies": { "dependencies": {
"ajv": { "ajv": {
"version": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz", "version": "8.9.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz",
"integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==", "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==",
"dev": true, "dev": true,
"optional": true,
"peer": true,
"requires": { "requires": {
"fast-deep-equal": "^3.1.1", "fast-deep-equal": "^3.1.1",
"json-schema-traverse": "^1.0.0", "json-schema-traverse": "^1.0.0",
@ -15842,9 +15839,7 @@
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
"dev": true, "dev": true
"optional": true,
"peer": true
} }
} }
}, },

4
package.json
View file

@ -15,8 +15,8 @@
"author": "Ajay Bura", "author": "Ajay Bura",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@fontsource/inter": "^4.5.12", "@fontsource/noto-sans": "^4.5.11",
"@fontsource/roboto": "^4.5.8", "@fontsource/public-sans": "^4.5.10",
"@khanacademy/simple-markdown": "^0.8.3", "@khanacademy/simple-markdown": "^0.8.3",
"@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.12.tgz", "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.12.tgz",
"@tippyjs/react": "^4.2.6", "@tippyjs/react": "^4.2.6",

11
src/font.js
View file

@ -1,5 +1,6 @@
import '@fontsource/roboto/300.css'; import '@fontsource/noto-sans/300.css';
import '@fontsource/roboto/400.css'; import '@fontsource/noto-sans/400.css';
import '@fontsource/roboto/500.css'; import '@fontsource/noto-sans/500.css';
import '@fontsource/roboto/700.css'; import '@fontsource/noto-sans/600.css';
import '@fontsource/inter/variable.css'; import '@fontsource/noto-sans/700.css';
import '@fontsource/public-sans/variable.css';

52
src/index.scss
View file

@ -131,27 +131,27 @@
/* font styles: font-size, letter-spacing, line-hight */ /* font styles: font-size, letter-spacing, line-hight */
--fs-h1: 36px; --fs-h1: 36px;
--ls-h1: -1.5px; --ls-h1: 0;
--lh-h1: 38px; --lh-h1: 38px;
--fs-h2: 24px; --fs-h2: 24px;
--ls-h2: -0.5px; --ls-h2: 0;
--lh-h2: 30px; --lh-h2: 30px;
--fs-s1: 18px; --fs-s1: 18px;
--ls-s1: -0.2px; --ls-s1: 0;
--lh-s1: 24px; --lh-s1: 24px;
--fs-b1: 16px; --fs-b1: 16px;
--ls-b1: 0.1px; --ls-b1: 0;
--lh-b1: 24px; --lh-b1: 24px;
--fs-b2: 14px; --fs-b2: 14px;
--ls-b2: 0.2px; --ls-b2: 0;
--lh-b2: 20px; --lh-b2: 20px;
--fs-b3: 12px; --fs-b3: 12px;
--ls-b3: 0px; --ls-b3: 0;
--lh-b3: 16px; --lh-b3: 16px;
/* font-weight */ /* font-weight */
@ -192,8 +192,8 @@
--fluid-slide-down: cubic-bezier(0.02, 0.82, 0.4, 0.96); --fluid-slide-down: cubic-bezier(0.02, 0.82, 0.4, 0.96);
--fluid-slide-up: cubic-bezier(0.13, 0.56, 0.25, 0.99); --fluid-slide-up: cubic-bezier(0.13, 0.56, 0.25, 0.99);
--font-primary: 'Roboto', sans-serif; --font-primary: 'Public SansVariable', 'Noto Sans', sans-serif;
--font-secondary: 'Roboto', sans-serif; --font-secondary: 'Public SansVariable', 'Noto Sans', sans-serif;
} }
@ -276,23 +276,15 @@
--bs-primary-outline: 0 0 0 2px var(--bg-primary-border); --bs-primary-outline: 0 0 0 2px var(--bg-primary-border);
/* font styles: font-size, letter-spacing, line-hight */ /* font styles: font-size, letter-spacing, line-hight */
--fs-h1: 35.6px; --fs-h1: 36px;
--fs-h2: 24px;
--fs-h2: 23.6px; --fs-s1: 18px;
--fs-b1: 15px;
--fs-s1: 17.6px; --fs-b2: 14px;
--fs-b3: 12px;
--fs-b1: 14.6px;
--ls-b1: 0.14px;
--fs-b2: 13.2px;
--fs-b3: 11.2px;
/* override normal font weight for dark mode */ /* override normal font weight for dark mode */
--fw-normal: 350; --fw-normal: 330;
--font-secondary: 'InterVariable', 'Roboto', sans-serif;
} }
.dark-theme, .dark-theme,
@ -336,33 +328,27 @@
/* override font styles for primary font */ /* override font styles for primary font */
--fs-h1: 36px; --fs-h1: 36px;
--ls-h1: -1.5px;
--lh-h1: 38px; --lh-h1: 38px;
--fs-h2: 24px; --fs-h2: 24px;
--ls-h2: -0.5px;
--lh-h2: 30px; --lh-h2: 30px;
--fs-s1: 18px; --fs-s1: 18px;
--ls-s1: -0.2px;
--lh-s1: 24px; --lh-s1: 24px;
--fs-b1: 16px; --fs-b1: 16px;
--ls-b1: 0.1px;
--lh-b1: 24px; --lh-b1: 24px;
--fs-b2: 14px; --fs-b2: 14px;
--ls-b2: 0.2px;
--lh-b2: 20px; --lh-b2: 20px;
--fs-b3: 12px; --fs-b3: 12px;
--ls-b3: 0px;
--lh-b3: 16px; --lh-b3: 16px;
--fw-light: 300; --fw-light: 400;
--fw-normal: 400; --fw-normal: 500;
--fw-medium: 500; --fw-medium: 600;
--fw-bold: 600; --fw-bold: 700;
} }
html { html {