Get Mozilla favicons from favicons folder (#7915)

- move existing favicons into img/favicons/mozilla
- update symlinks in root
- update template references

bedrock/base/templates/base-pebbles.html

@@ -42,9 +42,9 @@
     <meta name="twitter:app:id:iphone" content="{% block iphone_app_id %}989804926{% endblock %}">
     <meta name="twitter:app:name:ipad" content="{% block ipad_app_name %}{{ _('Firefox') }}{% endblock %}">
     <meta name="twitter:app:id:ipad" content="{% block ipad_app_id %}989804926{% endblock %}">
-    <link rel="apple-touch-icon" type="image/png" sizes="180x180" href="{% block page_ios_icon %}{{ static('img/favicon/apple-touch-icon-180x180.png') }}{% endblock %}">
-    <link rel="icon" type="image/png" sizes="196x196" href="{% block page_favicon_large %}{{ static('img/favicon/favicon-196x196.png') }}{% endblock %}">
-    <link rel="shortcut icon" href="{% block page_favicon %}{{ static('img/favicon.ico') }}{% endblock %}">
+    <link rel="apple-touch-icon" type="image/png" sizes="180x180" href="{% block page_ios_icon %}{{ static('img/favicons/mozilla/apple-touch-icon.png') }}{% endblock %}">
+    <link rel="icon" type="image/png" sizes="196x196" href="{% block page_favicon_large %}{{ static('img/favicons/mozilla/favicon-196x196.png') }}{% endblock %}">
+    <link rel="shortcut icon" href="{% block page_favicon %}{{ static('img/favicons/mozilla/favicon.ico') }}{% endblock %}">
     {% block canonical_urls %}{% include 'includes/canonical-url.html' %}{% endblock %}
     {% endblock shared_meta %}
 

bedrock/base/templates/base-resp.html

@@ -42,9 +42,9 @@
     <meta name="twitter:app:id:iphone" content="{% block iphone_app_id %}989804926{% endblock %}">
     <meta name="twitter:app:name:ipad" content="{% block ipad_app_name %}{{ _('Firefox') }}{% endblock %}">
     <meta name="twitter:app:id:ipad" content="{% block ipad_app_id %}989804926{% endblock %}">
-    <link rel="apple-touch-icon" type="image/png" sizes="180x180" href="{% block page_ios_icon %}{{ static('img/favicon/apple-touch-icon-180x180.png') }}{% endblock %}">
-    <link rel="icon" type="image/png" sizes="196x196" href="{% block page_favicon_large %}{{ static('img/favicon/favicon-196x196.png') }}{% endblock %}">
-    <link rel="shortcut icon" href="{% block page_favicon %}{{ static('img/favicon.ico') }}{% endblock %}">
+    <link rel="apple-touch-icon" type="image/png" sizes="180x180" href="{% block page_ios_icon %}{{ static('img/favicons/mozilla/apple-touch-icon.png') }}{% endblock %}">
+    <link rel="icon" type="image/png" sizes="196x196" href="{% block page_favicon_large %}{{ static('img/favicons/mozilla/favicon-196x196.png') }}{% endblock %}">
+    <link rel="shortcut icon" href="{% block page_favicon %}{{ static('img/favicons/mozilla/favicon.ico') }}{% endblock %}">
     {% block canonical_urls %}{% include 'includes/canonical-url.html' %}{% endblock %}
     {% endblock shared_meta %}
 

bedrock/mozorg/templates/mozorg/contribute/contribute-embed.html

@@ -18,7 +18,7 @@
 
     {{ css_bundle('responsive') }}
     {{ css_bundle('contribute-embed') }}
-    <link rel="shortcut icon" href="{{ static('img/favicon.ico') }}">
+    <link rel="shortcut icon" href="{{ static('img/favicons/mozilla/favicon.ico') }}">
     {{ js_bundle('site') }}
 
     {% include 'includes/google-analytics.html' %}

media/css/firefox/features/index.scss

@@ -309,7 +309,7 @@
         }
 
         &.mozilla h3:before {
-            background-image: url('/media/img/favicon/favicon-196x196.png');
+            background-image: url('/media/img/favicons/mozilla/favicon-196x196.png');
             background-size: 35px;
         }
 

media/css/firefox/whatsnew/header.scss

@@ -41,7 +41,7 @@
 
         a {
             @include image-replaced;
-            background: url('/media/img/favicon/favicon-196x196.png') top left no-repeat;
+            background: url('/media/img/favicons/mozilla/favicon-196x196.png') top left no-repeat;
             background-size: 25px 25px;
             display: block;
             height: 25px;

root_files/favicon.ico

@@ -1 +1 @@
-../media/img/favicon.ico
+../media/img/favicons/mozilla/favicon.ico

root_files/favicon.png

@@ -1 +1 @@
-../media/img/favicon.png
+../media/img/favicons/mozilla/apple-touch-icon.png