Commit 96fd009f7188e314e4308ddf338613c60913fa9a
FONT - add noto-color-emoji
mixmix committed on 6/11/2019, 4:22:39 AMParent: a035e0e448371bb320700598868f4917a757c12b
Files changed
| app/html/app.mcss | changed |
| app/styles/css/noto-color-emoji.js | added |
| app/sync/initialise/styles.js | changed |
| package-lock.json | changed |
| package.json | changed |
| app/html/app.mcss | ||
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| 1 | 1 … | App { |
| 2 | 2 … | background: var(--app-border-background) |
| 3 … | + font-family: arial, sans-serif, NotoColorEmoji | |
| 3 | 4 … | |
| 4 | 5 … | overflow: hidden |
| 5 | 6 … | |
| 6 | 7 … | min-height: 0px |
| app/styles/css/noto-color-emoji.js | ||
|---|---|---|
| @@ -1,0 +1,11 @@ | ||
| 1 … | +const nest = require('depnest') | |
| 2 … | +const requireStyle = require('require-style') | |
| 3 … | +const { assign } = Object | |
| 4 … | + | |
| 5 … | +exports.gives = nest('styles.css') | |
| 6 … | + | |
| 7 … | +exports.create = function (api) { | |
| 8 … | + return nest('styles.css', (sofar = {}) => { | |
| 9 … | + return assign(sofar, { notoColorEmoji: requireStyle('noto-color-emoji') }) | |
| 10 … | + }) | |
| 11 … | +} | |
| app/sync/initialise/styles.js | ||
|---|---|---|
| @@ -34,9 +34,9 @@ | ||
| 34 | 34 … | }) |
| 35 | 35 … | ) |
| 36 | 36 … | document.head.appendChild( |
| 37 | 37 … | h('style', { |
| 38 | - innerHTML: when(openDyslexicEnabled, '.App { font-family: OpenDyslexicRegular; }', '') | |
| 38 … | + innerHTML: when(openDyslexicEnabled, '.App { font-family: OpenDyslexicRegular, arial, sans-serif, NotoColorEmoji; }', '') | |
| 39 | 39 … | }) |
| 40 | 40 … | ) |
| 41 | 41 … | } |
| 42 | 42 … | } |
| package-lock.json | ||
|---|---|---|
| The diff is too large to show. Use a local git client to view these changes. Old file size: 762844 bytes New file size: 763114 bytes |
| package.json | ||
|---|---|---|
| @@ -66,8 +66,9 @@ | ||
| 66 | 66 … | "marama": "^1.2.2", |
| 67 | 67 … | "micro-css": "^2.0.1", |
| 68 | 68 … | "mutant": "^3.22.3", |
| 69 | 69 … | "mutant-scroll": "^1.0.2", |
| 70 … | + "noto-color-emoji": "^1.0.0", | |
| 70 | 71 … | "open-dyslexic": "^1.0.3", |
| 71 | 72 … | "open-external": "^0.1.1", |
| 72 | 73 … | "patch-drafts": "0.0.6", |
| 73 | 74 … | "patch-history": "^1.0.0", |
Built with git-ssb-web