diff --git a/Gemfile b/Gemfile index b776665..7d97959 100644 --- a/Gemfile +++ b/Gemfile @@ -34,4 +34,5 @@ end group :development do gem 'web-console', '~> 2.0' + gem 'rails_real_favicon' end diff --git a/Gemfile.lock b/Gemfile.lock index 9c36210..9615dda 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,6 +50,8 @@ GEM byebug (9.0.5) concurrent-ruby (1.0.2) debug_inspector (0.0.2) + domain_name (0.5.20160826) + unf (>= 0.0.5, < 1.0.0) erubis (2.7.0) execjs (2.7.0) faraday (0.9.2) @@ -61,6 +63,8 @@ GEM haml (4.0.7) tilt hashie (3.4.4) + http-cookie (1.0.3) + domain_name (~> 0.5) i18n (0.7.0) jbuilder (2.6.0) activesupport (>= 3.0.0, < 5.1) @@ -85,6 +89,7 @@ GEM multi_json (1.12.1) multi_xml (0.5.5) multipart-post (2.0.0) + netrc (0.11.0) newrelic_rpm (3.16.2.321) nokogiri (1.6.8) mini_portile2 (~> 2.1.0) @@ -135,6 +140,11 @@ GEM rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging + rails_real_favicon (0.0.5) + json (~> 1.7) + rails (>= 3.1) + rest-client (~> 2.0) + rubyzip (~> 1) rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) railties (4.2.6) @@ -145,8 +155,13 @@ GEM rake (11.3.0) rdoc (4.2.2) json (~> 1.4) + rest-client (2.0.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) rollbar (2.13.2) multi_json + rubyzip (1.2.0) sass (3.4.22) sass-rails (5.0.6) railties (>= 4.0.0, < 6) @@ -172,6 +187,9 @@ GEM thread_safe (~> 0.1) uglifier (3.0.2) execjs (>= 0.3.0, < 3) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.2) web-console (2.3.0) activemodel (>= 4.0) binding_of_caller (>= 0.7.2) @@ -197,6 +215,7 @@ DEPENDENCIES puma rails (= 4.2.6) rails_12factor + rails_real_favicon rollbar sass-rails (~> 5.0) sdoc (~> 0.4.0) @@ -208,4 +227,4 @@ RUBY VERSION ruby 2.3.1p112 BUNDLED WITH - 1.12.5 + 1.13.5 diff --git a/app/assets/images/favicon/android-chrome-192x192.png b/app/assets/images/favicon/android-chrome-192x192.png new file mode 100644 index 0000000..efcb44c Binary files /dev/null and b/app/assets/images/favicon/android-chrome-192x192.png differ diff --git a/app/assets/images/favicon/android-chrome-512x512.png b/app/assets/images/favicon/android-chrome-512x512.png new file mode 100644 index 0000000..6a19b48 Binary files /dev/null and b/app/assets/images/favicon/android-chrome-512x512.png differ diff --git a/app/assets/images/favicon/apple-touch-icon.png b/app/assets/images/favicon/apple-touch-icon.png new file mode 100644 index 0000000..f1a3c46 Binary files /dev/null and b/app/assets/images/favicon/apple-touch-icon.png differ diff --git a/app/assets/images/favicon/browserconfig.xml.erb b/app/assets/images/favicon/browserconfig.xml.erb new file mode 100644 index 0000000..687250e --- /dev/null +++ b/app/assets/images/favicon/browserconfig.xml.erb @@ -0,0 +1,9 @@ + + + + + + #2b5797 + + + diff --git a/app/assets/images/favicon/favicon-16x16.png b/app/assets/images/favicon/favicon-16x16.png new file mode 100644 index 0000000..b052412 Binary files /dev/null and b/app/assets/images/favicon/favicon-16x16.png differ diff --git a/app/assets/images/favicon/favicon-32x32.png b/app/assets/images/favicon/favicon-32x32.png new file mode 100644 index 0000000..f3a0f1f Binary files /dev/null and b/app/assets/images/favicon/favicon-32x32.png differ diff --git a/app/assets/images/favicon/favicon.ico b/app/assets/images/favicon/favicon.ico new file mode 100644 index 0000000..106c8a3 Binary files /dev/null and b/app/assets/images/favicon/favicon.ico differ diff --git a/app/assets/images/favicon/manifest.json.erb b/app/assets/images/favicon/manifest.json.erb new file mode 100644 index 0000000..a7648ad --- /dev/null +++ b/app/assets/images/favicon/manifest.json.erb @@ -0,0 +1,17 @@ +{ + "name": "Pittco", + "icons": [ + { + "src": "<%= asset_path 'favicon/android-chrome-192x192.png' %>", + "sizes": "192x192", + "type": "image\/png" + }, + { + "src": "<%= asset_path 'favicon/android-chrome-512x512.png' %>", + "sizes": "512x512", + "type": "image\/png" + } + ], + "theme_color": "#606db2", + "display": "standalone" +} diff --git a/app/assets/images/favicon/mstile-150x150.png b/app/assets/images/favicon/mstile-150x150.png new file mode 100644 index 0000000..930b5c3 Binary files /dev/null and b/app/assets/images/favicon/mstile-150x150.png differ diff --git a/app/assets/images/favicon/safari-pinned-tab.svg b/app/assets/images/favicon/safari-pinned-tab.svg new file mode 100644 index 0000000..463a57a --- /dev/null +++ b/app/assets/images/favicon/safari-pinned-tab.svg @@ -0,0 +1,50 @@ + + + + +Created by potrace 1.11, written by Peter Selinger 2001-2013 + + + + + diff --git a/app/views/application/_favicon.html.erb b/app/views/application/_favicon.html.erb new file mode 100644 index 0000000..d0460f5 --- /dev/null +++ b/app/views/application/_favicon.html.erb @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 76ab348..6abdb19 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -14,6 +14,7 @@ = stylesheet_link_tag "application" = javascript_include_tag "application" = csrf_meta_tags + = render "favicon" %body = render "nav" diff --git a/config/favicon.json b/config/favicon.json new file mode 100644 index 0000000..fc1d026 --- /dev/null +++ b/config/favicon.json @@ -0,0 +1,58 @@ + +{ + "master_picture": "app/assets/images/pittco-icon.png", + "favicon_design": { + "ios": { + "picture_aspect": "background_and_margin", + "background_color": "#606db2", + "margin": "14%", + "assets": { + "ios6_and_prior_icons": false, + "ios7_and_later_icons": false, + "precomposed_icons": false, + "declare_only_default_icon": true + } + }, + "desktop_browser": [ + + ], + "windows": { + "picture_aspect": "no_change", + "background_color": "#2b5797", + "on_conflict": "override", + "assets": { + "windows_80_ie_10_tile": false, + "windows_10_ie_11_edge_tiles": { + "small": false, + "medium": true, + "big": false, + "rectangle": false + } + } + }, + "android_chrome": { + "picture_aspect": "no_change", + "theme_color": "#606db2", + "manifest": { + "name": "Pittco", + "display": "standalone", + "orientation": "not_set", + "on_conflict": "override", + "declared": true + }, + "assets": { + "legacy_icon": false, + "low_resolution_icons": false + } + }, + "safari_pinned_tab": { + "picture_aspect": "silhouette", + "theme_color": "#606db2" + } + }, + "settings": { + "compression": 5, + "scaling_algorithm": "Lanczos", + "error_on_image_too_small": false + } +} diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index e69de29..0000000