diff --git a/app/assets/images/frontend/tv.png b/app/assets/images/frontend/tv.png deleted file mode 100644 index e875917c..00000000 Binary files a/app/assets/images/frontend/tv.png and /dev/null differ diff --git a/app/assets/images/frontend/voctocat.svg b/app/assets/images/frontend/voctocat.svg new file mode 100644 index 00000000..af7682eb --- /dev/null +++ b/app/assets/images/frontend/voctocat.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/stylesheets/frontend/base/_navbar.scss b/app/assets/stylesheets/frontend/base/_navbar.scss index e7e240b8..c4801bb2 100644 --- 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 index a59a4e25..6d7a93be 100644 --- 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 index 81daa412..2691e392 100644 --- 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 index d8d71518..0f3f5e02 100644 Binary files a/public/apple-touch-icon-57x57.png and b/public/apple-touch-icon-57x57.png differ diff --git a/public/apple-touch-icon-60x60.png b/public/apple-touch-icon-60x60.png index 235b879a..1fe96d60 100644 Binary files a/public/apple-touch-icon-60x60.png and b/public/apple-touch-icon-60x60.png differ diff --git a/public/apple-touch-icon-72x72.png b/public/apple-touch-icon-72x72.png index 2aa2969b..f723b14b 100644 Binary files a/public/apple-touch-icon-72x72.png and b/public/apple-touch-icon-72x72.png differ diff --git a/public/apple-touch-icon-76x76.png b/public/apple-touch-icon-76x76.png index 95cee73a..94f28cb3 100644 Binary files a/public/apple-touch-icon-76x76.png and b/public/apple-touch-icon-76x76.png differ diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png index 605a37db..4bdc9465 100644 Binary files a/public/apple-touch-icon-precomposed.png and b/public/apple-touch-icon-precomposed.png differ diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png index 95cee73a..0be8748f 100644 Binary files a/public/apple-touch-icon.png and b/public/apple-touch-icon.png differ diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png index 2280e78a..4abbe72b 100644 Binary files a/public/favicon-16x16.png and b/public/favicon-16x16.png differ diff --git a/public/favicon-196x196.png b/public/favicon-196x196.png index 8eed3d7f..228e2736 100644 Binary files a/public/favicon-196x196.png and b/public/favicon-196x196.png differ diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png index 108e846b..06472206 100644 Binary files a/public/favicon-32x32.png and b/public/favicon-32x32.png differ diff --git a/public/favicon-96x96.png b/public/favicon-96x96.png index 70ba31b3..730e9e1c 100644 Binary files a/public/favicon-96x96.png and b/public/favicon-96x96.png differ diff --git a/public/favicon.ico b/public/favicon.ico index 6ce5da0d..1a68a7b7 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/vendor/assets/mediaelement/bigplay.fw.png b/vendor/assets/mediaelement/bigplay.fw.png index 66d0e3cb..9e76f718 100644 Binary files a/vendor/assets/mediaelement/bigplay.fw.png and b/vendor/assets/mediaelement/bigplay.fw.png differ diff --git a/vendor/assets/mediaelement/bigplay.png b/vendor/assets/mediaelement/bigplay.png index 694553e3..b6588f1d 100644 Binary files a/vendor/assets/mediaelement/bigplay.png and b/vendor/assets/mediaelement/bigplay.png differ diff --git a/vendor/assets/mediaelement/bigplay.svg b/vendor/assets/mediaelement/bigplay.svg index 2b781700..6e0e4b30 100644 --- a/vendor/assets/mediaelement/bigplay.svg +++ b/vendor/assets/mediaelement/bigplay.svg @@ -1,14 +1,101 @@ - - - - - - - - - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + +