Merge pull request #224 from blinry/voctocat

Replace TV logo with voctocat
voc · Mar 6, 2017 · 05301d6 · 05301d6
2 parents 3de3bb5 + c5ff6dd
commit 05301d6
Show file tree

Hide file tree

Showing 19 changed files with 109 additions and 16 deletions.
diff --git a/app/assets/images/frontend/tv.png b/app/assets/images/frontend/tv.png
diff --git a/app/assets/images/frontend/voctocat.svg b/app/assets/images/frontend/voctocat.svg
diff --git a/app/assets/stylesheets/frontend/base/_navbar.scss b/app/assets/stylesheets/frontend/base/_navbar.scss
@@ -19,6 +19,11 @@
   .navbar-brand {
     font-size: 24px;
     padding: 12px 15px;
+    img {
+      width: 27px;
+      height: 27px;
+      vertical-align: text-bottom;
+    }
   }
 
   .btn.btn-default {

diff --git a/app/controllers/frontend/news_controller.rb b/app/controllers/frontend/news_controller.rb
@@ -8,7 +8,7 @@ def index
           title: I18n.t('custom.news_title'),
           feed_url: news_url,
           icon: File.join(Settings.frontend_url, 'favicon.ico'),
-          logo: view_context.image_url('frontend/tv.png')
+          logo: view_context.image_url('frontend/voctocat.svg')
         })
       respond_to do |format|
         format.xml { render xml: atom_feed }

diff --git a/app/views/frontend/shared/_navbar.haml b/app/views/frontend/shared/_navbar.haml
@@ -3,7 +3,7 @@
     .navbar-header
       %a.navbar-brand(href='/')
         %span
-          %img{src: image_path('frontend/tv.png'), alt: 'media.ccc.de logo, a tv displaying a play icon'}
+          %img{src: image_path('frontend/voctocat.svg'), alt: 'media.ccc.de logo, a lucky cat holding a play icon'}
           media.ccc.de
 
     .nav.navbar-form.navbar-right.button-wrapper

diff --git a/public/apple-touch-icon-57x57.png b/public/apple-touch-icon-57x57.png
diff --git a/public/apple-touch-icon-60x60.png b/public/apple-touch-icon-60x60.png
diff --git a/public/apple-touch-icon-72x72.png b/public/apple-touch-icon-72x72.png
diff --git a/public/apple-touch-icon-76x76.png b/public/apple-touch-icon-76x76.png
diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png
diff --git a/public/favicon-196x196.png b/public/favicon-196x196.png
diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png
diff --git a/public/favicon-96x96.png b/public/favicon-96x96.png
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/vendor/assets/mediaelement/bigplay.fw.png b/vendor/assets/mediaelement/bigplay.fw.png
diff --git a/vendor/assets/mediaelement/bigplay.png b/vendor/assets/mediaelement/bigplay.png
diff --git a/vendor/assets/mediaelement/bigplay.svg b/vendor/assets/mediaelement/bigplay.svg