diff options
author | dartcafe <github@dartcafe.de> | 2020-09-08 09:30:42 +0300 |
---|---|---|
committer | dartcafe <github@dartcafe.de> | 2020-09-08 09:30:42 +0300 |
commit | 0a1afa84085c5d8822f6771617a9acff5e502fb8 (patch) | |
tree | 8ce8f4369fed4e3eef8df9e3581f486b94c15628 | |
parent | c3ba97d4734fadfb6e04c2cbd6cf610498a06e5b (diff) |
load icons via url-loader
-rw-r--r-- | package-lock.json | 24 | ||||
-rw-r--r-- | package.json | 1 | ||||
-rw-r--r-- | src/js/App.vue | 24 | ||||
-rw-r--r-- | src/js/assets/clock.svg | 10 | ||||
-rw-r--r-- | src/js/assets/clone.svg | 11 | ||||
-rw-r--r-- | src/js/assets/confirmed.svg | 62 | ||||
-rw-r--r-- | src/js/assets/handle.svg | 5 | ||||
-rw-r--r-- | src/js/assets/mail.svg | 3 | ||||
-rw-r--r-- | src/js/assets/maybe-vote.svg | 50 | ||||
-rw-r--r-- | src/js/assets/move.svg | 5 | ||||
-rw-r--r-- | src/js/assets/no-vote.svg | 6 | ||||
-rw-r--r-- | src/js/assets/polls.svg | 7 | ||||
-rw-r--r-- | src/js/assets/sidebar-toggle.svg | 38 | ||||
-rw-r--r-- | src/js/assets/unconfirmed.svg | 58 | ||||
-rw-r--r-- | src/js/assets/yes-vote.svg | 6 | ||||
-rw-r--r-- | webpack.common.js | 2 |
16 files changed, 299 insertions, 13 deletions
diff --git a/package-lock.json b/package-lock.json index d79739d7..0d49f270 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10934,6 +10934,30 @@ } } }, + "url-loader": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.0.tgz", + "integrity": "sha512-IzgAAIC8wRrg6NYkFIJY09vtktQcsvU8V6HhtQj9PTefbYImzLB1hufqo4m+RyM5N3mLx5BqJKccgxJS+W3kqw==", + "dev": true, + "requires": { + "loader-utils": "^2.0.0", + "mime-types": "^2.1.26", + "schema-utils": "^2.6.5" + }, + "dependencies": { + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + } + } + }, "use": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", diff --git a/package.json b/package.json index d9b3e9bd..389fd5f4 100644 --- a/package.json +++ b/package.json @@ -85,6 +85,7 @@ "stylelint-config-recommended-scss": "^4.2.0", "stylelint-scss": "^3.18.0", "terser-webpack-plugin": "^4.1.0", + "url-loader": "^4.1.0", "vue-loader": "^15.9.3", "vue-style-loader": "^4.1.2", "vue-template-compiler": "^2.6.12", diff --git a/src/js/App.vue b/src/js/App.vue index 65653211..d8201dbc 100644 --- a/src/js/App.vue +++ b/src/js/App.vue @@ -146,18 +146,18 @@ export default { --color-polls-background-yes: #ebf5d6; --color-polls-background-no: #ffede9; --color-polls-background-maybe: #fcf7e1; - --icon-polls-confirmed: url('/index.php/svg/polls/confirmed?color=000&v=1'); - --icon-polls-unconfirmed: url('/index.php/svg/polls/unconfirmed?color=000&v=1'); - --icon-polls-clone: url('/index.php/svg/polls/clone?color=000&v=1'); - --icon-polls-expired: url('/index.php/svg/polls/clock?color=000&v=1'); - --icon-polls-move: url('/index.php/svg/polls/move?color=000&v=1'); - --icon-polls-yes: url('/index.php/svg/core/actions/checkmark?color=49bc49&v=1'); - --icon-polls-no: url('/index.php/svg/core/actions/close?color=f45573&v=1'); - --icon-polls-maybe: url('/index.php/svg/polls/maybe-vote?color=ffc107&v=1'); - --icon-polls: url('/index.php/svg/polls/app?color=000&v=1'); - --icon-polls-handle: url('/index.php/svg/polls/handle?color=000&v=1'); - --icon-polls-mail: url('/index.php/svg/polls/mail?color=000&v=1'); - --icon-polls-sidebar-toggle: url('/index.php/svg/polls/sidebar-toggle?color=000&v=1'); + --icon-polls-confirmed: url('./assets/confirmed.svg'); + --icon-polls-unconfirmed: url('./assets/unconfirmed.svg'); + --icon-polls-clone: url('./assets/clone.svg'); + --icon-polls-expired: url('./assets/clock.svg'); + --icon-polls-move: url('./assets/move.svg'); + --icon-polls-yes: url('./assets/yes-vote.svg'); + --icon-polls-no: url('./assets/no-vote.svg'); + --icon-polls-maybe: url('./assets/maybe-vote.svg'); + --icon-polls: url('./assets/polls.svg'); + --icon-polls-handle: url('./assets/handle.svg'); + --icon-polls-mail: url('./assets/mail.svg'); + --icon-polls-sidebar-toggle: url('./assets/sidebar-toggle.svg'); // filters to colorize background svg from black // generated with https://codepen.io/jsm91/embed/ZEEawyZ?height=600&default-tab=result&embed-version=2 diff --git a/src/js/assets/clock.svg b/src/js/assets/clock.svg new file mode 100644 index 00000000..f6755829 --- /dev/null +++ b/src/js/assets/clock.svg @@ -0,0 +1,10 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"> + <g fill="none" stroke-width="1.5" stroke="#000" stroke-linejoin="round" stroke-linecap="round"> + <circle + r="6.5" + cy="8" + cx="8" /> + <path + id="path4530" + d="m 8.00005,5.6251078 v 2.375 l 2.90625,2.1562502"/> +</g></svg> diff --git a/src/js/assets/clone.svg b/src/js/assets/clone.svg new file mode 100644 index 00000000..22839489 --- /dev/null +++ b/src/js/assets/clone.svg @@ -0,0 +1,11 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"> + <g + stroke-linecap="round" + stroke-linejoin="round" + stroke="#000" + stroke-width="1.5" + fill="none"> + <path style="fill:none" d="m 2.5,11.5 h -1 v -10 h 11 v 1" /> + <rect style="fill:none;" width="10" height="10" x="4.5" y="4.5" /> + </g> +</svg> diff --git a/src/js/assets/confirmed.svg b/src/js/assets/confirmed.svg new file mode 100644 index 00000000..cafad0f1 --- /dev/null +++ b/src/js/assets/confirmed.svg @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + height="16" + width="16" + version="1.1" + viewBox="0 0 16 16" + id="svg4" + sodipodi:docname="confirmed.svg" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)"> + <metadata + id="metadata10"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs8" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1525" + inkscape:window-height="878" + id="namedview6" + showgrid="false" + inkscape:zoom="22.627417" + inkscape:cx="2.2078972" + inkscape:cy="7.2362528" + inkscape:window-x="1165" + inkscape:window-y="329" + inkscape:window-maximized="0" + inkscape:current-layer="svg4" /> + <path + d="M 4.3744829,7.0267474 8.0129825,10.665245 14.653249,4.0249852" + id="path2" + inkscape:connector-curvature="0" + style="fill:none;stroke:#000000;stroke-width:1.81924975" /> + <path + style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" + d="M 14,9.1057089 V 14 H 2.0000005 V 2.0000005 H 12.506951" + id="rect817" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccc" /> +</svg> diff --git a/src/js/assets/handle.svg b/src/js/assets/handle.svg new file mode 100644 index 00000000..56d8bce3 --- /dev/null +++ b/src/js/assets/handle.svg @@ -0,0 +1,5 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"> + <path + d="M 2,2 H 14 M 2,6 H 14 M 2,10 H 14 M 2,14 H 14" + stroke="#000" stroke-width="2" fill="none"/> +</svg> diff --git a/src/js/assets/mail.svg b/src/js/assets/mail.svg new file mode 100644 index 00000000..8cc90b43 --- /dev/null +++ b/src/js/assets/mail.svg @@ -0,0 +1,3 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"> + <path d="m 0,4 v 8 c 0,0.499044 0.500214,1 1,1 H 14.984375 C 15.499152,13 16,12.499844 16,11.984375 V 4 C 16,3.4968466 15.499786,3 15,3 H 1 C 0.496234,3 0,3.5002138 0,4 Z m 15,0.5 v 7 L 10.948233,7.1105856 Z M 10.358137,7.4816038 14.5,12 H 1.5 L 5.63635,7.4876179 8,9 Z M 8,8 1.5,4 h 13 z m -7,3.5 v -7 l 4.060498,2.6103198 z"/> +</svg> diff --git a/src/js/assets/maybe-vote.svg b/src/js/assets/maybe-vote.svg new file mode 100644 index 00000000..36f42b4d --- /dev/null +++ b/src/js/assets/maybe-vote.svg @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + id="svg4" + version="1.1" + width="16" + height="16"> + <metadata + id="metadata10"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs8" /> + <g + id="text818" + style="font-style:normal;font-weight:normal;font-size:10.03817844px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffc10f;fill-opacity:0.94117647;stroke:none;stroke-width:0.6844213" + transform="matrix(1.2792345,0,0,1.0763308,-0.2918408,-1.3872412)" + aria-label="("> + <path + id="path853" + style="font-size:9.81086349px;fill:#ffc10f;fill-opacity:0.94117647;stroke-width:0.6844213" + d="m 3.7425891,4.3526202 q -0.6419218,1.101806 -0.9533017,2.1796596 -0.31138,1.0778537 -0.31138,2.1844501 0,1.1065964 0.31138,2.1940311 0.3161704,1.082644 0.9533017,2.17966 H 2.9761153 Q 2.2575462,11.964662 1.8982617,10.877228 1.5437676,9.7897931 1.5437676,8.7167299 q 0,-1.0682727 0.3544941,-2.1509169 0.3544941,-1.0826441 1.0778536,-2.2131928 z" /> + </g> + <path + id="path2" + d="M 4.2292965,7.4561992 6.8988209,10.399892 11.770704,5.0276561" + style="fill:none;fill-opacity:1;stroke:#ffc10f;stroke-width:1.40162849;stroke-opacity:0.94117647" /> + <g + id="text818-2" + style="font-style:normal;font-weight:normal;font-size:10.03817844px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffc10f;fill-opacity:0.94117647;stroke:none;stroke-width:0.6844213" + transform="matrix(-1.2792345,0,0,-1.0763308,-2.4031246,-1.3872405)" + aria-label="("> + <path + id="path856" + style="font-size:9.81086349px;fill:#ffc10f;fill-opacity:0.94117647;stroke-width:0.6844213" + d="m -10.871757,-13.09042 q -0.641921,1.101806 -0.953301,2.179659 -0.31138,1.0778541 -0.31138,2.1844505 0,1.1065964 0.31138,2.194031 0.31617,1.0826441 0.953301,2.1796596 h -0.766473 q -0.718569,-1.1257582 -1.077854,-2.2131928 -0.354494,-1.0874346 -0.354494,-2.1604978 0,-1.0682727 0.354494,-2.1509165 0.354494,-1.082644 1.077854,-2.213193 z" /> + </g> +</svg> diff --git a/src/js/assets/move.svg b/src/js/assets/move.svg new file mode 100644 index 00000000..f273cafb --- /dev/null +++ b/src/js/assets/move.svg @@ -0,0 +1,5 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"> + <path d="m 14,13 v 1 H 2 V 13 M 2,3 V 2 h 12 v 1" fill="none" stroke="#000000" style="stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;" /> + <path d="m 9,7 v 2 h 3 v 2.5 L 16,8 12,4.5 V 7 Z" fill="#000000" stroke-width="1px" /> + <path d="M 7,7 V 9 H 4 v 2.5 L 0,8 4,4.5 V 7 Z" fill="#000000" stroke-width="1px" /> +</svg> diff --git a/src/js/assets/no-vote.svg b/src/js/assets/no-vote.svg new file mode 100644 index 00000000..bea96475 --- /dev/null +++ b/src/js/assets/no-vote.svg @@ -0,0 +1,6 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"> + <path + d="M12.95 11.536l-1.414 1.414L8 9.414 4.465 12.95 3.05 11.536 6.586 8 3.05 4.464 4.465 3.05 8 6.586l3.516-3.555 1.434 1.434L9.414 8z" + fill="#EFB4A7" + style="fill:#f45573;fill-opacity:1;stroke:none;stroke-opacity:1" /> +</svg> diff --git a/src/js/assets/polls.svg b/src/js/assets/polls.svg new file mode 100644 index 00000000..acaf7958 --- /dev/null +++ b/src/js/assets/polls.svg @@ -0,0 +1,7 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="32" width="32" viewBox="0 0 32 32"> + <g fill="#000"> + <rect y="2" x="3" height="26" width="7" /> + <rect y="12" x="12" height="16" width="7" /> + <rect y="8" x="21" height="20" width="7" /> + </g> +</svg> diff --git a/src/js/assets/sidebar-toggle.svg b/src/js/assets/sidebar-toggle.svg new file mode 100644 index 00000000..f6a635e3 --- /dev/null +++ b/src/js/assets/sidebar-toggle.svg @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + id="svg4" + version="1.1" + viewBox="0 0 4.233 4.233" + height="16" + width="16"> + <metadata + id="metadata10"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs8" /> + <rect + y="0.92596889" + x="2.857275" + height="2.3810625" + width="1.0053375" + id="rect817" + style="fill:#000000;fill-opacity:0.47843137;stroke:none;stroke-width:0.12021257;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" /> + <path + style="stroke:#000000;stroke-width:0.079;stroke-linejoin:round" + id="path2" + d="m 0.2645625,0.66140625 c -0.0748296,0 -0.1587375,0.0839079 -0.1587375,0.1587375 V 3.4128562 c 0,0.07483 0.0839079,0.1587375 0.1587375,0.1587375 h 3.703875 c 0.07483,0 0.1587375,-0.083908 0.1587375,-0.1587375 V 0.82014375 c 0,-0.0748501 -0.083975,-0.1587375 -0.1588248,-0.1587375 z m 2.5927053,0.2645625 h 0.8862916 c 0.078054,0 0.1190531,0.0398859 0.1190531,0.11905315 v 2.1429562 c 0,0.080118 -0.040059,0.1190531 -0.1190531,0.1190531 H 2.8572822 Z M 2.7250009,3.3070312 H 0.48944062 c -0.0790862,0 -0.11905312,-0.038973 -0.11905312,-0.1190531 V 1.0450219 c 0,-0.0811736 0.0400928,-0.11905315 0.11905313,-0.11905315 0,0 1.31811597,2.4e-5 2.23554587,0 z" /> +</svg> diff --git a/src/js/assets/unconfirmed.svg b/src/js/assets/unconfirmed.svg new file mode 100644 index 00000000..60f90a20 --- /dev/null +++ b/src/js/assets/unconfirmed.svg @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + height="16" + width="16" + version="1.1" + viewBox="0 0 16 16" + id="svg4" + sodipodi:docname="unconfirmed.svg" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)"> + <metadata + id="metadata10"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs8" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1525" + inkscape:window-height="878" + id="namedview6" + showgrid="false" + inkscape:zoom="22.627417" + inkscape:cx="-0.78353168" + inkscape:cy="3.8959275" + inkscape:window-x="1165" + inkscape:window-y="329" + inkscape:window-maximized="0" + inkscape:current-layer="svg4" /> + <rect + style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" + id="rect817" + width="11.999999" + height="11.999999" + x="2.0000005" + y="2.0000005" /> +</svg> diff --git a/src/js/assets/yes-vote.svg b/src/js/assets/yes-vote.svg new file mode 100644 index 00000000..32e6aafd --- /dev/null +++ b/src/js/assets/yes-vote.svg @@ -0,0 +1,6 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"> + <path + d="M6.09 12.5L1.14 7.55l1.413-1.414L6.09 9.67l6.344-6.382 1.433 1.434z" + fill="#84C33F" + style="fill:#49bc49;fill-opacity:1" /> +</svg> diff --git a/webpack.common.js b/webpack.common.js index 211dfa91..65215a0c 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -52,7 +52,7 @@ module.exports = { }, { test: /\.(png|jpg|gif|svg)$/, - loader: 'file-loader', + loader: 'url-loader', options: { name: '[name].[ext]?[hash]', }, |