1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-11 18:24:43 +02:00

Server: Add Joplin Server and Joplin Cloud favicons

This commit is contained in:
Laurent Cozic 2023-09-20 16:11:02 +01:00
parent 58ab087d39
commit 1b00445452
27 changed files with 412 additions and 63 deletions

View File

@ -0,0 +1,15 @@
<svg width="84" height="84" viewBox="0 0 84 84" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_52_28)">
<rect width="84" height="84" fill="url(#paint0_linear_52_28)"/>
<path d="M66 48.5424C66 51.4195 64.8173 54.0531 62.9108 55.9371C61.0108 57.8274 58.3546 59 55.4529 59H49.1324V53.5533H55.4529C56.8553 53.5533 58.1026 52.9959 59.0268 52.086C59.9445 51.1696 60.5067 49.9393 60.5067 48.5424C60.5067 47.1519 59.9445 45.9152 59.0268 44.9989C58.1026 44.089 56.8618 43.5315 55.4529 43.5315H50.1083L50.4056 40.539C50.4379 40.2314 50.4508 39.9303 50.4508 39.6163C50.4508 37.0724 49.4168 34.7976 47.7429 33.1316C46.0626 31.4655 43.7684 30.4467 41.2027 30.4467C38.637 30.4467 36.3428 31.4719 34.6625 33.1316C32.9822 34.7976 31.9546 37.0724 31.9546 39.6163C31.9546 39.9239 31.9675 40.2314 31.9999 40.539L32.2971 43.5315H27.5535C26.1511 43.5315 24.9039 44.089 23.9797 44.9989C23.062 45.9152 22.4997 47.1455 22.4997 48.5424C22.4997 49.9329 23.062 51.1696 23.9797 52.086C24.9039 52.9959 26.1447 53.5533 27.5535 53.5533H35.2118C36.6077 53.3291 37.9003 52.6755 38.9278 51.663C40.2139 50.3815 40.9248 48.6834 40.9248 46.8828V41.0837H35.3605V38.9819C35.3605 37.1941 36.8275 35.7331 38.637 35.7331H46.3211V46.8828C46.3211 50.0739 45.0222 53.1945 42.7473 55.4437C40.7439 57.4365 38.0619 58.6732 35.2441 58.9359L34.5332 59H27.5471C24.6453 59 21.9892 57.8274 20.0892 55.9371C18.1827 54.0531 17 51.4195 17 48.5424C17 45.6653 18.1827 43.0317 20.0892 41.1478C21.763 39.4817 24.0249 38.3732 26.526 38.1361C26.875 34.6951 28.4389 31.5937 30.772 29.2805C33.4346 26.6404 37.1377 24.9936 41.1963 25C45.2613 25 48.9644 26.6404 51.6205 29.2805C53.9471 31.5809 55.5046 34.6759 55.8601 38.1041C58.6002 38.213 61.0884 39.3472 62.8979 41.1478C64.8173 43.0317 66 45.6653 66 48.5424Z" fill="white"/>
</g>
<defs>
<linearGradient id="paint0_linear_52_28" x1="3" y1="4" x2="78" y2="79" gradientUnits="userSpaceOnUse">
<stop offset="0.14" stop-color="#3873DB"/>
<stop offset="0.946667" stop-color="#163467"/>
</linearGradient>
<clipPath id="clip0_52_28">
<rect width="84" height="84" rx="20" fill="white"/>
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

@ -0,0 +1,75 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="84"
height="84"
viewBox="0 0 84 84"
fill="none"
version="1.1"
id="svg938"
sodipodi:docname="JoplinCloudIcon copie.svg"
inkscape:version="1.1.1 (c3084ef, 2021-09-22)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview940"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
showgrid="false"
inkscape:zoom="3.5021331"
inkscape:cx="-6.1391156"
inkscape:cy="29.838957"
inkscape:window-width="1310"
inkscape:window-height="969"
inkscape:window-x="0"
inkscape:window-y="25"
inkscape:window-maximized="0"
inkscape:current-layer="g926" />
<g
clip-path="url(#clip0_52_28)"
id="g926">
<rect
width="84"
height="84"
fill="url(#paint0_linear_52_28)"
id="rect922" />
<path
d="m 73.705932,49.824628 c 0,3.73216 -1.534192,7.148453 -4.007294,9.592368 -2.464671,2.452087 -5.91028,3.973178 -9.674351,3.973178 h -8.198921 v -7.065432 h 8.198921 c 1.819186,0 3.437178,-0.723056 4.636045,-1.903374 1.190436,-1.188749 1.919719,-2.784688 1.919719,-4.59674 0,-1.803749 -0.729283,-3.40799 -1.919719,-4.59661 -1.198867,-1.180318 -2.808427,-1.903504 -4.636045,-1.903504 h -6.932988 l 0.385656,-3.881856 c 0.0419,-0.399017 0.05863,-0.789603 0.05863,-1.196922 0,-3.299934 -1.341299,-6.250793 -3.512674,-8.41192 -2.179677,-2.161256 -5.155701,-3.482839 -8.483914,-3.482839 -3.328214,0 -6.304238,1.329885 -8.483915,3.482839 -2.179677,2.161127 -3.512674,5.111986 -3.512674,8.41192 0,0.399017 0.01673,0.797905 0.05876,1.196922 l 0.385526,3.881856 H 23.83332 c -1.819186,0 -3.437048,0.723186 -4.635915,1.903504 -1.190436,1.18862 -1.919849,2.784559 -1.919849,4.59661 0,1.80375 0.729413,3.407991 1.919849,4.59674 1.198867,1.180318 2.808427,1.903374 4.635915,1.903374 h 9.934308 c 1.810755,-0.290831 3.487509,-1.138677 4.820377,-2.452087 1.668322,-1.662356 2.590498,-3.865122 2.590498,-6.200852 V 40.14924 h -7.217982 v -2.726444 c 0,-2.319125 1.902985,-4.214327 4.250259,-4.214327 h 9.967776 v 14.463334 c 0,4.139479 -1.684926,8.187506 -4.635915,11.105157 -2.598801,2.58505 -6.077877,4.189291 -9.733113,4.530064 l -0.922176,0.08315 h -9.062334 c -3.7642,0 -7.20968,-1.521091 -9.67435,-3.973178 -2.473097,-2.443915 -4.007289,-5.860208 -4.007289,-9.592368 0,-3.732159 1.534192,-7.148452 4.007295,-9.592238 2.171245,-2.161256 5.10537,-3.599197 8.349784,-3.906762 0.452721,-4.463648 2.481404,-8.486768 5.50789,-11.487439 3.453911,-3.424725 8.257554,-5.560946 13.522349,-5.552643 5.273098,0 10.076741,2.127918 13.52222,5.552643 3.018054,2.984067 5.038435,6.998885 5.499588,11.445929 3.554444,0.141265 6.782124,1.612543 9.129399,3.948272 2.489836,2.443786 4.024028,5.860079 4.024028,9.592238 z"
fill="#ffffff"
id="path924"
style="stroke-width:1.29719" />
</g>
<defs
id="defs936">
<linearGradient
id="paint0_linear_52_28"
x1="3"
y1="4"
x2="78"
y2="79"
gradientUnits="userSpaceOnUse">
<stop
offset="0.14"
stop-color="#3873DB"
id="stop928" />
<stop
offset="0.946667"
stop-color="#163467"
id="stop930" />
</linearGradient>
<clipPath
id="clip0_52_28">
<rect
width="84"
height="84"
rx="20"
fill="white"
id="rect933" />
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 3.6 KiB

View File

@ -0,0 +1,16 @@
<svg width="84" height="84" viewBox="0 0 84 84" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_309_806)">
<rect width="84" height="84" fill="url(#paint0_linear_309_806)"/>
<path d="M42.5797 45.6916H33.6235V36.276C33.6235 33.3538 34.7629 30.6033 36.8396 28.5204C38.4998 26.8725 40.5826 25.8127 42.8431 25.4513V16.7033C38.2854 17.1138 33.9359 19.1354 30.6891 22.3822C27.0258 26.0333 24.9307 31.0995 24.9307 36.2821V54.3845H37.3052C40.2151 54.3845 42.5797 52.0198 42.5797 49.11V45.6916Z" fill="#1883E6"/>
<path d="M42.4204 35.89V39.3022H51.3767V48.7179C51.3767 51.64 50.2372 54.3906 48.1605 56.4735C46.5003 58.1214 44.4175 59.1812 42.157 59.5426V68.2906C46.7147 67.8801 51.0642 65.8585 54.311 62.6117C57.9744 58.9606 60.0695 53.8944 60.0695 48.7118V30.6155H47.6949C44.7851 30.6155 42.4204 32.9863 42.4204 35.89Z" fill="#1883E6"/>
</g>
<defs>
<linearGradient id="paint0_linear_309_806" x1="8.5" y1="3" x2="76.5" y2="81.5" gradientUnits="userSpaceOnUse">
<stop stop-color="white"/>
<stop offset="1" stop-color="#B6D3F9"/>
</linearGradient>
<clipPath id="clip0_309_806">
<rect width="84" height="84" rx="20" fill="white"/>
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

View File

@ -0,0 +1,75 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="84"
height="84"
viewBox="0 0 84 84"
fill="none"
version="1.1"
id="svg938"
sodipodi:docname="JoplinCloudIcon copie.svg"
inkscape:version="1.1.1 (c3084ef, 2021-09-22)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview940"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
showgrid="false"
inkscape:zoom="3.5021331"
inkscape:cx="-6.1391156"
inkscape:cy="29.838957"
inkscape:window-width="1310"
inkscape:window-height="969"
inkscape:window-x="0"
inkscape:window-y="25"
inkscape:window-maximized="0"
inkscape:current-layer="g926" />
<g
clip-path="url(#clip0_52_28)"
id="g926">
<rect
width="84"
height="84"
fill="url(#paint0_linear_52_28)"
id="rect922" />
<path
d="m 73.705932,49.824628 c 0,3.73216 -1.534192,7.148453 -4.007294,9.592368 -2.464671,2.452087 -5.91028,3.973178 -9.674351,3.973178 h -8.198921 v -7.065432 h 8.198921 c 1.819186,0 3.437178,-0.723056 4.636045,-1.903374 1.190436,-1.188749 1.919719,-2.784688 1.919719,-4.59674 0,-1.803749 -0.729283,-3.40799 -1.919719,-4.59661 -1.198867,-1.180318 -2.808427,-1.903504 -4.636045,-1.903504 h -6.932988 l 0.385656,-3.881856 c 0.0419,-0.399017 0.05863,-0.789603 0.05863,-1.196922 0,-3.299934 -1.341299,-6.250793 -3.512674,-8.41192 -2.179677,-2.161256 -5.155701,-3.482839 -8.483914,-3.482839 -3.328214,0 -6.304238,1.329885 -8.483915,3.482839 -2.179677,2.161127 -3.512674,5.111986 -3.512674,8.41192 0,0.399017 0.01673,0.797905 0.05876,1.196922 l 0.385526,3.881856 H 23.83332 c -1.819186,0 -3.437048,0.723186 -4.635915,1.903504 -1.190436,1.18862 -1.919849,2.784559 -1.919849,4.59661 0,1.80375 0.729413,3.407991 1.919849,4.59674 1.198867,1.180318 2.808427,1.903374 4.635915,1.903374 h 9.934308 c 1.810755,-0.290831 3.487509,-1.138677 4.820377,-2.452087 1.668322,-1.662356 2.590498,-3.865122 2.590498,-6.200852 V 40.14924 h -7.217982 v -2.726444 c 0,-2.319125 1.902985,-4.214327 4.250259,-4.214327 h 9.967776 v 14.463334 c 0,4.139479 -1.684926,8.187506 -4.635915,11.105157 -2.598801,2.58505 -6.077877,4.189291 -9.733113,4.530064 l -0.922176,0.08315 h -9.062334 c -3.7642,0 -7.20968,-1.521091 -9.67435,-3.973178 -2.473097,-2.443915 -4.007289,-5.860208 -4.007289,-9.592368 0,-3.732159 1.534192,-7.148452 4.007295,-9.592238 2.171245,-2.161256 5.10537,-3.599197 8.349784,-3.906762 0.452721,-4.463648 2.481404,-8.486768 5.50789,-11.487439 3.453911,-3.424725 8.257554,-5.560946 13.522349,-5.552643 5.273098,0 10.076741,2.127918 13.52222,5.552643 3.018054,2.984067 5.038435,6.998885 5.499588,11.445929 3.554444,0.141265 6.782124,1.612543 9.129399,3.948272 2.489836,2.443786 4.024028,5.860079 4.024028,9.592238 z"
fill="#ffffff"
id="path924"
style="stroke-width:1.29719" />
</g>
<defs
id="defs936">
<linearGradient
id="paint0_linear_52_28"
x1="3"
y1="4"
x2="78"
y2="79"
gradientUnits="userSpaceOnUse">
<stop
offset="0.14"
stop-color="#3873DB"
id="stop928" />
<stop
offset="0.946667"
stop-color="#163467"
id="stop930" />
</linearGradient>
<clipPath
id="clip0_52_28">
<rect
width="84"
height="84"
rx="20"
fill="white"
id="rect933" />
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 3.6 KiB

View File

@ -0,0 +1,6 @@
{
"icons": [
{ "src": "/images/icons/cloud/icon-192.png", "type": "image/png", "sizes": "192x192" },
{ "src": "/images/icon/cloud/icon-512.png", "type": "image/png", "sizes": "512x512" }
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

View File

@ -0,0 +1,16 @@
<svg width="84" height="84" viewBox="0 0 84 84" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_309_806)">
<rect width="84" height="84" fill="url(#paint0_linear_309_806)"/>
<path d="M42.5797 45.6916H33.6235V36.276C33.6235 33.3538 34.7629 30.6033 36.8396 28.5204C38.4998 26.8725 40.5826 25.8127 42.8431 25.4513V16.7033C38.2854 17.1138 33.9359 19.1354 30.6891 22.3822C27.0258 26.0333 24.9307 31.0995 24.9307 36.2821V54.3845H37.3052C40.2151 54.3845 42.5797 52.0198 42.5797 49.11V45.6916Z" fill="#1883E6"/>
<path d="M42.4204 35.89V39.3022H51.3767V48.7179C51.3767 51.64 50.2372 54.3906 48.1605 56.4735C46.5003 58.1214 44.4175 59.1812 42.157 59.5426V68.2906C46.7147 67.8801 51.0642 65.8585 54.311 62.6117C57.9744 58.9606 60.0695 53.8944 60.0695 48.7118V30.6155H47.6949C44.7851 30.6155 42.4204 32.9863 42.4204 35.89Z" fill="#1883E6"/>
</g>
<defs>
<linearGradient id="paint0_linear_309_806" x1="8.5" y1="3" x2="76.5" y2="81.5" gradientUnits="userSpaceOnUse">
<stop stop-color="white"/>
<stop offset="1" stop-color="#B6D3F9"/>
</linearGradient>
<clipPath id="clip0_309_806">
<rect width="84" height="84" rx="20" fill="white"/>
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -0,0 +1,6 @@
{
"icons": [
{ "src": "/images/icons/server/icon-192.png", "type": "image/png", "sizes": "192x192" },
{ "src": "/images/icon/server/icon-512.png", "type": "image/png", "sizes": "512x512" }
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

View File

@ -56,6 +56,7 @@ interface GlobalParams {
adminMenu?: MenuItem[]; adminMenu?: MenuItem[];
navbarMenu?: MenuItem[]; navbarMenu?: MenuItem[];
currentPath?: SubPath; currentPath?: SubPath;
appShortName?: string;
} }
export function isView(o: any): boolean { export function isView(o: any): boolean {
@ -179,6 +180,7 @@ export default class MustacheService {
showErrorStackTraces: config().showErrorStackTraces, showErrorStackTraces: config().showErrorStackTraces,
isJoplinCloud: config().isJoplinCloud, isJoplinCloud: config().isJoplinCloud,
fullYear: (new Date()).getFullYear(), fullYear: (new Date()).getFullYear(),
appShortName: config().isJoplinCloud ? 'cloud' : 'server',
}; };
} }

View File

@ -3,6 +3,7 @@
<head> <head>
<title>{{pageTitle}}</title> <title>{{pageTitle}}</title>
<meta charset="utf-8"> <meta charset="utf-8">
{{> favicons}}
<link rel="stylesheet" href="{{{global.baseUrl}}}/css/main.css" crossorigin="anonymous"> <link rel="stylesheet" href="{{{global.baseUrl}}}/css/main.css" crossorigin="anonymous">
{{#cssFiles}} {{#cssFiles}}
<link rel="stylesheet" href="{{{.}}}" crossorigin="anonymous"> <link rel="stylesheet" href="{{{.}}}" crossorigin="anonymous">

View File

@ -4,10 +4,8 @@
<title>{{pageTitle}}</title> <title>{{pageTitle}}</title>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
{{> favicons}}
<link rel="stylesheet" href="{{{global.baseUrl}}}/css/bulma.min.css" crossorigin="anonymous"> <link rel="stylesheet" href="{{{global.baseUrl}}}/css/bulma.min.css" crossorigin="anonymous">
{{#global.prefersDarkEnabled}}
<!-- <link rel="stylesheet" href="{{{global.baseUrl}}}/css/bulma-prefers-dark.min.css" crossorigin="anonymous"> -->
{{/global.prefersDarkEnabled}}
<link rel="stylesheet" href="{{{global.baseUrl}}}/css/main.css" crossorigin="anonymous"> <link rel="stylesheet" href="{{{global.baseUrl}}}/css/main.css" crossorigin="anonymous">
<link rel="stylesheet" href="{{{global.baseUrl}}}/css/fontawesome/css/all.min.css" crossorigin="anonymous"> <link rel="stylesheet" href="{{{global.baseUrl}}}/css/fontawesome/css/all.min.css" crossorigin="anonymous">
<script src="{{{global.baseUrl}}}/js/jquery.min.js"></script> <script src="{{{global.baseUrl}}}/js/jquery.min.js"></script>

View File

@ -0,0 +1,4 @@
<link rel="icon" href="{{{global.baseUrl}}}/images/icons/{{global.appShortName}}/favicon.ico" sizes="32x32">
<link rel="icon" href="{{{global.baseUrl}}}/images/icons/{{global.appShortName}}/icon.svg" type="image/svg+xml">
<link rel="apple-touch-icon" href="{{{global.baseUrl}}}/images/icons/{{global.appShortName}}/icon-180.png">
<link rel="manifest" href="{{{global.baseUrl}}}/images/icons/{{global.appShortName}}/manifest.webmanifest">

View File

@ -3,7 +3,7 @@
<div class="container navbar-container"> <div class="container navbar-container">
<div class="navbar-brand logo-container"> <div class="navbar-brand logo-container">
<a class="navbar-item" href="{{{global.baseUrl}}}"> <a class="navbar-item" href="{{{global.baseUrl}}}">
<img class="logo" src="{{{global.baseUrl}}}/images/Logo.png"/> <img class="logo" src="{{{global.baseUrl}}}/images/{{global.appShortName}}_logo.png"/>
{{^global.owner}} {{^global.owner}}
<span class="navbar-appname">{{global.appName}}</span> <span class="navbar-appname">{{global.appName}}</span>
{{/global.owner}} {{/global.owner}}

View File

@ -1,63 +1,76 @@
{ {
"done": { "done": {
"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ios_marketing1024x1024.png_1024_1024__": true, "1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ios_marketing1024x1024.png_1024_1024____": true,
"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_app76x76.png_76_76__": true, "1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_app76x76.png_76_76____": true,
"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_app76x76@2x.png_152_152__": true, "1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_app76x76@2x.png_152_152____": true,
"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_notification20x20.png_20_20__": true, "1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_notification20x20.png_20_20____": true,
"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_notification20x20@2x.png_40_40__": true, "1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_notification20x20@2x.png_40_40____": true,
"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_pro_app83.5x83.5@2x.png_167_167__": true, "1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_pro_app83.5x83.5@2x.png_167_167____": true,
"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_settings29x29.png_29_29__": true, "1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_settings29x29.png_29_29____": true,
"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_settings29x29@2x.png_58_58__": true, "1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_settings29x29@2x.png_58_58____": true,
"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_spotlight40x40.png_40_40__": true, "1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_spotlight40x40.png_40_40____": true,
"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_spotlight40x40@2x.png_80_80__": true, "1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_spotlight40x40@2x.png_80_80____": true,
"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/iphone_app60x60@2x.png_120_120__": true, "1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/iphone_app60x60@2x.png_120_120____": true,
"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/iphone_app60x60@3x.png_180_180__": true, "1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/iphone_app60x60@3x.png_180_180____": true,
"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/iphone_notification20x20@2x.png_40_40__": true, "1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/iphone_notification20x20@2x.png_40_40____": true,
"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/iphone_notification20x20@3x.png_60_60__": true, "1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/iphone_notification20x20@3x.png_60_60____": true,
"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/iphone_settings29x29@2x.png_58_58__": true, "1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/iphone_settings29x29@2x.png_58_58____": true,
"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/iphone_settings29x29@3x.png_87_87__": true, "1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/iphone_settings29x29@3x.png_87_87____": true,
"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/iphone_spotlight40x40@2x.png_80_80__": true, "1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/iphone_spotlight40x40@2x.png_80_80____": true,
"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/iphone_spotlight40x40@3x.png_120_120__": true, "1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/iphone_spotlight40x40@3x.png_120_120____": true,
"2_980ab814dfce30eb15adf0a90d85bb1a_Assets/macOs.iconset/icon_16x16.png_16_16__": true, "2_980ab814dfce30eb15adf0a90d85bb1a_Assets/macOs.iconset/icon_16x16.png_16_16____": true,
"3_a7fed49fa153dc9f4e58f038011bce4d_Assets/macOs.iconset/icon_16x16@2x.png_32_32__": true, "3_a7fed49fa153dc9f4e58f038011bce4d_Assets/macOs.iconset/icon_16x16@2x.png_32_32____": true,
"3_a7fed49fa153dc9f4e58f038011bce4d_Assets/macOs.iconset/icon_32x32.png_32_32__": true, "3_a7fed49fa153dc9f4e58f038011bce4d_Assets/macOs.iconset/icon_32x32.png_32_32____": true,
"3_a7fed49fa153dc9f4e58f038011bce4d_Assets/macOs.iconset/icon_32x32@2x.png_64_64__": true, "3_a7fed49fa153dc9f4e58f038011bce4d_Assets/macOs.iconset/icon_32x32@2x.png_64_64____": true,
"7_a088bffc3266cee9cf14dcb575533df2_Assets/macOs.iconset/icon_128x128.png_128_128__": true, "7_a088bffc3266cee9cf14dcb575533df2_Assets/macOs.iconset/icon_128x128.png_128_128____": true,
"7_a088bffc3266cee9cf14dcb575533df2_Assets/macOs.iconset/icon_128x128@2x.png_256_256__": true, "7_a088bffc3266cee9cf14dcb575533df2_Assets/macOs.iconset/icon_128x128@2x.png_256_256____": true,
"7_a088bffc3266cee9cf14dcb575533df2_Assets/macOs.iconset/icon_256x256.png_256_256__": true, "7_a088bffc3266cee9cf14dcb575533df2_Assets/macOs.iconset/icon_256x256.png_256_256____": true,
"7_a088bffc3266cee9cf14dcb575533df2_Assets/macOs.iconset/icon_256x256@2x.png_512_512__": true, "7_a088bffc3266cee9cf14dcb575533df2_Assets/macOs.iconset/icon_256x256@2x.png_512_512____": true,
"7_a088bffc3266cee9cf14dcb575533df2_Assets/macOs.iconset/icon_512x512.png_512_512__": true, "7_a088bffc3266cee9cf14dcb575533df2_Assets/macOs.iconset/icon_512x512.png_512_512____": true,
"7_a088bffc3266cee9cf14dcb575533df2_Assets/macOs.iconset/icon_512x512@2x.png_1024_1024__": true, "7_a088bffc3266cee9cf14dcb575533df2_Assets/macOs.iconset/icon_512x512@2x.png_1024_1024____": true,
"5_ec41184ad08ccd9471bfe57eef12a0e7_packages/tools/PortableAppsLauncher/App/AppInfo/appicon.ico____": true, "2_980ab814dfce30eb15adf0a90d85bb1a_Assets/LinuxIcons/16x16.png_16_16____": true,
"2_980ab814dfce30eb15adf0a90d85bb1a_packages/tools/PortableAppsLauncher/App/AppInfo/appicon_16.png____": true, "3_a7fed49fa153dc9f4e58f038011bce4d_Assets/LinuxIcons/24x24.png_24_24____": true,
"3_a7fed49fa153dc9f4e58f038011bce4d_packages/tools/PortableAppsLauncher/App/AppInfo/appicon_32.png_32_32__": true, "3_a7fed49fa153dc9f4e58f038011bce4d_Assets/LinuxIcons/32x32.png_32_32____": true,
"4_1f3d9b9736fe8787c84c8e28275c6721_packages/tools/PortableAppsLauncher/App/AppInfo/appicon_75.png_75_75__": true, "7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/48x48.png_48_48____": true,
"4_1f3d9b9736fe8787c84c8e28275c6721_packages/tools/PortableAppsLauncher/App/AppInfo/appicon_128.png_128_128__": true, "7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/72x72.png_72_72____": true,
"4_1f3d9b9736fe8787c84c8e28275c6721_packages/tools/PortableAppsLauncher/App/AppInfo/Launcher/splash.jpg_144_144__": true, "7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/96x96.png_96_96____": true,
"6_8042e442dfb3e976238ce3896383cb69_packages/app-desktop/build-win/icons/Square150x150Logo.png_150_150_99_75": true, "7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/128x128.png_128_128____": true,
"6_8042e442dfb3e976238ce3896383cb69_packages/app-desktop/build-win/icons/SmallTile.png_70_70_46_46": true, "7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/144x144.png_144_144____": true,
"8_645581f9f6de750b50fec3dbf031cee3_Assets/WebsiteAssets/images/home-top-img-4x.webp_4820_2938__": true, "7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/256x256.png_256_256____": true,
"8_645581f9f6de750b50fec3dbf031cee3_Assets/WebsiteAssets/images/home-top-img-2x.png_2388_1456__": true, "7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/512x512.png_512_512____": true,
"8_645581f9f6de750b50fec3dbf031cee3_Assets/WebsiteAssets/images/home-top-img-2x.webp_2388_1456__": true, "7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/1024x1024.png_1024_1024____": true,
"8_645581f9f6de750b50fec3dbf031cee3_Assets/WebsiteAssets/images/home-top-img.png_1205_734__": true, "5_ec41184ad08ccd9471bfe57eef12a0e7_packages/tools/PortableAppsLauncher/App/AppInfo/appicon.ico______": true,
"8_645581f9f6de750b50fec3dbf031cee3_Assets/WebsiteAssets/images/home-top-img.webp_1205_734__": true, "2_980ab814dfce30eb15adf0a90d85bb1a_packages/tools/PortableAppsLauncher/App/AppInfo/appicon_16.png______": true,
"9_2f78dde9d15370ae6adc7d1a0879ed4b_Assets/WebsiteAssets/images/home-top-img-cn-4x.webp_4820_2938__": true, "3_a7fed49fa153dc9f4e58f038011bce4d_packages/tools/PortableAppsLauncher/App/AppInfo/appicon_32.png_32_32____": true,
"9_2f78dde9d15370ae6adc7d1a0879ed4b_Assets/WebsiteAssets/images/home-top-img-cn-2x.png_2388_1456__": true, "4_1f3d9b9736fe8787c84c8e28275c6721_packages/tools/PortableAppsLauncher/App/AppInfo/appicon_75.png_75_75____": true,
"9_2f78dde9d15370ae6adc7d1a0879ed4b_Assets/WebsiteAssets/images/home-top-img-cn-2x.webp_2388_1456__": true, "4_1f3d9b9736fe8787c84c8e28275c6721_packages/tools/PortableAppsLauncher/App/AppInfo/appicon_128.png_128_128____": true,
"9_2f78dde9d15370ae6adc7d1a0879ed4b_Assets/WebsiteAssets/images/home-top-img-cn.png_1205_734__": true, "4_1f3d9b9736fe8787c84c8e28275c6721_packages/tools/PortableAppsLauncher/App/AppInfo/Launcher/splash.jpg_144_144____": true,
"9_2f78dde9d15370ae6adc7d1a0879ed4b_Assets/WebsiteAssets/images/home-top-img-cn.webp_1205_734__": true, "6_8042e442dfb3e976238ce3896383cb69_packages/app-desktop/build-win/icons/Square150x150Logo.png_150_150_99_75__": true,
"icns_to_icon_set_0b9e402f9c5127284d98d78c7b604123_f69848e65692758af4ac5a05007d5142_e439c7e591993f33597ab18b1dd8f6a8_277cfac6c9cdea99f30717a0e6dadfe2_f69848e65692758af4ac5a05007d5142_ae8c5643f968c45dabe2d663f88d387f_277cfac6c9cdea99f30717a0e6dadfe2_886337d6356057de4c915734b85a87fd_ae8c5643f968c45dabe2d663f88d387f_e8639f50b47004f35aa92edff2142741": true, "6_8042e442dfb3e976238ce3896383cb69_packages/app-desktop/build-win/icons/SmallTile.png_70_70_46_46__": true,
"2_980ab814dfce30eb15adf0a90d85bb1a_Assets/LinuxIcons/16x16.png_16_16__": true, "8_645581f9f6de750b50fec3dbf031cee3_Assets/WebsiteAssets/images/home-top-img-4x.webp_4820_2938____": true,
"3_a7fed49fa153dc9f4e58f038011bce4d_Assets/LinuxIcons/24x24.png_24_24__": true, "8_645581f9f6de750b50fec3dbf031cee3_Assets/WebsiteAssets/images/home-top-img-2x.png_2388_1456____": true,
"3_a7fed49fa153dc9f4e58f038011bce4d_Assets/LinuxIcons/32x32.png_32_32__": true, "8_645581f9f6de750b50fec3dbf031cee3_Assets/WebsiteAssets/images/home-top-img-2x.webp_2388_1456____": true,
"7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/48x48.png_48_48__": true, "8_645581f9f6de750b50fec3dbf031cee3_Assets/WebsiteAssets/images/home-top-img.png_1205_734____": true,
"7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/72x72.png_72_72__": true, "8_645581f9f6de750b50fec3dbf031cee3_Assets/WebsiteAssets/images/home-top-img.webp_1205_734____": true,
"7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/96x96.png_96_96__": true, "9_2f78dde9d15370ae6adc7d1a0879ed4b_Assets/WebsiteAssets/images/home-top-img-cn-4x.webp_4820_2938____": true,
"7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/128x128.png_128_128__": true, "9_2f78dde9d15370ae6adc7d1a0879ed4b_Assets/WebsiteAssets/images/home-top-img-cn-2x.png_2388_1456____": true,
"7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/144x144.png_144_144__": true, "9_2f78dde9d15370ae6adc7d1a0879ed4b_Assets/WebsiteAssets/images/home-top-img-cn-2x.webp_2388_1456____": true,
"7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/256x256.png_256_256__": true, "9_2f78dde9d15370ae6adc7d1a0879ed4b_Assets/WebsiteAssets/images/home-top-img-cn.png_1205_734____": true,
"7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/512x512.png_512_512__": true, "9_2f78dde9d15370ae6adc7d1a0879ed4b_Assets/WebsiteAssets/images/home-top-img-cn.webp_1205_734____": true,
"7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/1024x1024.png_1024_1024__": true, "10_97303f37c9ba9937dd4589e62e2f4beb_packages/server/public/images/icons/server/icon-512.png_512_512____": true,
"icns_to_icon_set_89ddfe84307b49fa96580655b5d7c045_216bb492f34224f24aabacb5f98c3620_fe652082bfb7427cd5c74566ecc24322_ebf1ccaf3f5b77b01ff690b763a411f9_216bb492f34224f24aabacb5f98c3620_950b970a784b14c329e09e78af827a77_ebf1ccaf3f5b77b01ff690b763a411f9_d33dafc8081155149dd1d8c1713bf03f_950b970a784b14c329e09e78af827a77_94949c497e46ed0c67082175f5bb22f8": true "10_97303f37c9ba9937dd4589e62e2f4beb_packages/server/public/images/icons/server/icon-192.png_192_192____": true,
"10_97303f37c9ba9937dd4589e62e2f4beb_packages/server/public/images/icons/server/icon-180.png_180_180____": true,
"10_97303f37c9ba9937dd4589e62e2f4beb_packages/server/public/images/server_logo.png_512_512____": true,
"10_97303f37c9ba9937dd4589e62e2f4beb_packages/server/public/images/icons/server/icon-32.png_32_32___joplinServer32_": true,
"10_97303f37c9ba9937dd4589e62e2f4beb_packages/server/public/images/icons/server/icon.svg______": true,
"10_97303f37c9ba9937dd4589e62e2f4beb_packages/server/public/images/icons/server/favicon.ico______joplinServer32": true,
"11_0eecf70ea64000fa06bdcf78949d0d69_packages/server/public/images/icons/cloud/icon-512.png_512_512____": true,
"11_0eecf70ea64000fa06bdcf78949d0d69_packages/server/public/images/icons/cloud/icon-192.png_192_192____": true,
"11_0eecf70ea64000fa06bdcf78949d0d69_packages/server/public/images/icons/cloud/icon-180.png_180_180____": true,
"11_0eecf70ea64000fa06bdcf78949d0d69_packages/server/public/images/cloud_logo.png_512_512____": true,
"12_c1ecc4672fe806dda0c25ec58ddf498a_packages/server/public/images/icons/cloud/icon-32.png_32_32___joplinCloud32_": true,
"12_c1ecc4672fe806dda0c25ec58ddf498a_packages/server/public/images/icons/cloud/icon.svg______": true,
"12_c1ecc4672fe806dda0c25ec58ddf498a_packages/server/public/images/icons/cloud/favicon.ico______joplinCloud32": true,
"icns_to_icon_set_9f922e3fd5465dd99eabaa24a3dd3c1d_12cd001124be423c65c1b36deccad273_717fde633fffdca1ae13cca5e4d05143_a8f4a3f97ceaefa3151416a40cfab0af_12cd001124be423c65c1b36deccad273_0bf543ae51a3980ce194156b14a77eee_a8f4a3f97ceaefa3151416a40cfab0af_35d1c48c7d56a96cafd8fb898432f25d_0bf543ae51a3980ce194156b14a77eee_b38e4ecf1acfdc684712c8f7d9b9305d": true
} }
} }

View File

@ -13,10 +13,20 @@ interface Source {
interface Operation { interface Operation {
source: number; source: number;
dest: string; dest: string;
// Name of the destination image - it can be used to reference it from `.images`
imageName?: string;
// The width and height of the generated image
width?: number; width?: number;
height?: number; height?: number;
// Resize the source image to that dimensions before adding to the final image
iconWidth?: number; iconWidth?: number;
iconHeight?: number; iconHeight?: number;
// For images that contain multiple images, such as .ico files
images?: string[];
} }
interface Results { interface Results {
@ -60,6 +70,18 @@ const sources: Source[] = [
id: 9, id: 9,
name: 'WebsiteTopImageCn.png', name: 'WebsiteTopImageCn.png',
}, },
{
id: 10,
name: 'JoplinServerIcon.svg',
},
{
id: 11,
name: 'JoplinCloudIcon.svg',
},
{
id: 12,
name: 'JoplinCloudIcon2.svg',
},
]; ];
function sourceById(id: number) { function sourceById(id: number) {
@ -447,6 +469,96 @@ const operations: Operation[] = [
width: 1205, width: 1205,
height: 734, height: 734,
}, },
// ============================================================================
// Joplin Server Icons
// ============================================================================
{
source: 10,
dest: 'packages/server/public/images/icons/server/icon-512.png',
width: 512,
height: 512,
},
{
source: 10,
dest: 'packages/server/public/images/icons/server/icon-192.png',
width: 192,
height: 192,
},
{
source: 10,
dest: 'packages/server/public/images/icons/server/icon-180.png',
width: 180,
height: 180,
},
{
source: 10,
dest: 'packages/server/public/images/server_logo.png',
width: 512,
height: 512,
},
{
source: 10,
dest: 'packages/server/public/images/icons/server/icon-32.png',
width: 32,
height: 32,
imageName: 'joplinServer32',
},
{
source: 10,
dest: 'packages/server/public/images/icons/server/icon.svg',
},
{
source: 10,
dest: 'packages/server/public/images/icons/server/favicon.ico',
images: ['joplinServer32'],
},
// ============================================================================
// Joplin Cloud Icons
// ============================================================================
{
source: 11,
dest: 'packages/server/public/images/icons/cloud/icon-512.png',
width: 512,
height: 512,
},
{
source: 11,
dest: 'packages/server/public/images/icons/cloud/icon-192.png',
width: 192,
height: 192,
},
{
source: 11,
dest: 'packages/server/public/images/icons/cloud/icon-180.png',
width: 180,
height: 180,
},
{
source: 11,
dest: 'packages/server/public/images/cloud_logo.png',
width: 512,
height: 512,
},
{
source: 12,
dest: 'packages/server/public/images/icons/cloud/icon-32.png',
width: 32,
height: 32,
imageName: 'joplinCloud32',
},
{
source: 12,
dest: 'packages/server/public/images/icons/cloud/icon.svg',
},
{
source: 12,
dest: 'packages/server/public/images/icons/cloud/favicon.ico',
images: ['joplinCloud32'],
},
]; ];
const md5Dir = async (dirPath: string): Promise<string> => { const md5Dir = async (dirPath: string): Promise<string> => {
@ -478,6 +590,8 @@ const makeOperationKey = async (source: Source, sourcePath: string, operation: O
output.push(operation.height); output.push(operation.height);
output.push(operation.iconWidth); output.push(operation.iconWidth);
output.push(operation.iconHeight); output.push(operation.iconHeight);
output.push(operation.imageName);
output.push(operation.images ? operation.images.join(':') : '');
return output.join('_'); return output.join('_');
}; };
@ -534,6 +648,14 @@ async function main() {
s.webp({ s.webp({
// quality: 90, // quality: 90,
}); });
} else if (destExt === 'ico') {
const sources: string[] = operations.filter(o => {
return operation.images.includes(o.imageName);
}).map(o => {
return `${rootDir}/${o.dest}`;
});
await execCommand(`convert ${sources.map(s => `'${s}'`).join(' ')} "${operation.dest}"`);
} else { } else {
throw new Error(`Unsupported extension: ${destExt}`); throw new Error(`Unsupported extension: ${destExt}`);
} }