Commit 20d0d5966b00027944c52cfdd4ac306ea61197a4
Merge branch 'master' of github.com:ssbc/patchbay
mixmix committed on 1/26/2020, 8:32:17 AMParent: 11a18b6002794331feb9f11d67fbfa08986633e9
Parent: a32c4b1713d7a46d55c2e27257ffbe0ec9a5ef01
Files changed
| app/html/app.mcss | changed |
| app/styles/mcss/markdown.mcss | changed |
| app/sync/initialise/styles.js | changed |
| package-lock.json | changed |
| package.json | changed |
| app/html/app.mcss | ||
|---|---|---|
| @@ -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.mcss | ||
|---|---|---|
| @@ -94,8 +94,11 @@ | ||
| 94 | 94 … | list-style-type: none |
| 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.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, arial, sans-serif, NotoColorEmoji; }', '') | |
| 38 … | + innerHTML: when(openDyslexicEnabled, '.App { font-family: OpenDyslexicRegular, arial, sans-serif; }', '') | |
| 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: 547754 bytes New file size: 550944 bytes |
| package.json | |||
|---|---|---|---|
| @@ -105,35 +105,34 @@ | |||
| 105 | 105 … | "ssb-blobs": "^1.1.12", | |
| 106 | 106 … | "ssb-chess-db": "^1.0.6", | |
| 107 | 107 … | "ssb-chess-mithril": "1.0.13", | |
| 108 | 108 … | "ssb-config": "^3.4.3", | |
| 109 | - "ssb-conn": "^0.11.2", | ||
| 109 … | + "ssb-conn": "^0.11.3", | ||
| 110 | 110 … | "ssb-db": "^19.3.2", | |
| 111 | 111 … | "ssb-device-address": "^1.1.6", | |
| 112 | 112 … | "ssb-ebt": "^5.6.7", | |
| 113 | 113 … | "ssb-friend-pub": "^1.0.7", | |
| 114 | 114 … | "ssb-friends": "^4.1.4", | |
| 115 | - "ssb-identities": "^2.1.0", | ||
| 115 … | + "ssb-identities": "^2.1.1", | ||
| 116 | 116 … | "ssb-invite": "~2.0.4", | |
| 117 | 117 … | "ssb-lan": "^0.1.4", | |
| 118 | - "ssb-local": "^1.0.0", | ||
| 119 | 118 … | "ssb-logging": "^1.0.0", | |
| 120 | 119 … | "ssb-master": "^1.0.3", | |
| 121 | 120 … | "ssb-meme": "^1.0.4", | |
| 122 | 121 … | "ssb-mentions": "^0.5.0", | |
| 123 | 122 … | "ssb-mutual": "^0.1.0", | |
| 124 | 123 … | "ssb-no-auth": "^1.0.0", | |
| 125 | 124 … | "ssb-onion": "^1.0.0", | |
| 126 | 125 … | "ssb-ooo": "^1.1.1", | |
| 127 | - "ssb-peer-invites": "^2.0.0", | ||
| 128 | - "ssb-plugins": "^1.0.2", | ||
| 126 … | + "ssb-peer-invites": "^2.0.2", | ||
| 127 … | + "ssb-plugins": "^1.0.3", | ||
| 129 | 128 … | "ssb-private": "^0.2.3", | |
| 130 | 129 … | "ssb-query": "^2.1.0", | |
| 131 | 130 … | "ssb-ref": "^2.13.6", | |
| 132 | - "ssb-replicate": "^1.3.1", | ||
| 131 … | + "ssb-replicate": "^1.3.2", | ||
| 133 | 132 … | "ssb-search": "^1.1.2", | |
| 134 | 133 … | "ssb-sort": "^1.1.0", | |
| 135 | - "ssb-suggest": "^1.0.4", | ||
| 134 … | + "ssb-suggest": "^1.0.6", | ||
| 136 | 135 … | "ssb-tangle": "^1.0.1", | |
| 137 | 136 … | "ssb-unix-socket": "^1.0.0", | |
| 138 | 137 … | "ssb-unread": "^1.0.8", | |
| 139 | 138 … | "ssb-uri": "^1.0.1", | |
Built with git-ssb-web