diff --git a/manifest.json b/manifest.json index 9b7959e..07ff64d 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "id": "federated-emoji", "name": "Federated Emoji", - "version": "1.0.2", + "version": "1.0.3", "minAppVersion": "1.5.0", "description": "Render and insert custom emoji from Mastodon and compatible federated instances.", "author": "banhanlu", diff --git a/package-lock.json b/package-lock.json index aefdcd3..2ef963a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "federated-emoji", - "version": "1.0.2", + "version": "1.0.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "federated-emoji", - "version": "1.0.2", + "version": "1.0.3", "license": "MIT", "devDependencies": { "@codemirror/language": "^6.11.3", diff --git a/package.json b/package.json index bd39bd4..3ee7721 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "federated-emoji", - "version": "1.0.2", + "version": "1.0.3", "description": "Render and insert Mastodon-style custom emoji in Obsidian", "main": "main.js", "scripts": { diff --git a/scripts/check-release.mjs b/scripts/check-release.mjs index c9c4b9a..b67a94e 100644 --- a/scripts/check-release.mjs +++ b/scripts/check-release.mjs @@ -24,6 +24,9 @@ if (/\bconst\s+[A-Za-z_$][\w$]*\s*=\s*this\s*;/.test(source)) failures.push("do if (source.includes("\\-") || source.includes("\\:")) failures.push("remove unnecessary regular expression escapes"); if (!source.includes("getSettingDefinitions():")) failures.push("settings must provide searchable setting definitions"); if (styles.includes("!important")) failures.push("styles must not use !important"); +if (!styles.includes(".markdown-rendered img.obsidian-emoji-inline") || !styles.includes(".cm-editor img.obsidian-emoji-inline")) { + failures.push("inline emoji styles must outrank host image layout rules in Reading view and Live Preview"); +} if (failures.length > 0) { for (const failure of failures) console.error(`- ${failure}`); diff --git a/styles.css b/styles.css index ed91cb1..773dbb8 100644 --- a/styles.css +++ b/styles.css @@ -1,13 +1,26 @@ -.obsidian-emoji-inline { +.obsidian-emoji-inline, +.markdown-rendered img.obsidian-emoji-inline, +.cm-editor img.obsidian-emoji-inline { display: inline-block; + position: static; + float: none; + clear: none; + flex: 0 0 1.35em; width: 1.35em; + min-width: 1.35em; + max-width: 1.35em; height: 1.35em; + min-height: 1.35em; + max-height: 1.35em; margin: 0 0.08em; + padding: 0; + border: 0; object-fit: contain; vertical-align: -0.28em; } -.obsidian-emoji-live-widget { +.obsidian-emoji-live-widget, +.cm-editor span.obsidian-emoji-live-widget { display: inline; } diff --git a/versions.json b/versions.json index 43d4f38..c80be4c 100644 --- a/versions.json +++ b/versions.json @@ -1,5 +1,6 @@ { "1.0.0": "1.5.0", "1.0.1": "1.5.0", - "1.0.2": "1.5.0" + "1.0.2": "1.5.0", + "1.0.3": "1.5.0" }