self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-02 12:47:41 +02:00
Code Issues Releases Activity

Revert "macOS: Improved appearance of application icon"

Browse Source 
This reverts commit 334347abcf.
This commit is contained in:
Laurent Cozic 2020-05-31 17:46:19 +01:00
parent 334347abcf
commit a8cffb9ac8
14 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.eslintignore
View File

@ -61,8 +61,6 @@ Modules/TinyMCE/IconPack/postinstall.js
Modules/TinyMCE/langs/ Modules/TinyMCE/langs/
# AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
CliClient/tests-build/support/plugins/withExternalModules/global.d.js
CliClient/tests-build/support/plugins/withExternalModules/src/index.js
ElectronClient/gui/MultiNoteActions.js ElectronClient/gui/MultiNoteActions.js
ElectronClient/gui/NoteContentPropertiesDialog.js ElectronClient/gui/NoteContentPropertiesDialog.js
ElectronClient/gui/NoteEditor/NoteBody/AceEditor/AceEditor.js ElectronClient/gui/NoteEditor/NoteBody/AceEditor/AceEditor.js

2
.gitignore vendored
View File

@ -51,8 +51,6 @@ Tools/commit_hook.txt
*.map *.map
# AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
CliClient/tests-build/support/plugins/withExternalModules/global.d.js
CliClient/tests-build/support/plugins/withExternalModules/src/index.js
ElectronClient/gui/MultiNoteActions.js ElectronClient/gui/MultiNoteActions.js
ElectronClient/gui/NoteContentPropertiesDialog.js ElectronClient/gui/NoteContentPropertiesDialog.js
ElectronClient/gui/NoteEditor/NoteBody/AceEditor/AceEditor.js ElectronClient/gui/NoteEditor/NoteBody/AceEditor/AceEditor.js

BIN
Assets/ImageSources/RoundedCornersMac_1024x1024.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 59 KiB

BIN
Assets/macOs.icns
View File

Binary file not shown.

BIN
Assets/macOs.iconset/icon_128x128.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
Assets/macOs.iconset/icon_128x128@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 26 KiB

BIN
Assets/macOs.iconset/icon_256x256.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 26 KiB

BIN
Assets/macOs.iconset/icon_256x256@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 63 KiB

BIN
Assets/macOs.iconset/icon_512x512.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 63 KiB

BIN
Assets/macOs.iconset/icon_512x512@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 71 KiB

After

Width:  |  Height:  |  Size: 64 KiB

BIN
Assets/macOsIcon.psd
View File

Binary file not shown.

BIN
ElectronClient/build-win/icons/SmallTile.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 953 B

BIN
ElectronClient/build-win/icons/Square150x150Logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

16
Tools/generate-images.js
View File

@ -31,10 +31,6 @@ const sources = [
id: 6, id: 6,
name: '../JoplinLetter.png', name: '../JoplinLetter.png',
}, },
{
id: 7,
name: 'RoundedCornersMac_1024x1024.png',
},
]; ];
function sourceById(id) { function sourceById(id) {
@ -188,37 +184,37 @@ const operations = [
height: 64, height: 64,
}, },
{ {
source: 7, source: 4,
dest: 'Assets/macOs.iconset/icon_128x128.png', dest: 'Assets/macOs.iconset/icon_128x128.png',
width: 128, width: 128,
height: 128, height: 128,
}, },
{ {
source: 7, source: 4,
dest: 'Assets/macOs.iconset/icon_128x128@2x.png', dest: 'Assets/macOs.iconset/icon_128x128@2x.png',
width: 256, width: 256,
height: 256, height: 256,
}, },
{ {
source: 7, source: 4,
dest: 'Assets/macOs.iconset/icon_256x256.png', dest: 'Assets/macOs.iconset/icon_256x256.png',
width: 256, width: 256,
height: 256, height: 256,
}, },
{ {
source: 7, source: 4,
dest: 'Assets/macOs.iconset/icon_256x256@2x.png', dest: 'Assets/macOs.iconset/icon_256x256@2x.png',
width: 512, width: 512,
height: 512, height: 512,
}, },
{ {
source: 7, source: 4,
dest: 'Assets/macOs.iconset/icon_512x512.png', dest: 'Assets/macOs.iconset/icon_512x512.png',
width: 512, width: 512,
height: 512, height: 512,
}, },
{ {
source: 7, source: 4,
dest: 'Assets/macOs.iconset/icon_512x512@2x.png', dest: 'Assets/macOs.iconset/icon_512x512@2x.png',
width: 1024, width: 1024,
height: 1024, height: 1024,