From 72c29d2c11293361d150c81bd41fee7e7235cbd7 Mon Sep 17 00:00:00 2001 From: Michael Krotscheck Date: Thu, 24 Apr 2014 10:58:44 -0700 Subject: [PATCH] Favicon Whitelabel This change allows us to whitelabel the favicon in the browser. Much like the simple-whitelabel patch already landed, this makes use of array ordering and file resolution to determine which favicon 'wins'. In this case, both icons are copied, however if the custom font icon actually exists, it will override storyboard's default icon. Change-Id: Ic412a920d034b965ced25a7b63a51f82c4447a3d --- .gitignore | 3 ++- Gruntfile.js | 10 +++++++++- src/{ => theme/storyboard}/favicon.ico | Bin 3 files changed, 11 insertions(+), 2 deletions(-) rename src/{ => theme/storyboard}/favicon.ico (100%) diff --git a/.gitignore b/.gitignore index d42394fd..121e8137 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ npm-debug.log reports cover .tox -src/theme/custom/**.less \ No newline at end of file +src/theme/custom/**.less +src/theme/custom/**.ico \ No newline at end of file diff --git a/Gruntfile.js b/Gruntfile.js index 33818923..aa3cd4e6 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -213,7 +213,7 @@ module.exports = function (grunt) { cwd: dir.source, dest: dir.output, src: [ - '**/*.{ico,txt,eot,ttf,woff}', + '**/*.{txt,eot,ttf,woff}', '*.html', 'robots.txt' ] @@ -226,6 +226,14 @@ module.exports = function (grunt) { src: [ 'fonts/*.*' ] + }, + { + src: dir.theme + '/storyboard/favicon.ico', + dest: dir.output + '/favicon.ico' + }, + { + src: dir.theme + '/custom/favicon.ico', + dest: dir.output + '/favicon.ico' } ] } diff --git a/src/favicon.ico b/src/theme/storyboard/favicon.ico similarity index 100% rename from src/favicon.ico rename to src/theme/storyboard/favicon.ico