Use font instead of SVG icons; improve readme

nafnlj · May 15, 2020 · 52e4da5 · 52e4da5
1 parent 07d5c39
commit 52e4da5
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 119 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
 lint:
-	npx [email protected] --write --single-quote --tab-width=4 --print-width=120 *.{js,html,css,md}
+	npx [email protected] --write --single-quote --tab-width=4 --print-width=140 *.{js,html,css,md}
 dev:
 	npx serve
diff --git a/README.md b/README.md
@@ -18,6 +18,25 @@ When you open a link, NoPaste reads, decodes, and decompresses whatever is after
 
 This process is done entirely **in your browser**, and the web server hosting NoPaste [never has access to the fragment](https://en.wikipedia.org/wiki/Fragment_identifier)
 
+## Embedded NoPaste snippets
+
+You can include NoPaste code snippets into your own website by clicking the _Embed_ button and using the generated HTML code.
+
+Here is an example of generated code and how it looks (click on the screenshot to see the interactive version)
+
+```html
+<iframe
+    width="100%"
+    height="243"
+    frameborder="0"
+    src="https://nopaste.ml/?l=py#XQAAAQAbAQAAAAAAAAA0m0pnuFI8c+qagMoNTEcTIfyUWbZjtjmBYcmJSzoNwS5iVMWHzvowv3IPM0vOG5cjrtDRTSVP/0biTIrrahfmbkuMQBBeSiSGpaJOqYJiKmUDYn2Gp1RtWE6gm8fLHMB4eyZ3+rEbUQwWyMcmWqvZ7m96RUeFyZdYbE85JGvhghqF8cyPB0ZjV0OQWsDxn5O5ysMrIcL+pKPk89EtLjAHhA1LZL9F3hzAtTx7I+GlyrxhhXGxAN//CvtaAA=="
+></iframe>
+```
+
+[![iframe](https://raw.githubusercontent.com/bokub/nopaste/images/pagerank.png)](https://jsfiddle.net/cqr2kxf5/)
+
+Feel free to edit the `height` and `width` attributes, so they suit your needs
+
 ## Maximum sizes for links
 
 NoPaste is great for sharing code snippets on various platforms.
@@ -41,14 +60,6 @@ These are the maximum link lengths on some apps and browsers.
 | Android         | 8,192                     |                                         |
 | Safari          | Lots                      |                                         |
 
-## Embedded NoPaste snippets
-
-You can include NoPaste code snippets into your own website by clicking the _Embed_ button and using the generated HTML code
-
-[This is what an embedded Paste snippet looks like](https://jsfiddle.net/bokub/nwtcdrph/show)
-
-Feel free to edit the generated `height` and `width` attributes, so they suit your needs
-
 ## Generate NoPaste links
 
 NoPaste links can be created easily from your system's command line:

diff --git a/index.html b/index.html
@@ -2,10 +2,7 @@
 <html lang="en">
     <head>
         <meta charset="UTF-8" />
-        <meta
-            name="viewport"
-            content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"
-        />
+        <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" />
         <meta http-equiv="X-UA-Compatible" content="ie=edge" />
 
         <title>NoPaste - No-database paste service</title>
@@ -35,31 +32,18 @@
     </head>
     <body class="m-0">
         <script>
-            const readOnly =
-                window.location !== window.parent.location ||
-                new URLSearchParams(window.location.search).has('readonly');
+            const readOnly = window.location !== window.parent.location || new URLSearchParams(window.location.search).has('readonly');
             if (readOnly) {
                 document.body.classList.add('readonly');
             }
         </script>
         <div id="copy" class="container-fluid hidden shadow-bottom hide-readonly">
             <div class="row my-1">
                 <div class="col my-1">
-                    <input
-                        type="text"
-                        value="copy me"
-                        id="copy-link"
-                        class="px-2"
-                        onclick="this.setSelectionRange(0, this.value.length)"
-                    />
+                    <input type="text" value="copy me" id="copy-link" class="px-2" onclick="this.setSelectionRange(0, this.value.length)" />
                 </div>
                 <div class="col-auto my-1">
-                    <button
-                        class="clipboard py-1 px-2 mx-1"
-                        id="copy-btn"
-                        data-clipboard-target="#copy-link"
-                        type="button"
-                    >
+                    <button class="clipboard py-1 px-2 mx-1" id="copy-btn" data-clipboard-target="#copy-link" type="button">
                         Copy
                     </button>
                     <button class="py-1 px-2 mx-1" onclick="hideCopyBar(false)" type="button">Cancel</button>
@@ -72,36 +56,20 @@
                     <h1 class="my-0"><span>{</span> NoPaste <span>}</span></h1>
                 </div>
                 <div class="col-auto">
-                    <a
-                        href="https://github.com/bokub/nopaste"
-                        rel="noopener"
-                        target="_blank"
-                        class="mx-1"
-                        title="Source code"
-                    >
-                        <svg class="icon"><use xlink:href="#icon-github"></use></svg>
+                    <a href="https://github.com/bokub/nopaste" rel="noopener" target="_blank" class="mx-1" title="Source code">
+                        <span class="icon-github"></span>
                     </a>
-                    <a
-                        href="javascript:void(0)"
-                        onclick="byId('overlay').classList.remove('hidden')"
-                        class="mx-1"
-                        title="What is NoPaste?"
-                    >
-                        <svg class="icon mx-2"><use xlink:href="#icon-question"></use></svg>
+                    <a href="javascript:void(0)" onclick="byId('overlay').classList.remove('hidden')" class="mx-1" title="What is NoPaste?">
+                        <span class="mx-2 icon-question"></span>
                     </a>
                 </div>
                 <div class="col"></div>
                 <div class="col-auto my-1">
                     <select id="language"></select>
                 </div>
                 <div class="col-auto">
-                    <button
-                        onclick="enableLineWrapping()"
-                        type="button"
-                        id="enable-line-wrapping"
-                        title="Enable line wrapping"
-                    >
-                        <svg class="icon"><use xlink:href="#icon-notes"></use></svg>
+                    <button onclick="enableLineWrapping()" type="button" id="enable-line-wrapping" title="Enable line wrapping">
+                        <span class="icon-notes"></span>
                     </button>
                     <button
                         onclick="disableLineWrapping()"
@@ -110,7 +78,7 @@ <h1 class="my-0"><span>{</span> NoPaste <span>}</span></h1>
                         title="Disable line wrapping"
                         class="hidden"
                     >
-                        <svg class="icon"><use xlink:href="#icon-wrap-text"></use></svg>
+                        <span class="icon-wrap-text"></span>
                     </button>
                 </div>
                 <div class="col-auto">
@@ -132,18 +100,16 @@ <h1 class="my-0"><span>{</span> NoPaste <span>}</span></h1>
                 <div class="col mono show-readonly">Hosted on NoPaste.ml</div>
                 <div class="col-auto mono show-readonly">
                     <a href="javascript:void(0)" onclick="openInNewTab()">
-                        <svg class="icon icon-edit"><use xlink:href="#icon-edit"></use></svg>
+                        <span class="icon-edit"></span>
                         Edit
                     </a>
                 </div>
             </div>
         </footer>
         <div class="hidden" id="overlay" onclick="this.classList.add('hidden')">
             <div id="description" class="hidden shadow-bottom p-3">
-                NoPaste is a client-side paste service which works with <b>no database</b>, and
-                <b>no back-end code</b>.<br /><br />
-                Instead, the data is <b>compressed</b> then <b>stored</b> into a unique URL that can be shared and
-                decoded later.<br /><br />
+                NoPaste is a client-side paste service which works with <b>no database</b>, and <b>no back-end code</b>.<br /><br />
+                Instead, the data is <b>compressed</b> then <b>stored</b> into a unique URL that can be shared and decoded later.<br /><br />
 
                 As a result, there is no risk of data being lost, censored or deleted. The data is stored entirely
                 <b>in the links</b> and nowhere else!<br /><br />
@@ -152,49 +118,6 @@ <h1 class="my-0"><span>{</span> NoPaste <span>}</span></h1>
                 <a href="https://github.com/bokub/nopaste" rel="noopener" target="_blank">Github</a>
             </div>
         </div>
-        <svg class="hidden">
-            <defs>
-                <symbol id="icon-wrap-text" viewBox="0 0 24 24">
-                    <path
-                        d="M17.016 11.016q1.641 0 2.813 1.172t1.172 2.813-1.172 2.813-2.813 1.172h-2.016v2.016l-3-3
-                     3-3v2.016h2.25q0.797 0 1.406-0.609t0.609-1.406-0.609-1.406-1.406-0.609h-13.266v-1.969h13.031zM20.016
-                      5.016v1.969h-16.031v-1.969h16.031zM3.984 18.984v-1.969h6v1.969h-6z"
-                    ></path>
-                </symbol>
-                <symbol id="icon-notes" viewBox="0 0 24 24">
-                    <path d="M3 12.984v-1.969h18v1.969h-18zM3 6h18v2.016h-18v-2.016zM3 18v-2.016h12v2.016h-12z"></path>
-                </symbol>
-                <symbol id="icon-github" viewBox="0 0 32 32">
-                    <path
-                        d="M16 0.395c-8.836 0-16 7.163-16 16 0 7.069 4.585 13.067 10.942 15.182 0.8 0.148 1.094-0.3471.094-0.77
-                     0-0.381-0.015-1.642-0.022-2.979-4.452 0.968-5.391-1.888-5.391-1.888-0.728-1.849-1.776-2.341-1.776-2.341-1.452-0.993
-                      0.11-0.973 0.11-0.973 1.606 0.113 2.452 1.649 2.452 1.649 1.427 2.446 3.743 1.739 4.656 1.33 0.143-1.034 0.558-1.74
-                       1.016-2.14-3.554-0.404-7.29-1.777-7.29-7.907 0-1.747 0.625-3.174 1.649-4.295-0.166-0.403-0.714-2.030 0.155-4.234
-                        0 0 1.344-0.43 4.401 1.64 1.276-0.355 2.645-0.532 4.005-0.539 1.359 0.006 2.729 0.184 4.008 0.539 3.054-2.070
-                         4.395-1.64 4.395-1.64 0.871 2.204 0.323 3.831 0.157 4.234 1.026 1.12 1.647 2.548 1.647 4.295 0 6.145-3.743
-                          7.498-7.306 7.895 0.574 0.497 1.085 1.47 1.085 2.963 0 2.141-0.019 3.864-0.019 4.391 0 0.426 0.288 0.925
-                           1.099 0.768 6.354-2.118 10.933-8.113 10.933-15.18 0-8.837-7.164-16-16-16z"
-                    ></path>
-                </symbol>
-                <symbol id="icon-question" viewBox="0 0 17 28">
-                    <path
-                        d="M11 19.625v3.75c0 0.344-0.281 0.625-0.625 0.625h-3.75c-0.344 0-0.625-0.281-0.625-0.625v-3.75c0-0.344
-                     0.281-0.625 0.625-0.625h3.75c0.344 0 0.625 0.281 0.625 0.625zM15.937 10.25c0 2.969-2.016 4.109-3.5 4.937-0.922
-                      0.531-1.5 1.609-1.5 2.063v0c0 0.344-0.266 0.75-0.625 0.75h-3.75c-0.344 0-0.562-0.531-0.562-0.875v-0.703c0-1.891
-                       1.875-3.516 3.25-4.141 1.203-0.547 1.703-1.062 1.703-2.063 0-0.875-1.141-1.656-2.406-1.656-0.703 0-1.344
-                        0.219-1.687 0.453-0.375 0.266-0.75 0.641-1.672 1.797-0.125 0.156-0.313 0.25-0.484 0.25-0.141
-                        0-0.266-0.047-0.391-0.125l-2.562-1.953c-0.266-0.203-0.328-0.547-0.156-0.828 1.687-2.797 4.062-4.156
-                         7.25-4.156 3.344 0 7.094 2.672 7.094 6.25z"
-                    ></path>
-                </symbol>
-                <symbol id="icon-edit" viewBox="0 0 24 24">
-                    <path
-                        d="M20.719 7.031l-1.828 1.828-3.75-3.75 1.828-1.828q0.281-0.281 0.703-0.281t0.703 0.281l2.344
-                         2.344q0.281 0.281 0.281 0.703t-0.281 0.703zM3 17.25l11.063-11.063 3.75 3.75-11.063 11.063h-3.75v-3.75z"
-                    ></path>
-                </symbol>
-            </defs>
-        </svg>
         <script src="https://cdn.jsdelivr.net/combine/
 npm/[email protected]/src/lzma.min.js,
 npm/[email protected]/dist/slimselect.min.js,

diff --git a/index.js b/index.js
@@ -100,9 +100,9 @@ const generateLink = (mode) => {
             return;
         }
         const url = buildUrl(base64, mode);
-        statsEl.innerHTML = `Data length: ${data.length} |  Link length: ${
-            url.length
-        } | Compression ratio: ${Math.round((100 * url.length) / data.length)}%`;
+        statsEl.innerHTML = `Data length: ${data.length} |  Link length: ${url.length} | Compression ratio: ${Math.round(
+            (100 * url.length) / data.length
+        )}%`;
 
         showCopyBar(url);
     });
@@ -150,7 +150,7 @@ const openInNewTab = () => {
 
 // Build a shareable URL
 const buildUrl = (rawData, mode) => {
-    const base = `${location.protocol}//${location.host}/`;
+    const base = `${location.protocol}//${location.host}${location.pathname}`;
     const query = shorten('Plain Text') === select.selected() ? '' : `?l=${encodeURIComponent(select.selected())}`;
     const url = base + query + '#' + rawData;
     if (mode === 'markdown') {

diff --git a/style.css b/style.css
@@ -142,8 +142,7 @@ button:hover {
 /* Fonts */
 @font-face {
     font-family: 'JetBrainsMono';
-    src: url('https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff2/JetBrainsMono-Regular.woff2')
-            format('woff2'),
+    src: url('https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff2/JetBrainsMono-Regular.woff2') format('woff2'),
         url('https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff/JetBrainsMono-Regular.woff') format('woff'),
         url('https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/ttf/JetBrainsMono-Regular.ttf') format('truetype');
     font-weight: 400;
@@ -155,23 +154,51 @@ button:hover {
     font-style: normal;
     font-weight: 400;
     font-display: swap;
-    src: local('Roboto'), local('Roboto-Regular'),
-        url(https://fonts.gstatic.com/s/roboto/v20/KFOmCnqEu92Fr1Mu4mxK.woff2) format('woff2');
-    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC,
-        U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+    src: local('Roboto'), local('Roboto-Regular'), url(https://fonts.gstatic.com/s/roboto/v20/KFOmCnqEu92Fr1Mu4mxK.woff2) format('woff2');
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
+        U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 
 /* Icons */
-.icon {
-    display: inline-block;
+
+@font-face {
+    font-family: 'icomoon';
+    src: url('data:application/x-font-woff;charset=utf-8;base64,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')
+        format('truetype');
+    font-weight: normal;
+    font-style: normal;
+    font-display: block;
+}
+
+[class^='icon-'],
+[class*=' icon-'] {
+    font-family: 'icomoon' !important;
+    speak: none;
+    font-style: normal;
+    font-weight: normal;
+    font-variant: normal;
+    text-transform: none;
+    line-height: 1;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
     font-size: 21px;
-    width: 1em;
-    height: 1em;
-    stroke-width: 0;
-    stroke: currentColor;
-    fill: currentColor;
 }
 .icon-edit {
-    font-size: 16px;
-    margin: -3px 0;
+    font-size: 12px;
+}
+
+.icon-question:before {
+    content: '\e900';
+}
+.icon-github:before {
+    content: '\e901';
+}
+.icon-edit:before {
+    content: '\e903';
+}
+.icon-notes:before {
+    content: '\e902';
+}
+.icon-wrap-text:before {
+    content: '\e905';
 }