diff --git a/.gitignore b/.gitignore index 167ac045..d668b5b1 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,3 @@ mastodon.log assets/robots.txt /inline-script-checksum.json /assets/inline-script.js.map -/assets/icons.svg diff --git a/bin/build-svg.js b/bin/build-svg.js index f575831e..38179787 100755 --- a/bin/build-svg.js +++ b/bin/build-svg.js @@ -28,7 +28,13 @@ async function main () { result = `\n${result}\n` - await writeFile(path.resolve(__dirname, '../assets/icons.svg'), result, 'utf8') + let html2xxFilepath = path.join(__dirname, '../templates/2xx.html') + let html2xxFile = await readFile(html2xxFilepath, 'utf8') + html2xxFile = html2xxFile.replace( + /[\s\S]+/, + '' + result + '' + ) + await writeFile(html2xxFilepath, html2xxFile, 'utf8') } main().catch(err => { diff --git a/routes/_components/Avatar.html b/routes/_components/Avatar.html index 50ad976c..47d9c27b 100644 --- a/routes/_components/Avatar.html +++ b/routes/_components/Avatar.html @@ -1,6 +1,6 @@ {#if error} {:elseif $autoplayGifs} {#if icon} - + {/if}

{title}

diff --git a/routes/_components/ExternalLink.html b/routes/_components/ExternalLink.html index 78a18bd9..b5bc9950 100644 --- a/routes/_components/ExternalLink.html +++ b/routes/_components/ExternalLink.html @@ -5,7 +5,7 @@ class={computedClass}> {#if showIcon} - + {/if} + \ No newline at end of file diff --git a/routes/_components/dialog/components/ModalDialog.html b/routes/_components/dialog/components/ModalDialog.html index 9fe431a6..a3336078 100644 --- a/routes/_components/dialog/components/ModalDialog.html +++ b/routes/_components/dialog/components/ModalDialog.html @@ -16,7 +16,7 @@ @@ -193,4 +193,4 @@ } } } - + \ No newline at end of file diff --git a/routes/_components/search/Search.html b/routes/_components/search/Search.html index 3748a4c5..6acaa350 100644 --- a/routes/_components/search/Search.html +++ b/routes/_components/search/Search.html @@ -9,7 +9,7 @@ @@ -74,4 +74,4 @@ } } } - + \ No newline at end of file diff --git a/routes/_components/settings/SettingsListItem.html b/routes/_components/settings/SettingsListItem.html index ff59c46d..92ee21cc 100644 --- a/routes/_components/settings/SettingsListItem.html +++ b/routes/_components/settings/SettingsListItem.html @@ -2,7 +2,7 @@ {#if icon} - + {/if} @@ -70,4 +70,4 @@ offsetForIcon: void 0 }) } - + \ No newline at end of file diff --git a/routes/_components/status/StatusDetails.html b/routes/_components/status/StatusDetails.html index fbbf81ae..07ac7e37 100644 --- a/routes/_components/status/StatusDetails.html +++ b/routes/_components/status/StatusDetails.html @@ -26,7 +26,7 @@ href="/statuses/{originalStatusId}/reblogs" aria-label={reblogsLabel}> - + {numReblogs} @@ -34,7 +34,7 @@ href="/statuses/{originalStatusId}/favorites" aria-label={favoritesLabel}> - + {numFavs} @@ -191,4 +191,4 @@ ExternalLink } } - + \ No newline at end of file diff --git a/routes/_components/status/StatusHeader.html b/routes/_components/status/StatusHeader.html index 96fa9580..baa3583e 100644 --- a/routes/_components/status/StatusHeader.html +++ b/routes/_components/status/StatusHeader.html @@ -3,7 +3,7 @@ - +
@@ -124,4 +124,4 @@ } } } - + \ No newline at end of file diff --git a/routes/_components/status/StatusMediaAttachments.html b/routes/_components/status/StatusMediaAttachments.html index 58f088ea..1560bde6 100644 --- a/routes/_components/status/StatusMediaAttachments.html +++ b/routes/_components/status/StatusMediaAttachments.html @@ -7,7 +7,7 @@ delegate-key={delegateKey} >
- +
@@ -23,7 +23,7 @@
- +
diff --git a/templates/2xx.html b/templates/2xx.html index a063333f..1cf36baf 100644 --- a/templates/2xx.html +++ b/templates/2xx.html @@ -5,7 +5,7 @@ - + @@ -49,6 +49,7 @@ html{scrollbar-face-color:var(--scrollbar-face-color);scrollbar-track-color:var( +
%sapper.html%
@@ -59,6 +60,51 @@ html{scrollbar-face-color:var(--scrollbar-face-color);scrollbar-track-color:var( + + + + + +Notifications +Local +Federated +Settings +Reply +Reply to thread +Boost +Favorite +More +Spinner +Empty user profile +Play +Show Sensitive Content +Hide Sensitive Content +Locked +Unlocked +Sealed Envelope +Stop Following +Follow +External Link +Search +Conversations +Paperclip +Thumbtack +List +Ban +Add media +Custom emoji +Content warning +Check +Delete +Follow requested +Compose +Close +Mute +Unmute +Link + + +