logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 25cbb8454c691f84c51a99a5d1b221da61ec5cda
parent: 416c9675fc20be41ea4bbc915cf14c84170d5fe5
Author: Lindsey Bieda <LindseyB@users.noreply.github.com>
Date:   Wed, 26 Apr 2017 09:45:27 -0400

Red favicon for dev (#2470)

* Set a dev specific favicon

* Consistent spacing

* Add trailing slash for consistency

* Update to remove interpolation

Diffstat:

Mapp/helpers/application_helper.rb5+++++
Mapp/views/layouts/application.html.haml1+
Apublic/favicon-dev.ico0
3 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb @@ -13,4 +13,9 @@ module ApplicationHelper other_classes = "#{other_classes} rtl" if [:ar, :fa].include?(I18n.locale) other_classes end + + def favicon_path + env_suffix = Rails.env.production? ? '' : '-dev' + asset_path "favicon#{env_suffix}.ico" + end end diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml @@ -5,6 +5,7 @@ %meta{:name => 'viewport', :content => 'width=device-width, initial-scale=1'}/ %meta{'http-equiv' => 'X-UA-Compatible', :content => 'IE=edge'}/ + %link{:rel => "icon", :href => favicon_path, :type => "image/x-icon"}/ %link{:rel => "apple-touch-icon", :sizes => "180x180", :href => "/apple-touch-icon.png"}/ %link{:rel => "mask-icon", :href => "/mask-icon.svg", :color => "#2B90D9"}/ %link{:rel => "manifest", :href => "/manifest.json"}/ diff --git a/public/favicon-dev.ico b/public/favicon-dev.ico Binary files differ.