diff --git a/Assets/JoplinLetter.svg b/Assets/JoplinLetter.svg index 9df141c65..717301caf 100644 --- a/Assets/JoplinLetter.svg +++ b/Assets/JoplinLetter.svg @@ -1,6 +1,4 @@ - - + sodipodi:docname="JoplinLetter.svg" + inkscape:version="1.0beta1 (32d4812, 2019-09-19)"> + + + image/svg+xml + + + + + + + + + + + + + + - - - - - image/svg+xml - - - - - - - - + id="defs6" /> + + + + + diff --git a/Assets/macOs.icns b/Assets/macOs.icns index c1a73076d..57a711ea4 100644 Binary files a/Assets/macOs.icns and b/Assets/macOs.icns differ diff --git a/Assets/macOs.iconset/icon_128x128.png b/Assets/macOs.iconset/icon_128x128.png index be81ce984..4270b115c 100644 Binary files a/Assets/macOs.iconset/icon_128x128.png and b/Assets/macOs.iconset/icon_128x128.png differ diff --git a/Assets/macOs.iconset/icon_128x128@2x.png b/Assets/macOs.iconset/icon_128x128@2x.png new file mode 100644 index 000000000..a42ee06b2 Binary files /dev/null and b/Assets/macOs.iconset/icon_128x128@2x.png differ diff --git a/Assets/macOs.iconset/icon_16x16.png b/Assets/macOs.iconset/icon_16x16.png index cacdb0e9f..e2b9ab257 100644 Binary files a/Assets/macOs.iconset/icon_16x16.png and b/Assets/macOs.iconset/icon_16x16.png differ diff --git a/Assets/macOs.iconset/icon_16x16@2x.png b/Assets/macOs.iconset/icon_16x16@2x.png new file mode 100644 index 000000000..0379ca2e3 Binary files /dev/null and b/Assets/macOs.iconset/icon_16x16@2x.png differ diff --git a/Assets/macOs.iconset/icon_256x256.png b/Assets/macOs.iconset/icon_256x256.png index 4a3774cec..a42ee06b2 100644 Binary files a/Assets/macOs.iconset/icon_256x256.png and b/Assets/macOs.iconset/icon_256x256.png differ diff --git a/Assets/macOs.iconset/icon_256x256@2x.png b/Assets/macOs.iconset/icon_256x256@2x.png new file mode 100644 index 000000000..07320a60a Binary files /dev/null and b/Assets/macOs.iconset/icon_256x256@2x.png differ diff --git a/Assets/macOs.iconset/icon_32x32.png b/Assets/macOs.iconset/icon_32x32.png index 04edb121c..0379ca2e3 100644 Binary files a/Assets/macOs.iconset/icon_32x32.png and b/Assets/macOs.iconset/icon_32x32.png differ diff --git a/Assets/macOs.iconset/icon_32x32@2x.png b/Assets/macOs.iconset/icon_32x32@2x.png new file mode 100644 index 000000000..1e61d8b7c Binary files /dev/null and b/Assets/macOs.iconset/icon_32x32@2x.png differ diff --git a/Assets/macOs.iconset/icon_512x512.png b/Assets/macOs.iconset/icon_512x512.png index 29a4c32cf..07320a60a 100644 Binary files a/Assets/macOs.iconset/icon_512x512.png and b/Assets/macOs.iconset/icon_512x512.png differ diff --git a/Assets/macOs.iconset/icon_1024x1024.png b/Assets/macOs.iconset/icon_512x512@2x.png similarity index 100% rename from Assets/macOs.iconset/icon_1024x1024.png rename to Assets/macOs.iconset/icon_512x512@2x.png diff --git a/Clipper/joplin-webclipper/icons/32-dev.png b/Clipper/joplin-webclipper/icons/32-dev.png index 35e3ed975..773b80d45 100644 Binary files a/Clipper/joplin-webclipper/icons/32-dev.png and b/Clipper/joplin-webclipper/icons/32-dev.png differ diff --git a/Clipper/joplin-webclipper/icons/32.png b/Clipper/joplin-webclipper/icons/32.png index 679aa6e67..db298f142 100644 Binary files a/Clipper/joplin-webclipper/icons/32.png and b/Clipper/joplin-webclipper/icons/32.png differ diff --git a/Clipper/joplin-webclipper/icons/48.png b/Clipper/joplin-webclipper/icons/48.png index f5ab076ae..790d919be 100644 Binary files a/Clipper/joplin-webclipper/icons/48.png and b/Clipper/joplin-webclipper/icons/48.png differ diff --git a/Clipper/joplin-webclipper/icons/96.png b/Clipper/joplin-webclipper/icons/96.png index cb1faeb10..aaa960e2d 100644 Binary files a/Clipper/joplin-webclipper/icons/96.png and b/Clipper/joplin-webclipper/icons/96.png differ diff --git a/ElectronClient/app/app.js b/ElectronClient/app/app.js index 1cfb9aab7..59a64c09d 100644 --- a/ElectronClient/app/app.js +++ b/ElectronClient/app/app.js @@ -617,7 +617,7 @@ class Application extends BaseApplication { console.info(gitInfo); } bridge().showInfoMessageBox(message.join('\n'), { - icon: `${bridge().electronApp().buildDir()}/icons/32x32.png`, + icon: `${bridge().electronApp().buildDir()}/icons/128x128.png`, }); } diff --git a/README.md b/README.md index f73525746..eced117f2 100644 --- a/README.md +++ b/README.md @@ -177,7 +177,6 @@ Select the "WebDAV" synchronisation target and follow the same instructions as f WebDAV-compatible services that are known to work with Joplin: - [Apache WebDAV Module](https://httpd.apache.org/docs/current/mod/mod_dav.html) -- [Box.com](https://www.box.com/) - [DriveHQ](https://www.drivehq.com) - [Fastmail](https://www.fastmail.com/) - [HiDrive](https://www.strato.fr/stockage-en-ligne/) from Strato. [Setup help](https://github.com/laurent22/joplin/issues/309)