Merge pull request #4401 from RCMainak/bug_1306824

Bug 1306824 - Consolidate /common Firefox assets in /template directory
mozilla · Oct 10, 2016 · dbf4c84 · dbf4c84
2 parents a17248b + 4252326
commit dbf4c84
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 6 deletions.
diff --git a/bedrock/firefox/templates/firefox/desktop/tips.html b/bedrock/firefox/templates/firefox/desktop/tips.html
@@ -36,7 +36,7 @@
   <div id="page-header">
     <div class="container">
       <div id="heading-logo-wrapper">
-        <img src="{{ static('img/firefox/common/firefox-logo.png') }}" alt="Firefox" id="page-header-logo">
+        <img src="{{ static('img/firefox/template/logo-large.png') }}" alt="Firefox" id="page-header-logo">
         <div class="heading-group">
           <h1>{{ _('The best of the latest Firefox') }}</h1>
           <h2>{{ _('5 top tips, tricks and time-saving tools') }}</h2>

diff --git a/bedrock/firefox/templates/firefox/mobile-download-desktop.html b/bedrock/firefox/templates/firefox/mobile-download-desktop.html
@@ -46,7 +46,7 @@
             <div id="tabzilla">
               <a href="{{ url('mozorg.home') }}" data-link-type="nav" data-link-name="tabzilla">Mozilla</a>
             </div>
-            <h2>{{ high_res_img('firefox/common/firefox-logo.png', {'alt': 'Firefox', 'width': '136', 'height': '142'}) }}</h2>
+            <h2>{{ high_res_img('firefox/template/logo-large.png', {'alt': 'Firefox', 'width': '136', 'height': '142'}) }}</h2>
           </header>
           <div class="main-content">
             <h1>

diff --git a/bedrock/firefox/templates/firefox/testflight.html b/bedrock/firefox/templates/firefox/testflight.html
@@ -28,7 +28,7 @@
 <section id="intro">
   <div class="container">
     {# No more new logos! #}
-    {{ high_res_img('firefox/common/firefox-logo.png', {'alt': 'Firefox for iOS', 'width': '136', 'height': '142', 'id': 'header-logo' }) }}
+    {{ high_res_img('firefox/template/logo-large.png', {'alt': 'Firefox for iOS', 'width': '136', 'height': '142', 'id': 'header-logo' }) }}
 
     <header id="intro-header">
       {# L10n: line break below for visual formatting only #}

diff --git a/media/css/firefox/desktop/tips.less b/media/css/firefox/desktop/tips.less
@@ -873,7 +873,7 @@ html[dir='rtl'] {
         top: auto;
         bottom: -228px;
         margin-left: -150px;
-        background: url(/media/img/firefox/common/firefox-logo-high-res.png) left top no-repeat;
+        background: url(/media/img/firefox/template/logo-large-high-res.png) left top no-repeat;
         background-size: 300px 312px;
         .animation(phoenix 2s ease 1.3s 1 normal forwards);
     }

diff --git a/media/css/mozorg/home/home.scss b/media/css/mozorg/home/home.scss
@@ -472,7 +472,7 @@ main {
         padding-top: 40px;
 
         &:before {
-            @include at2x('/media/img/firefox/common/firefox-logo.png');
+            @include at2x('/media/img/firefox/template/logo-large.png');
             @include background-size(100%);
             background-repeat: no-repeat;
             content: '';

diff --git a/media/img/firefox/common/firefox-logo-high-res.png b/media/img/firefox/common/firefox-logo-high-res.png
diff --git a/media/img/firefox/common/firefox-logo.png b/media/img/firefox/common/firefox-logo.png
diff --git a/media/img/firefox/common/icon-alert.svg b/media/img/firefox/common/icon-alert.svg