From 45aa5781ce611ea411e34e3b18358a9fe15f67ce Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 9 Jun 2022 22:25:23 +0200 Subject: Change brand color and logotypes (#18592) - Add rake task for generating Apple/Android icons and favicons from SVG - Add rake task for generating PNG icons and logos for e-mails from SVG - Remove obsolete Microsoft icons and configuration - Remove PWA shortcut icons --- app/javascript/icons/android-chrome-144x144.png | Bin 0 -> 6644 bytes app/javascript/icons/android-chrome-192x192.png | Bin 0 -> 10138 bytes app/javascript/icons/android-chrome-256x256.png | Bin 0 -> 14194 bytes app/javascript/icons/android-chrome-36x36.png | Bin 0 -> 1050 bytes app/javascript/icons/android-chrome-384x384.png | Bin 0 -> 25667 bytes app/javascript/icons/android-chrome-48x48.png | Bin 0 -> 1468 bytes app/javascript/icons/android-chrome-512x512.png | Bin 0 -> 39853 bytes app/javascript/icons/android-chrome-72x72.png | Bin 0 -> 2501 bytes app/javascript/icons/android-chrome-96x96.png | Bin 0 -> 3713 bytes .../icons/apple-touch-icon-1024x1024.png | Bin 0 -> 104580 bytes app/javascript/icons/apple-touch-icon-114x114.png | Bin 0 -> 4641 bytes app/javascript/icons/apple-touch-icon-120x120.png | Bin 0 -> 4914 bytes app/javascript/icons/apple-touch-icon-144x144.png | Bin 0 -> 6644 bytes app/javascript/icons/apple-touch-icon-152x152.png | Bin 0 -> 7002 bytes app/javascript/icons/apple-touch-icon-167x167.png | Bin 0 -> 8096 bytes app/javascript/icons/apple-touch-icon-180x180.png | Bin 0 -> 8947 bytes app/javascript/icons/apple-touch-icon-57x57.png | Bin 0 -> 1857 bytes app/javascript/icons/apple-touch-icon-60x60.png | Bin 0 -> 1952 bytes app/javascript/icons/apple-touch-icon-72x72.png | Bin 0 -> 2501 bytes app/javascript/icons/apple-touch-icon-76x76.png | Bin 0 -> 2617 bytes app/javascript/icons/favicon-16x16.png | Bin 0 -> 650 bytes app/javascript/icons/favicon-32x32.png | Bin 0 -> 1248 bytes app/javascript/icons/favicon-48x48.png | Bin 0 -> 1798 bytes app/javascript/images/app-icon.svg | 28 +++++++++++++++++++++ app/javascript/images/icon_cached.svg | 2 -- app/javascript/images/icon_done.svg | 4 --- app/javascript/images/icon_email.svg | 4 --- app/javascript/images/icon_file_download.svg | 4 --- app/javascript/images/icon_flag.svg | 4 --- app/javascript/images/icon_grade.svg | 4 --- app/javascript/images/icon_lock_open.svg | 4 --- app/javascript/images/icon_person_add.svg | 4 --- app/javascript/images/icon_reply.svg | 4 --- app/javascript/images/icons/icon_cached.svg | 1 + app/javascript/images/icons/icon_done.svg | 1 + app/javascript/images/icons/icon_email.svg | 1 + app/javascript/images/icons/icon_file_download.svg | 1 + app/javascript/images/icons/icon_flag.svg | 1 + app/javascript/images/icons/icon_grade.svg | 1 + app/javascript/images/icons/icon_lock_open.svg | 1 + app/javascript/images/icons/icon_person_add.svg | 1 + app/javascript/images/icons/icon_reply.svg | 1 + app/javascript/images/logo-symbol-icon.svg | 2 ++ app/javascript/images/logo-symbol-wordmark.svg | 11 ++++++++ app/javascript/images/logo.svg | 11 +++++++- app/javascript/images/logo_full.svg | 1 - app/javascript/images/logo_transparent.svg | 1 - app/javascript/images/logo_transparent_white.svg | 1 - app/javascript/images/mailer/icon_cached.png | Bin 423 -> 2014 bytes app/javascript/images/mailer/icon_done.png | Bin 253 -> 817 bytes app/javascript/images/mailer/icon_email.png | Bin 387 -> 2120 bytes .../images/mailer/icon_file_download.png | Bin 225 -> 813 bytes app/javascript/images/mailer/icon_flag.png | Bin 0 -> 693 bytes app/javascript/images/mailer/icon_grade.png | Bin 412 -> 3243 bytes app/javascript/images/mailer/icon_lock_open.png | Bin 387 -> 2498 bytes app/javascript/images/mailer/icon_person_add.png | Bin 376 -> 2356 bytes app/javascript/images/mailer/icon_reply.png | Bin 319 -> 2146 bytes app/javascript/images/mailer/icon_warning.png | Bin 371 -> 0 bytes app/javascript/images/mailer/logo.png | Bin 0 -> 1745 bytes app/javascript/images/mailer/logo_full.png | Bin 2371 -> 0 bytes app/javascript/images/mailer/logo_transparent.png | Bin 506 -> 0 bytes app/javascript/images/mailer/wordmark.png | Bin 0 -> 8942 bytes app/javascript/images/preview.jpg | Bin 292252 -> 0 bytes app/javascript/images/preview.png | Bin 0 -> 514463 bytes app/javascript/packs/mailer.js | 2 ++ app/javascript/styles/application.scss | 1 + app/javascript/styles/mastodon/about.scss | 2 +- app/javascript/styles/mastodon/branding.scss | 3 +++ app/javascript/styles/mastodon/components.scss | 1 - app/javascript/styles/mastodon/containers.scss | 5 ++-- app/javascript/styles/mastodon/footer.scss | 8 +++--- app/javascript/styles/mastodon/variables.scss | 2 +- 72 files changed, 74 insertions(+), 48 deletions(-) create mode 100644 app/javascript/icons/android-chrome-144x144.png create mode 100644 app/javascript/icons/android-chrome-192x192.png create mode 100644 app/javascript/icons/android-chrome-256x256.png create mode 100644 app/javascript/icons/android-chrome-36x36.png create mode 100644 app/javascript/icons/android-chrome-384x384.png create mode 100644 app/javascript/icons/android-chrome-48x48.png create mode 100644 app/javascript/icons/android-chrome-512x512.png create mode 100644 app/javascript/icons/android-chrome-72x72.png create mode 100644 app/javascript/icons/android-chrome-96x96.png create mode 100644 app/javascript/icons/apple-touch-icon-1024x1024.png create mode 100644 app/javascript/icons/apple-touch-icon-114x114.png create mode 100644 app/javascript/icons/apple-touch-icon-120x120.png create mode 100644 app/javascript/icons/apple-touch-icon-144x144.png create mode 100644 app/javascript/icons/apple-touch-icon-152x152.png create mode 100644 app/javascript/icons/apple-touch-icon-167x167.png create mode 100644 app/javascript/icons/apple-touch-icon-180x180.png create mode 100644 app/javascript/icons/apple-touch-icon-57x57.png create mode 100644 app/javascript/icons/apple-touch-icon-60x60.png create mode 100644 app/javascript/icons/apple-touch-icon-72x72.png create mode 100644 app/javascript/icons/apple-touch-icon-76x76.png create mode 100644 app/javascript/icons/favicon-16x16.png create mode 100644 app/javascript/icons/favicon-32x32.png create mode 100644 app/javascript/icons/favicon-48x48.png create mode 100644 app/javascript/images/app-icon.svg delete mode 100644 app/javascript/images/icon_cached.svg delete mode 100644 app/javascript/images/icon_done.svg delete mode 100644 app/javascript/images/icon_email.svg delete mode 100644 app/javascript/images/icon_file_download.svg delete mode 100644 app/javascript/images/icon_flag.svg delete mode 100644 app/javascript/images/icon_grade.svg delete mode 100644 app/javascript/images/icon_lock_open.svg delete mode 100644 app/javascript/images/icon_person_add.svg delete mode 100644 app/javascript/images/icon_reply.svg create mode 100644 app/javascript/images/icons/icon_cached.svg create mode 100644 app/javascript/images/icons/icon_done.svg create mode 100644 app/javascript/images/icons/icon_email.svg create mode 100644 app/javascript/images/icons/icon_file_download.svg create mode 100644 app/javascript/images/icons/icon_flag.svg create mode 100644 app/javascript/images/icons/icon_grade.svg create mode 100644 app/javascript/images/icons/icon_lock_open.svg create mode 100644 app/javascript/images/icons/icon_person_add.svg create mode 100644 app/javascript/images/icons/icon_reply.svg create mode 100644 app/javascript/images/logo-symbol-icon.svg create mode 100644 app/javascript/images/logo-symbol-wordmark.svg delete mode 100644 app/javascript/images/logo_full.svg delete mode 100644 app/javascript/images/logo_transparent.svg delete mode 100644 app/javascript/images/logo_transparent_white.svg create mode 100644 app/javascript/images/mailer/icon_flag.png delete mode 100644 app/javascript/images/mailer/icon_warning.png create mode 100644 app/javascript/images/mailer/logo.png delete mode 100644 app/javascript/images/mailer/logo_full.png delete mode 100644 app/javascript/images/mailer/logo_transparent.png create mode 100644 app/javascript/images/mailer/wordmark.png delete mode 100644 app/javascript/images/preview.jpg create mode 100644 app/javascript/images/preview.png create mode 100644 app/javascript/styles/mastodon/branding.scss (limited to 'app/javascript') diff --git a/app/javascript/icons/android-chrome-144x144.png b/app/javascript/icons/android-chrome-144x144.png new file mode 100644 index 000000000..d282a6d3d Binary files /dev/null and b/app/javascript/icons/android-chrome-144x144.png differ diff --git a/app/javascript/icons/android-chrome-192x192.png b/app/javascript/icons/android-chrome-192x192.png new file mode 100644 index 000000000..d3f9959c5 Binary files /dev/null and b/app/javascript/icons/android-chrome-192x192.png differ diff --git a/app/javascript/icons/android-chrome-256x256.png b/app/javascript/icons/android-chrome-256x256.png new file mode 100644 index 000000000..98ce6ffbb Binary files /dev/null and b/app/javascript/icons/android-chrome-256x256.png differ diff --git a/app/javascript/icons/android-chrome-36x36.png b/app/javascript/icons/android-chrome-36x36.png new file mode 100644 index 000000000..f8ffeeb76 Binary files /dev/null and b/app/javascript/icons/android-chrome-36x36.png differ diff --git a/app/javascript/icons/android-chrome-384x384.png b/app/javascript/icons/android-chrome-384x384.png new file mode 100644 index 000000000..60b375354 Binary files /dev/null and b/app/javascript/icons/android-chrome-384x384.png differ diff --git a/app/javascript/icons/android-chrome-48x48.png b/app/javascript/icons/android-chrome-48x48.png new file mode 100644 index 000000000..ce49448d4 Binary files /dev/null and b/app/javascript/icons/android-chrome-48x48.png differ diff --git a/app/javascript/icons/android-chrome-512x512.png b/app/javascript/icons/android-chrome-512x512.png new file mode 100644 index 000000000..bccaada29 Binary files /dev/null and b/app/javascript/icons/android-chrome-512x512.png differ diff --git a/app/javascript/icons/android-chrome-72x72.png b/app/javascript/icons/android-chrome-72x72.png new file mode 100644 index 000000000..ce57ab746 Binary files /dev/null and b/app/javascript/icons/android-chrome-72x72.png differ diff --git a/app/javascript/icons/android-chrome-96x96.png b/app/javascript/icons/android-chrome-96x96.png new file mode 100644 index 000000000..cd8f09ed4 Binary files /dev/null and b/app/javascript/icons/android-chrome-96x96.png differ diff --git a/app/javascript/icons/apple-touch-icon-1024x1024.png b/app/javascript/icons/apple-touch-icon-1024x1024.png new file mode 100644 index 000000000..b1f18f3e3 Binary files /dev/null and b/app/javascript/icons/apple-touch-icon-1024x1024.png differ diff --git a/app/javascript/icons/apple-touch-icon-114x114.png b/app/javascript/icons/apple-touch-icon-114x114.png new file mode 100644 index 000000000..e13aaa87d Binary files /dev/null and b/app/javascript/icons/apple-touch-icon-114x114.png differ diff --git a/app/javascript/icons/apple-touch-icon-120x120.png b/app/javascript/icons/apple-touch-icon-120x120.png new file mode 100644 index 000000000..aa63012b5 Binary files /dev/null and b/app/javascript/icons/apple-touch-icon-120x120.png differ diff --git a/app/javascript/icons/apple-touch-icon-144x144.png b/app/javascript/icons/apple-touch-icon-144x144.png new file mode 100644 index 000000000..d282a6d3d Binary files /dev/null and b/app/javascript/icons/apple-touch-icon-144x144.png differ diff --git a/app/javascript/icons/apple-touch-icon-152x152.png b/app/javascript/icons/apple-touch-icon-152x152.png new file mode 100644 index 000000000..0dec7d63e Binary files /dev/null and b/app/javascript/icons/apple-touch-icon-152x152.png differ diff --git a/app/javascript/icons/apple-touch-icon-167x167.png b/app/javascript/icons/apple-touch-icon-167x167.png new file mode 100644 index 000000000..a622e1215 Binary files /dev/null and b/app/javascript/icons/apple-touch-icon-167x167.png differ diff --git a/app/javascript/icons/apple-touch-icon-180x180.png b/app/javascript/icons/apple-touch-icon-180x180.png new file mode 100644 index 000000000..864046b56 Binary files /dev/null and b/app/javascript/icons/apple-touch-icon-180x180.png differ diff --git a/app/javascript/icons/apple-touch-icon-57x57.png b/app/javascript/icons/apple-touch-icon-57x57.png new file mode 100644 index 000000000..116918ce2 Binary files /dev/null and b/app/javascript/icons/apple-touch-icon-57x57.png differ diff --git a/app/javascript/icons/apple-touch-icon-60x60.png b/app/javascript/icons/apple-touch-icon-60x60.png new file mode 100644 index 000000000..0eda96ed6 Binary files /dev/null and b/app/javascript/icons/apple-touch-icon-60x60.png differ diff --git a/app/javascript/icons/apple-touch-icon-72x72.png b/app/javascript/icons/apple-touch-icon-72x72.png new file mode 100644 index 000000000..ce57ab746 Binary files /dev/null and b/app/javascript/icons/apple-touch-icon-72x72.png differ diff --git a/app/javascript/icons/apple-touch-icon-76x76.png b/app/javascript/icons/apple-touch-icon-76x76.png new file mode 100644 index 000000000..50e162891 Binary files /dev/null and b/app/javascript/icons/apple-touch-icon-76x76.png differ diff --git a/app/javascript/icons/favicon-16x16.png b/app/javascript/icons/favicon-16x16.png new file mode 100644 index 000000000..e7037f4cf Binary files /dev/null and b/app/javascript/icons/favicon-16x16.png differ diff --git a/app/javascript/icons/favicon-32x32.png b/app/javascript/icons/favicon-32x32.png new file mode 100644 index 000000000..a91b02463 Binary files /dev/null and b/app/javascript/icons/favicon-32x32.png differ diff --git a/app/javascript/icons/favicon-48x48.png b/app/javascript/icons/favicon-48x48.png new file mode 100644 index 000000000..d3721fbdd Binary files /dev/null and b/app/javascript/icons/favicon-48x48.png differ diff --git a/app/javascript/images/app-icon.svg b/app/javascript/images/app-icon.svg new file mode 100644 index 000000000..1035bd076 --- /dev/null +++ b/app/javascript/images/app-icon.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/javascript/images/icon_cached.svg b/app/javascript/images/icon_cached.svg deleted file mode 100644 index 1087c4350..000000000 --- a/app/javascript/images/icon_cached.svg +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/app/javascript/images/icon_done.svg b/app/javascript/images/icon_done.svg deleted file mode 100644 index 446af14d9..000000000 --- a/app/javascript/images/icon_done.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/javascript/images/icon_email.svg b/app/javascript/images/icon_email.svg deleted file mode 100644 index 6d0ad9d9b..000000000 --- a/app/javascript/images/icon_email.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/javascript/images/icon_file_download.svg b/app/javascript/images/icon_file_download.svg deleted file mode 100644 index 53e97e4f8..000000000 --- a/app/javascript/images/icon_file_download.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/javascript/images/icon_flag.svg b/app/javascript/images/icon_flag.svg deleted file mode 100644 index 3939c9d2b..000000000 --- a/app/javascript/images/icon_flag.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/javascript/images/icon_grade.svg b/app/javascript/images/icon_grade.svg deleted file mode 100644 index f48b46889..000000000 --- a/app/javascript/images/icon_grade.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/javascript/images/icon_lock_open.svg b/app/javascript/images/icon_lock_open.svg deleted file mode 100644 index 3288b46d6..000000000 --- a/app/javascript/images/icon_lock_open.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/javascript/images/icon_person_add.svg b/app/javascript/images/icon_person_add.svg deleted file mode 100644 index 068b8ae7c..000000000 --- a/app/javascript/images/icon_person_add.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/javascript/images/icon_reply.svg b/app/javascript/images/icon_reply.svg deleted file mode 100644 index cf6a09abc..000000000 --- a/app/javascript/images/icon_reply.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/javascript/images/icons/icon_cached.svg b/app/javascript/images/icons/icon_cached.svg new file mode 100644 index 000000000..d938e9bad --- /dev/null +++ b/app/javascript/images/icons/icon_cached.svg @@ -0,0 +1 @@ + diff --git a/app/javascript/images/icons/icon_done.svg b/app/javascript/images/icons/icon_done.svg new file mode 100644 index 000000000..a35ab87a1 --- /dev/null +++ b/app/javascript/images/icons/icon_done.svg @@ -0,0 +1 @@ + diff --git a/app/javascript/images/icons/icon_email.svg b/app/javascript/images/icons/icon_email.svg new file mode 100644 index 000000000..0215b6f3a --- /dev/null +++ b/app/javascript/images/icons/icon_email.svg @@ -0,0 +1 @@ + diff --git a/app/javascript/images/icons/icon_file_download.svg b/app/javascript/images/icons/icon_file_download.svg new file mode 100644 index 000000000..dc6d6bce3 --- /dev/null +++ b/app/javascript/images/icons/icon_file_download.svg @@ -0,0 +1 @@ + diff --git a/app/javascript/images/icons/icon_flag.svg b/app/javascript/images/icons/icon_flag.svg new file mode 100644 index 000000000..fe07808fa --- /dev/null +++ b/app/javascript/images/icons/icon_flag.svg @@ -0,0 +1 @@ + diff --git a/app/javascript/images/icons/icon_grade.svg b/app/javascript/images/icons/icon_grade.svg new file mode 100644 index 000000000..f8dd93864 --- /dev/null +++ b/app/javascript/images/icons/icon_grade.svg @@ -0,0 +1 @@ + diff --git a/app/javascript/images/icons/icon_lock_open.svg b/app/javascript/images/icons/icon_lock_open.svg new file mode 100644 index 000000000..12f559beb --- /dev/null +++ b/app/javascript/images/icons/icon_lock_open.svg @@ -0,0 +1 @@ + diff --git a/app/javascript/images/icons/icon_person_add.svg b/app/javascript/images/icons/icon_person_add.svg new file mode 100644 index 000000000..370536333 --- /dev/null +++ b/app/javascript/images/icons/icon_person_add.svg @@ -0,0 +1 @@ + diff --git a/app/javascript/images/icons/icon_reply.svg b/app/javascript/images/icons/icon_reply.svg new file mode 100644 index 000000000..9f99e4cbf --- /dev/null +++ b/app/javascript/images/icons/icon_reply.svg @@ -0,0 +1 @@ + diff --git a/app/javascript/images/logo-symbol-icon.svg b/app/javascript/images/logo-symbol-icon.svg new file mode 100644 index 000000000..12f4e078e --- /dev/null +++ b/app/javascript/images/logo-symbol-icon.svg @@ -0,0 +1,2 @@ + + diff --git a/app/javascript/images/logo-symbol-wordmark.svg b/app/javascript/images/logo-symbol-wordmark.svg new file mode 100644 index 000000000..7e7f7b087 --- /dev/null +++ b/app/javascript/images/logo-symbol-wordmark.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/app/javascript/images/logo.svg b/app/javascript/images/logo.svg index 034a9c221..6ffc988e5 100644 --- a/app/javascript/images/logo.svg +++ b/app/javascript/images/logo.svg @@ -1 +1,10 @@ - + + + + + + + + + + diff --git a/app/javascript/images/logo_full.svg b/app/javascript/images/logo_full.svg deleted file mode 100644 index 03bcf93e3..000000000 --- a/app/javascript/images/logo_full.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/app/javascript/images/logo_transparent.svg b/app/javascript/images/logo_transparent.svg deleted file mode 100644 index a1e7b403e..000000000 --- a/app/javascript/images/logo_transparent.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/app/javascript/images/logo_transparent_white.svg b/app/javascript/images/logo_transparent_white.svg deleted file mode 100644 index f061ffe4c..000000000 --- a/app/javascript/images/logo_transparent_white.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/app/javascript/images/mailer/icon_cached.png b/app/javascript/images/mailer/icon_cached.png index 5c993dbee..e94abb7ba 100644 Binary files a/app/javascript/images/mailer/icon_cached.png and b/app/javascript/images/mailer/icon_cached.png differ diff --git a/app/javascript/images/mailer/icon_done.png b/app/javascript/images/mailer/icon_done.png index f7f95a0e8..472364de4 100644 Binary files a/app/javascript/images/mailer/icon_done.png and b/app/javascript/images/mailer/icon_done.png differ diff --git a/app/javascript/images/mailer/icon_email.png b/app/javascript/images/mailer/icon_email.png index 13967009a..d8dfe161e 100644 Binary files a/app/javascript/images/mailer/icon_email.png and b/app/javascript/images/mailer/icon_email.png differ diff --git a/app/javascript/images/mailer/icon_file_download.png b/app/javascript/images/mailer/icon_file_download.png index 3f7ac429b..24e424d3b 100644 Binary files a/app/javascript/images/mailer/icon_file_download.png and b/app/javascript/images/mailer/icon_file_download.png differ diff --git a/app/javascript/images/mailer/icon_flag.png b/app/javascript/images/mailer/icon_flag.png new file mode 100644 index 000000000..0f14f45a8 Binary files /dev/null and b/app/javascript/images/mailer/icon_flag.png differ diff --git a/app/javascript/images/mailer/icon_grade.png b/app/javascript/images/mailer/icon_grade.png index 8c212b7ee..7f371ab11 100644 Binary files a/app/javascript/images/mailer/icon_grade.png and b/app/javascript/images/mailer/icon_grade.png differ diff --git a/app/javascript/images/mailer/icon_lock_open.png b/app/javascript/images/mailer/icon_lock_open.png index c854c3bdb..d11c36475 100644 Binary files a/app/javascript/images/mailer/icon_lock_open.png and b/app/javascript/images/mailer/icon_lock_open.png differ diff --git a/app/javascript/images/mailer/icon_person_add.png b/app/javascript/images/mailer/icon_person_add.png index 6290a42ae..696eb7495 100644 Binary files a/app/javascript/images/mailer/icon_person_add.png and b/app/javascript/images/mailer/icon_person_add.png differ diff --git a/app/javascript/images/mailer/icon_reply.png b/app/javascript/images/mailer/icon_reply.png index a70093356..51d92f845 100644 Binary files a/app/javascript/images/mailer/icon_reply.png and b/app/javascript/images/mailer/icon_reply.png differ diff --git a/app/javascript/images/mailer/icon_warning.png b/app/javascript/images/mailer/icon_warning.png deleted file mode 100644 index 7baaac61c..000000000 Binary files a/app/javascript/images/mailer/icon_warning.png and /dev/null differ diff --git a/app/javascript/images/mailer/logo.png b/app/javascript/images/mailer/logo.png new file mode 100644 index 000000000..54c8afd6a Binary files /dev/null and b/app/javascript/images/mailer/logo.png differ diff --git a/app/javascript/images/mailer/logo_full.png b/app/javascript/images/mailer/logo_full.png deleted file mode 100644 index 82d981fc6..000000000 Binary files a/app/javascript/images/mailer/logo_full.png and /dev/null differ diff --git a/app/javascript/images/mailer/logo_transparent.png b/app/javascript/images/mailer/logo_transparent.png deleted file mode 100644 index 6dbcc2e8d..000000000 Binary files a/app/javascript/images/mailer/logo_transparent.png and /dev/null differ diff --git a/app/javascript/images/mailer/wordmark.png b/app/javascript/images/mailer/wordmark.png new file mode 100644 index 000000000..f3d714d3a Binary files /dev/null and b/app/javascript/images/mailer/wordmark.png differ diff --git a/app/javascript/images/preview.jpg b/app/javascript/images/preview.jpg deleted file mode 100644 index ec2856748..000000000 Binary files a/app/javascript/images/preview.jpg and /dev/null differ diff --git a/app/javascript/images/preview.png b/app/javascript/images/preview.png new file mode 100644 index 000000000..369bed4b6 Binary files /dev/null and b/app/javascript/images/preview.png differ diff --git a/app/javascript/packs/mailer.js b/app/javascript/packs/mailer.js index 732fc1698..a4b6d5446 100644 --- a/app/javascript/packs/mailer.js +++ b/app/javascript/packs/mailer.js @@ -1 +1,3 @@ require('../styles/mailer.scss'); + +require.context('../icons'); diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss index cb65b9567..bbea06195 100644 --- a/app/javascript/styles/application.scss +++ b/app/javascript/styles/application.scss @@ -6,6 +6,7 @@ @import 'mastodon/reset'; @import 'mastodon/basics'; +@import 'mastodon/branding'; @import 'mastodon/containers'; @import 'mastodon/lists'; @import 'mastodon/footer'; diff --git a/app/javascript/styles/mastodon/about.scss b/app/javascript/styles/mastodon/about.scss index ac2fdb2c7..c82be742d 100644 --- a/app/javascript/styles/mastodon/about.scss +++ b/app/javascript/styles/mastodon/about.scss @@ -688,7 +688,7 @@ $small-breakpoint: 960px; align-items: center; padding: 50px; - svg { + .logo { fill: $primary-text-color; height: 52px; } diff --git a/app/javascript/styles/mastodon/branding.scss b/app/javascript/styles/mastodon/branding.scss new file mode 100644 index 000000000..d1bddc68b --- /dev/null +++ b/app/javascript/styles/mastodon/branding.scss @@ -0,0 +1,3 @@ +.logo { + color: $primary-text-color; +} diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 401cf02ac..13474a003 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -2538,7 +2538,6 @@ a.account__display-name { padding: 40px; .logo { - fill: $primary-text-color; width: 50px; margin: 0 auto; margin-bottom: 40px; diff --git a/app/javascript/styles/mastodon/containers.scss b/app/javascript/styles/mastodon/containers.scss index 81459f5ba..23dbece6b 100644 --- a/app/javascript/styles/mastodon/containers.scss +++ b/app/javascript/styles/mastodon/containers.scss @@ -20,8 +20,7 @@ justify-content: center; align-items: center; - svg { - fill: $primary-text-color; + .logo { height: 42px; margin-right: 10px; } @@ -320,7 +319,7 @@ display: block; padding: 15px; - svg { + .logo { display: block; height: 18px; width: auto; diff --git a/app/javascript/styles/mastodon/footer.scss b/app/javascript/styles/mastodon/footer.scss index 073ebda7e..0c3e42033 100644 --- a/app/javascript/styles/mastodon/footer.scss +++ b/app/javascript/styles/mastodon/footer.scss @@ -132,19 +132,19 @@ } .brand { - svg { + .logo { display: block; height: 36px; width: auto; margin: 0 auto; - fill: lighten($ui-base-color, 34%); + color: lighten($ui-base-color, 34%); } &:hover, &:focus, &:active { - svg { - fill: lighten($ui-base-color, 38%); + .logo { + color: lighten($ui-base-color, 38%); } } } diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss index 47d7e6f87..544f33ebf 100644 --- a/app/javascript/styles/mastodon/variables.scss +++ b/app/javascript/styles/mastodon/variables.scss @@ -12,7 +12,7 @@ $red-bookmark: $warning-red; $classic-base-color: #282c37; // Midnight Express $classic-primary-color: #9baec8; // Echo Blue $classic-secondary-color: #d9e1e8; // Pattens Blue -$classic-highlight-color: #2b90d9; // Summer Sky +$classic-highlight-color: #6364ff; // Brand purple // Variables for defaults in UI $base-shadow-color: $black !default; -- cgit