Merge pull request #5196 from opf/fix/24459-update-favicon-to-new-color

[24459] Update Favicon to new color
pull/5198/head
Oliver Günther 8 years ago committed by GitHub
commit 9d7c739bb9
  1. BIN
      app/assets/images/apple-touch-icon-120x120-precomposed.png
  2. BIN
      app/assets/images/apple-touch-icon-120x120.png
  3. BIN
      app/assets/images/favicon.ico
  4. 2
      app/views/common/_favicons.html.erb
  5. 4
      spec/views/layouts/base.html.erb_spec.rb

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 15 KiB

@ -1,6 +1,6 @@
<%= favicon_link_tag 'favicon.ico' %>
<%# In the future we can add more sizes should we see 404 errors in the logs. %>
<%= favicon_link_tag "apple-touch-icon-120x120-precomposed.png", rel: 'apple-touch-icon',
<%= favicon_link_tag "apple-touch-icon-120x120.png", rel: 'apple-touch-icon',
type: 'image/png',
sizes: "120x120" %>

@ -149,7 +149,7 @@ describe 'layouts/base', type: :view do
it 'renders apple icons' do
expect(rendered).to have_selector(
"link[type='image/png'][href='/assets/apple-touch-icon-120x120-precomposed.png']",
"link[type='image/png'][href='/assets/apple-touch-icon-120x120.png']",
visible: false
)
end
@ -165,7 +165,7 @@ describe 'layouts/base', type: :view do
visit 'assets/favicon.ico'
expect(page.status_code).to eq(200)
visit 'apple-touch-icon-120x120-precomposed.png'
visit 'apple-touch-icon-120x120.png'
expect(page.status_code).to eq(200)
end
end

Loading…
Cancel
Save