Commit 9c3bf9ff authored by Leon Arnott's avatar Leon Arnott
Browse files

Fixed a bug caused by an obscure CSS collision between Twine and the Harlowe syntax highlighter.

parent 9ea212b721bf
......@@ -1508,8 +1508,8 @@
if (m.initiator && !["select","div","span"].some(e => e === m.initiator.tagName.toLowerCase())) {
return;
}
const t8nName1 = t8nPreviewAnims[m.changers['t8n-depart'] ? parse(m.changers['t8n-depart'][0]) : "default"](true);
const t8nName2 = t8nPreviewAnims[m.changers['t8n-arrive'] ? parse(m.changers['t8n-arrive'][0]) : "default"](false);
const t8nName1 = "harlowe-3-" + t8nPreviewAnims[m.changers['t8n-depart'] ? parse(m.changers['t8n-depart'][0]) : "default"](true);
const t8nName2 = "harlowe-3-" + t8nPreviewAnims[m.changers['t8n-arrive'] ? parse(m.changers['t8n-arrive'][0]) : "default"](false);
const t8nTime = m.changers['t8n-time'] ? m.changers['t8n-time'][0] : "0.8s";
const span1 = el.firstChild;
......@@ -1661,7 +1661,7 @@
if (m.initiator && !["select","div","span"].some(e => e === m.initiator.tagName.toLowerCase())) {
return;
}
const t8nName = t8nPreviewAnims[m.changers.t8n ? parse(m.changers.t8n[0]) : "default"](false);
const t8nName = "harlowe-3-" + t8nPreviewAnims[m.changers.t8n ? parse(m.changers.t8n[0]) : "default"](false);
const t8nTime = m.changers['t8n-time'] ? m.changers['t8n-time'][0] : "0.8s";
const span = el.lastChild;
......
......@@ -15,7 +15,7 @@ const {min} = Math,
typeColours = require('../js/utils/typecolours'),
toolbarStyles = (execSync('sass ./scripts/toolbar.css --scss --style compressed') + '').replace(/\ufeff/,''),
animations = (execSync('sass ./scss/animations.scss --scss --style compressed') + '').replace(/\ufeff/,''),
animations = (execSync('sass ./scss/animations.scss --scss --style compressed') + '').replace(/\ufeff/,'').replace(/@keyframes /g, "@keyframes harlowe-3-");
changerAttachmentColour = typeColours.changer.replace('color:','').replace('1.0','0.5');
const versionClass = 'cm-harlowe-3-';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment