aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-12-10 16:33:46 +0000
committerLouise Crow <louise.crow@gmail.com>2013-12-10 16:33:46 +0000
commit9cac4f2387416b5da77a4d5bbe7e21f937cf9129 (patch)
tree6a48bbd7d94e64e4e6fd369438b406f7d22a6d19
parentda94fee2c7dc3d689359da0321e028722d3187bc (diff)
Small fixes for favicon.ico
-rw-r--r--app/assets/images/favicon.ico (renamed from public/favicon.ico)bin22382 -> 22382 bytes
-rw-r--r--config/deploy.rb1
-rw-r--r--doc/THEME-ASSETS-UPGRADE.md2
3 files changed, 2 insertions, 1 deletions
diff --git a/public/favicon.ico b/app/assets/images/favicon.ico
index 26127495c..26127495c 100644
--- a/public/favicon.ico
+++ b/app/assets/images/favicon.ico
Binary files differ
diff --git a/config/deploy.rb b/config/deploy.rb
index a0189c855..3a4f175b4 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -55,7 +55,6 @@ namespace :deploy do
"#{release_path}/config/aliases" => "#{shared_path}/aliases",
"#{release_path}/public/foi-live-creation.png" => "#{shared_path}/foi-live-creation.png",
"#{release_path}/public/foi-user-use.png" => "#{shared_path}/foi-user-use.png",
- "#{release_path}/public/favicon.ico" => "#{shared_path}/favicon.ico",
"#{release_path}/files" => "#{shared_path}/files",
"#{release_path}/cache" => "#{shared_path}/cache",
"#{release_path}/lib/acts_as_xapian/xapiandbs" => "#{shared_path}/xapiandbs",
diff --git a/doc/THEME-ASSETS-UPGRADE.md b/doc/THEME-ASSETS-UPGRADE.md
index 2c6e49986..12c1a60d1 100644
--- a/doc/THEME-ASSETS-UPGRADE.md
+++ b/doc/THEME-ASSETS-UPGRADE.md
@@ -33,6 +33,8 @@ tag to use `image_tag` instead. For example, instead of:
image_tag('helpmeinvestigate.png', :alt => "", :class => "rss")
+If you have a favicon.ico file in your theme's `public` directory, you should move it to `assets/images` as well.
+
You should similarly move your stylesheets into
`assets/stylesheets`. If a stylesheet refers to images, you
should rename the `.css` file to `.css.scss`, and change `url`