From 0e0f18ce7c9796b25efa415436fe662f3f65bd25 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 23 Jul 2017 02:40:39 +0200 Subject: New logo (#4306) * Add new logo * Remove unused images --- app/javascript/images/background-photo.jpg | Bin 264344 -> 0 bytes app/javascript/images/boost_sprite.png | Bin 1326 -> 0 bytes app/javascript/images/fluffy-elephant-friend.png | Bin 60667 -> 0 bytes app/javascript/images/logo.png | Bin 7752 -> 0 bytes app/javascript/images/logo.svg | 2 +- app/javascript/images/logo_alt.svg | 1 + app/javascript/images/logo_full.svg | 1 + app/javascript/images/mastodon.jpg | Bin 133743 -> 0 bytes app/javascript/styles/about.scss | 9 ++++++++- app/javascript/styles/containers.scss | 3 +-- app/views/about/show.html.haml | 3 +-- app/views/layouts/admin.html.haml | 2 +- app/views/layouts/auth.html.haml | 3 +-- public/android-chrome-192x192.png | Bin 14344 -> 6702 bytes public/apple-touch-icon.png | Bin 4217 -> 6977 bytes public/badge.png | Bin 31156 -> 5579 bytes public/browserconfig.xml | 2 +- public/favicon-dev.ico | Bin 9854 -> 1631 bytes public/favicon.ico | Bin 927 -> 1410 bytes public/mask-icon.svg | 2 +- public/mstile-150x150.png | Bin 6916 -> 5796 bytes 21 files changed, 17 insertions(+), 11 deletions(-) delete mode 100644 app/javascript/images/background-photo.jpg delete mode 100644 app/javascript/images/boost_sprite.png delete mode 100644 app/javascript/images/fluffy-elephant-friend.png delete mode 100644 app/javascript/images/logo.png create mode 100644 app/javascript/images/logo_alt.svg create mode 100644 app/javascript/images/logo_full.svg delete mode 100644 app/javascript/images/mastodon.jpg diff --git a/app/javascript/images/background-photo.jpg b/app/javascript/images/background-photo.jpg deleted file mode 100644 index 03341b8ec..000000000 Binary files a/app/javascript/images/background-photo.jpg and /dev/null differ diff --git a/app/javascript/images/boost_sprite.png b/app/javascript/images/boost_sprite.png deleted file mode 100644 index 564bf2646..000000000 Binary files a/app/javascript/images/boost_sprite.png and /dev/null differ diff --git a/app/javascript/images/fluffy-elephant-friend.png b/app/javascript/images/fluffy-elephant-friend.png deleted file mode 100644 index f0df29927..000000000 Binary files a/app/javascript/images/fluffy-elephant-friend.png and /dev/null differ diff --git a/app/javascript/images/logo.png b/app/javascript/images/logo.png deleted file mode 100644 index f0c1c46c3..000000000 Binary files a/app/javascript/images/logo.png and /dev/null differ diff --git a/app/javascript/images/logo.svg b/app/javascript/images/logo.svg index 16cb3a944..4b72b3ac8 100644 --- a/app/javascript/images/logo.svg +++ b/app/javascript/images/logo.svg @@ -1 +1 @@ - + diff --git a/app/javascript/images/logo_alt.svg b/app/javascript/images/logo_alt.svg new file mode 100644 index 000000000..e88ca7418 --- /dev/null +++ b/app/javascript/images/logo_alt.svg @@ -0,0 +1 @@ + diff --git a/app/javascript/images/logo_full.svg b/app/javascript/images/logo_full.svg new file mode 100644 index 000000000..8b1328e8c --- /dev/null +++ b/app/javascript/images/logo_full.svg @@ -0,0 +1 @@ + diff --git a/app/javascript/images/mastodon.jpg b/app/javascript/images/mastodon.jpg deleted file mode 100644 index 2dfeb879f..000000000 Binary files a/app/javascript/images/mastodon.jpg and /dev/null differ diff --git a/app/javascript/styles/about.scss b/app/javascript/styles/about.scss index b94f61144..a2642ee9f 100644 --- a/app/javascript/styles/about.scss +++ b/app/javascript/styles/about.scss @@ -505,12 +505,19 @@ a { padding-left: 0; color: $white; + + &:hover img { + opacity: 1; + } } img { - width: 32px; height: 32px; margin-right: 10px; + position: relative; + top: 4px; + left: -10px; + opacity: 0.8; } } } diff --git a/app/javascript/styles/containers.scss b/app/javascript/styles/containers.scss index 44d4c1118..7dcf2c006 100644 --- a/app/javascript/styles/containers.scss +++ b/app/javascript/styles/containers.scss @@ -23,8 +23,7 @@ align-items: center; img { - width: 32px; - height: 32px; + height: 42px; margin-right: 10px; } diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml index 999d1e37b..a3c8e4a84 100644 --- a/app/views/about/show.html.haml +++ b/app/views/about/show.html.haml @@ -24,8 +24,7 @@ .container.links .brand = link_to root_url do - = image_tag asset_pack_path('logo.svg'), alt: '', role: 'presentation' - Mastodon + = image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon' %ul.nav %li diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml index 59d95a0c6..c98d85f7b 100644 --- a/app/views/layouts/admin.html.haml +++ b/app/views/layouts/admin.html.haml @@ -6,7 +6,7 @@ .sidebar-wrapper .sidebar = link_to root_path do - = image_tag asset_pack_path('logo.png'), class: 'logo' + = image_tag asset_pack_path('logo.svg'), class: 'logo', alt: 'Mastodon' = render_navigation .content-wrapper diff --git a/app/views/layouts/auth.html.haml b/app/views/layouts/auth.html.haml index b4f1bd0f3..d8ac733f9 100644 --- a/app/views/layouts/auth.html.haml +++ b/app/views/layouts/auth.html.haml @@ -6,8 +6,7 @@ .logo-container %h1 = link_to root_path do - = image_tag asset_pack_path('logo.svg') - Mastodon + = image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon' .form-container = render 'flashes' diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png index 3a475f61f..0b4eb9fdf 100644 Binary files a/public/android-chrome-192x192.png and b/public/android-chrome-192x192.png differ diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png index b05996b37..829263f83 100644 Binary files a/public/apple-touch-icon.png and b/public/apple-touch-icon.png differ diff --git a/public/badge.png b/public/badge.png index fc1f42dca..a1f2f8b08 100644 Binary files a/public/badge.png and b/public/badge.png differ diff --git a/public/browserconfig.xml b/public/browserconfig.xml index 29c6ff581..7fdab5058 100644 --- a/public/browserconfig.xml +++ b/public/browserconfig.xml @@ -3,7 +3,7 @@ - #2b5797 + #282c37 diff --git a/public/favicon-dev.ico b/public/favicon-dev.ico index 5f725d587..04c503c07 100644 Binary files a/public/favicon-dev.ico and b/public/favicon-dev.ico differ diff --git a/public/favicon.ico b/public/favicon.ico index 3673ac0d5..70f2fec12 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/mask-icon.svg b/public/mask-icon.svg index c35230117..f91ff5067 100644 --- a/public/mask-icon.svg +++ b/public/mask-icon.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png index 57eae8355..e8e289eaa 100644 Binary files a/public/mstile-150x150.png and b/public/mstile-150x150.png differ -- cgit