git ssb - Merge pull request #361 from ssbc/emoji-font-fix

Fix weird emoji font issues

Christian Bundy authored on 1/7/2020, 10:58:30 PM
GitHub committed on 1/7/2020, 10:58:30 PM
Parent: 261718c426b0d5a333dfa4acc00aacf92c5fe394
Parent: 169d5e007b1d1a1621fc112ff9c695e6bb25ef6f

app/html/app.mcss	changed
app/styles/mcss/markdown.mcss	changed
app/sync/initialise/styles.js	changed

app/html/app.mcssView
		@@ -1,7 +1,7 @@
1	1 …	App {
2	2 …	background: var(--app-border-background)
3		- font-family: arial, sans-serif, NotoColorEmoji
	3 …	+ font-family: arial, sans-serif
4	4 …
5	5 …	overflow: hidden
6	6 …
7	7 …	min-height: 0px

app/styles/mcss/markdown.mcssView
		@@ -94,8 +94,11 @@
94	94 …	list-style-type: none
WritePreview
95	95 …	}
96	96 …	}
97	97 …
	98 …	+ (span.emoji) {
	99 …	+ font-family: NotoColorEmoji;
	100 …	+ }
98	101 …
99	102 …	(img.emoji) {
100	103 …	height: 1.2em
101	104 …	width: 1.2em

app/sync/initialise/styles.jsView
		@@ -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, arial, sans-serif, NotoColorEmoji; }', '')
	38 …	+ innerHTML: when(openDyslexicEnabled, '.App { font-family: OpenDyslexicRegular, arial, sans-serif; }', '')
39	39 …	})
40	40 …	)
41	41 …	}
42	42 …	}

Dominic / patchbay