From 6d9aa8a81b0a73d6df7329a7627b2ac768e69f87 Mon Sep 17 00:00:00 2001 From: Tyler Sticka Date: Fri, 8 Nov 2019 10:29:21 -0800 Subject: [PATCH 1/3] Better color for JavaScript strings --- src/assets/toolkit/styles/vendor/prism.css | 6 +++-- src/patterns/components/cms-content/base.hbs | 23 +++++++++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/assets/toolkit/styles/vendor/prism.css b/src/assets/toolkit/styles/vendor/prism.css index 220efc87d..146f12224 100644 --- a/src/assets/toolkit/styles/vendor/prism.css +++ b/src/assets/toolkit/styles/vendor/prism.css @@ -16,14 +16,16 @@ } .token.property, -.token.keyword { +.token.keyword, +.token.interpolation-punctuation { color: color-mod(var(--color-blue) h(-15) s(+50%) l(+20%)); } .token.constant, .token.attr-value, .token.selector, -.token.class-name { +.token.class-name, +:matches(.language-js, .language-javascript) .token.string { color: color-mod(var(--color-green) l(+17%)); } diff --git a/src/patterns/components/cms-content/base.hbs b/src/patterns/components/cms-content/base.hbs index 35d080ab9..a62176986 100644 --- a/src/patterns/components/cms-content/base.hbs +++ b/src/patterns/components/cms-content/base.hbs @@ -58,5 +58,26 @@ repos = indexedRepos.sort((a, b) => { return a.index < b.index ? -1 : 1; } return a.language < b.language ? -1 : 1; -}); +}); + +// Set up a resolved promise for our loop +let step = Promise.resolve(); + +// For every frame we need to generate… +for (let i = 0; i <= frames; i++) { + let position = duration / frames * i; + let filename = `whut-${filePrefix}${i}${fileScale}${fileExtension}`; + // Begin this step when the previous finishes + step = step.then(() => { + timeline.pause(position); + return svgAsPngUri(document.getElementById("amoeba"), { scale }).then( + uri => { + // Convert data URI to plain base64 + let imgDataIndex = uri.indexOf("base64,") + "base64,".length; + let imgData = uri.substr(imgDataIndex); + zip.file(filename, imgData, { base64: true }); + } + ); + }); +} From 8333153cb2121558d3a5619a25478d6cac6a562e Mon Sep 17 00:00:00 2001 From: Tyler Sticka Date: Fri, 8 Nov 2019 10:30:00 -0800 Subject: [PATCH 2/3] Escape less-than --- src/patterns/components/cms-content/base.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/patterns/components/cms-content/base.hbs b/src/patterns/components/cms-content/base.hbs index a62176986..fb57a5e77 100644 --- a/src/patterns/components/cms-content/base.hbs +++ b/src/patterns/components/cms-content/base.hbs @@ -64,7 +64,7 @@ repos = indexedRepos.sort((a, b) => { let step = Promise.resolve(); // For every frame we need to generate… -for (let i = 0; i <= frames; i++) { +for (let i = 0; i <= frames; i++) { let position = duration / frames * i; let filename = `whut-${filePrefix}${i}${fileScale}${fileExtension}`; // Begin this step when the previous finishes From 5df1949771fa8070f09b89ab03c867432d19b0df Mon Sep 17 00:00:00 2001 From: Tyler Sticka Date: Fri, 8 Nov 2019 12:49:55 -0800 Subject: [PATCH 3/3] Tweak highlight shade of green --- src/assets/toolkit/styles/vendor/prism.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/toolkit/styles/vendor/prism.css b/src/assets/toolkit/styles/vendor/prism.css index 146f12224..4a17c8fca 100644 --- a/src/assets/toolkit/styles/vendor/prism.css +++ b/src/assets/toolkit/styles/vendor/prism.css @@ -26,7 +26,7 @@ .token.selector, .token.class-name, :matches(.language-js, .language-javascript) .token.string { - color: color-mod(var(--color-green) l(+17%)); + color: color-mod(var(--color-green) l(+25%) s(-20%)); } .token.rule,