New logo (#4306)

* Add new logo * Remove unused images
mastodon · Jul 23, 2017 · 0e0f18c · 0e0f18c
1 parent 7964bfc
commit 0e0f18c
Show file tree

Hide file tree

Showing 21 changed files with 17 additions and 11 deletions.
diff --git a/app/javascript/images/background-photo.jpg b/app/javascript/images/background-photo.jpg
diff --git a/app/javascript/images/boost_sprite.png b/app/javascript/images/boost_sprite.png
diff --git a/app/javascript/images/fluffy-elephant-friend.png b/app/javascript/images/fluffy-elephant-friend.png
diff --git a/app/javascript/images/logo.png b/app/javascript/images/logo.png
diff --git a/app/javascript/images/logo.svg b/app/javascript/images/logo.svg
diff --git a/app/javascript/images/logo_alt.svg b/app/javascript/images/logo_alt.svg
diff --git a/app/javascript/images/logo_full.svg b/app/javascript/images/logo_full.svg
diff --git a/app/javascript/images/mastodon.jpg b/app/javascript/images/mastodon.jpg
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
diff --git a/public/badge.png b/public/badge.png
diff --git a/public/browserconfig.xml b/public/browserconfig.xml
@@ -3,7 +3,7 @@
   <msapplication>
     <tile>
       <square150x150logo src="/mstile-150x150.png"/>
-      <TileColor>#2b5797</TileColor>
+      <TileColor>#282c37</TileColor>
     </tile>
   </msapplication>
 </browserconfig>
diff --git a/public/favicon-dev.ico b/public/favicon-dev.ico
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/mask-icon.svg b/public/mask-icon.svg
diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png