Skip to content

Commit 66615ac

Browse files
dhhdhh
authored
Replace old placeholder icon variants with a single one (rails#50526)
* Replace old placeholder icon variants with a single one * Fix test
1 parent 0bf314c commit 66615ac

File tree

8 files changed

+8
-10
lines changed

8 files changed

+8
-10
lines changed

‎railties/lib/rails/generators/rails/app/app_generator.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -488,9 +488,7 @@ def delete_public_files_if_api_option
488488
remove_file "public/422.html"
489489
remove_file "public/426.html"
490490
remove_file "public/500.html"
491-
remove_file "public/apple-touch-icon-precomposed.png"
492-
remove_file "public/apple-touch-icon.png"
493-
remove_file "public/favicon.ico"
491+
remove_file "public/icon.png"
494492
end
495493
end
496494

‎railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
<%%= csp_meta_tag %>
88

99
<%%= yield :head %>
10-
<%- if options[:skip_hotwire] || options[:skip_javascript] -%>
1110

11+
<link rel="icon" href="/icon.png" type="image/png">
12+
<link rel="apple-touch-icon" href="/icon.png" sizes="512x512">
13+
<%- if options[:skip_hotwire] || options[:skip_javascript] -%>
1214
<%%= stylesheet_link_tag "application" %>
1315
<%- else -%>
14-
1516
<%%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
1617
<%- end -%>
1718
</head>

‎railties/lib/rails/generators/rails/app/templates/public/apple-touch-icon-precomposed.png

Whitespace-only changes.

‎railties/lib/rails/generators/rails/app/templates/public/apple-touch-icon.png

Whitespace-only changes.

‎railties/lib/rails/generators/rails/app/templates/public/favicon.ico

Whitespace-only changes.

‎railties/lib/rails/generators/rails/app/templates/public/icon.png

5.47 KB
Loading

‎railties/lib/rails/templates/rails/welcome/index.html.erb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
<% ruby_on_rails_logo_favicon_data_uri = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzIwcHgiIGhlaWdodD0iMzIwcHgiIHZpZXdCb3g9IjAgMCAzMjAgMzIwIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPHRpdGxlPkljb248L3RpdGxlPgogICAgPGcgaWQ9Ikljb24iIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSJSdWJ5LU9uLVJhaWxzLUxvZ28iIHRyYW5zZm9ybT0idHJhbnNsYXRlKDUuMDAwMDAwLCAyMC4wMDAwMDApIiBmaWxsPSIjRDgxRTAwIj4KICAgICAgICAgICAgPHBhdGggZD0iTTIxLjkzMzA3MDYsMjg1IEwxNjguMTc1NDI2LDI4NSBDMTQ3Ljk0MDg1OCwxNTAuNjkxNzA2IDE5Ni44ODIzODMsNjYuMzE0MjkwMiAzMTUsMzEuODY3NzUzNiBDMzE1LDIxLjc4NTEyODQgMzE1LDMxLjg2Nzc1MzYgMzE1LDIxLjc4NTEyODQgQzE2MS4yNTI4MywyNC45MTE2Mjc4IDYzLjU2Mzg1MzMsMTEyLjY0OTkxOCAyMS45MzMwNzA2LDI4NSBaIiBpZD0iUGF0aCIvPgogICAgICAgICAgICA8cG9seWdvbiBpZD0iUGF0aCIgcG9pbnRzPSI0MC40MDgyNjQzIDE4NS45MTU3MSAxMi43MzI2NDk0IDE3NC40MDE2NjMgLTEuNDIxMDg1NDdlLTE0IDIwNS40NDI3MSAyOS41NzExOTY2IDIxNi42NDcxMTUiLz4KICAgICAgICAgICAgPHBvbHlnb24gaWQ9IlBhdGgiIHBvaW50cz0iMTgwLjQ3MzEwMiAyNjguMDczNjQzIDIwNC45MzYwMTYgMjc2LjQxMDk2NiAyMDQuOTM2MDE2IDI1NC41MDg2NzMgMTgwLjQ4OTY0NCAyNDQuMzM4MTA3Ii8+CiAgICAgICAgICAgIDxwb2x5Z29uIGlkPSJQYXRoIiBwb2ludHM9IjEwMC41ODk1MTkgOTcuMjI4NzYwNiA3Ni42ODQwMTU2IDc5LjE2ODcwMjEgNTUuMjQ0MDc5MSAxMDAuMTgzMTA1IDgxLjUxNDMyMzkgMTE3LjQzMzcyNSIvPgogICAgICAgICAgICA8cG9seWdvbiBpZD0iUGF0aCIgcG9pbnRzPSIxODQuNTc1Njc5IDE4NC44OTYyOTUgMjA3Ljk1MjAzIDIwMC4yNDY2MSAyMTEuNzI3NzI5IDE4MS4yMDUyNjYgMTg5Ljg2MzY1MyAxNjQuNjg3NDYiLz4KICAgICAgICAgICAgPHBvbHlnb24gaWQ9IlBhdGgiIHBvaW50cz0iMjYxLjczNDAxIDY1Ljg5NTk0NDYgMjY5LjM1NDIzNCA4Mi4zMjk1NCAyODUuMzE4MjU2IDcyLjcwNDg1OTYgMjc4LjMxMDEyOSA1Ni45ODI5ODk1Ii8+CiAgICAgICAgICAgIDxwb2x5Z29uIGlkPSJQYXRoIiBwb2ludHM9IjI2MS45MTM3IDE2LjE4NDU0NzMgMjU1LjU5ODQ3OSA3LjEwNTQyNzM2ZS0xNSAyMzIuNzk2MDIgMy40ODg5NjMyMyAyNDAuNDYzODczIDIwLjAyNTI3MjUiLz4KICAgICAgICAgICAgPHBvbHlnb24gaWQ9IlBhdGgiIHBvaW50cz0iMjExLjkzNDExOSAxMTEuNTgwNjc1IDIyNi43MjI1NDcgMTI3Ljc5MjYwMSAyMzguMDIzOTI1IDExMy45MDM3MTUgMjIzLjQ2ODM3NSA5Ni41NDY4Njg1Ii8+CiAgICAgICAgICAgIDxwb2x5Z29uIGlkPSJQYXRoIiBwb2ludHM9IjE3OS42ODY4NTggMzguNDk1MjIxOCAxNjQuNjQxOTMxIDIwLjAyNTI3MjUgMTM5Ljg0NzYyIDMyLjU1NTI5OTIgMTU2LjYwMTMyNCA1MC45MjE2NzUzIi8+CiAgICAgICAgPC9nPgogICAgPC9nPgo8L3N2Zz4=" %>
21
<!DOCTYPE html>
32
<html>
43
<head>
54
<title>Ruby on Rails <%= Rails.version %></title>
65
<meta charset="utf-8">
76
<meta name="viewport" content="width=device-width">
8-
<link rel="icon" href="<%= ruby_on_rails_logo_favicon_data_uri %>" />
7+
8+
<link rel="icon" href="/icon.png" type="image/png">
9+
<link rel="apple-touch-icon" href="/icon.png" sizes="512x512">
910

1011
<style type="text/css">
1112
* {

‎railties/test/generators/api_app_generator_test.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,7 @@ def skipped_files
182182
public/422.html
183183
public/426.html
184184
public/500.html
185-
public/apple-touch-icon-precomposed.png
186-
public/apple-touch-icon.png
187-
public/favicon.ico
185+
public/icon.png
188186
)
189187
end
190188
end

0 commit comments

Comments
 (0)