Precompiling images and fonts, moving favicon out of the asset pipeline

12 years ago · 9d639d1579
parent d892149c33
commit 9d639d1579
6 changed files with 6 additions and 6 deletions
--- a/app/views/admin/tables/embed_map.html.erb
+++ b/app/views/admin/tables/embed_map.html.erb
@ -3,7 +3,7 @@
  <head>
    <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
  	<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
-  	<link rel="shortcut icon" href="https://cartodb.com/assets/favicon.ico" />
+  	<link rel="shortcut icon" href="https://cartodb.com/favicon.ico" />
    <title>CartoDB - <%= @table.name %> </title>

    <style type="text/css">
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@ -3,7 +3,7 @@
  <head>
    <meta charset='utf-8' />
    <title><%= yield :page_title %>CartoDB</title>
-    <link id="favicon" rel="shortcut icon" href="<%= asset_path "favicon.ico" %>" />
+    <link id="favicon" rel="shortcut icon" href="/favicon.ico" />
    <%= yield :css %>
    <%= yield :js %>
    <%= csrf_meta_tag %>
--- a/app/views/layouts/application_public.html.erb
+++ b/app/views/layouts/application_public.html.erb
@ -3,7 +3,7 @@
  <head>
    <meta charset='utf-8' />
    <title><%= yield :page_title %>CartoDB</title>
-    <link id="favicon" rel="shortcut icon" href="<%= asset_path "favicon.ico" %>" />
+    <link id="favicon" rel="shortcut icon" href="/favicon.ico" />
    <%= yield :css %>
    <%= yield :js %>
    <%= csrf_meta_tag %>
--- a/app/views/layouts/developers.html.erb
+++ b/app/views/layouts/developers.html.erb
@ -3,7 +3,7 @@
  <head>
    <meta charset='utf-8' />
    <title>CartoDB - Documentation</title>
-    <link rel="shortcut icon" href="/favicon/favicon.ico" />
+    <link rel="shortcut icon" href="/favicon.ico" />
    <link href="/stylesheets/reset.css" media="screen" rel="stylesheet" type="text/css" />
    <link href="/stylesheets/admin/others/layout_dev.css" media="screen" rel="stylesheet" type="text/css" />
    <% if env['PATH_INFO'] == '/' || env['PATH_INFO'].blank? %>
--- a/app/views/layouts/front_layout.html.erb
+++ b/app/views/layouts/front_layout.html.erb
@ -8,7 +8,7 @@
    <meta charset="utf-8">
    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
    <title>CartoDB | Login</title>
-    <link rel="shortcut icon" href="<%= asset_path "favicon.ico" %>" />
+    <link rel="shortcut icon" href="/favicon.ico" />
    <%= stylesheet_link_tag :common, :front, :media => 'all' %>
    <%= yield :js %>
    <%= render 'shared/analytics'%>
--- a/config/application.rb
+++ b/config/application.rb
@ -49,7 +49,7 @@ module CartoDB
    config.assets.enabled = true

    # Default setting is [/\w+\.(?!js|css).+/, /application.(css|js)$/]
-    config.assets.precompile = %w( *.js *.css )
+    config.assets.precompile = %w( *.js *.css *.jpg *.ico *.gif *.png *.eot *.otf *.svg *.woff *.ttf )

    # Version of your assets, change this if you want to expire all your assets
    config.assets.version = '1.0'