Bug 1363889 - Update BMO to use new Mozilla branding

diff --git a/extensions/BMO/template/en/default/hook/global/footer-intro.html.tmpl b/extensions/BMO/template/en/default/hook/global/footer-intro.html.tmpl
new file mode 100644 (file)
index 0000000..cb157ec
--- /dev/null
+++ b/extensions/BMO/template/en/default/hook/global/footer-intro.html.tmpl
@@ -0,0 +1,16 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+<nav class="org-links">
+  <h1><a href="https://www.mozilla.org/">Mozilla</a></h1>
+  <ul>
+    <li><a href="https://www.mozilla.org/privacy/websites/" target="_blank">Privacy</a></li>
+    <li><a href="https://www.mozilla.org/privacy/websites/#cookies" target="_blank">Cookies</a></li>
+    <li><a href="https://www.mozilla.org/about/legal/" target="_blank">Legal</a></li>
+  </ul>
+</nav>

diff --git a/extensions/BMO/template/en/default/hook/global/footer-outro.html.tmpl b/extensions/BMO/template/en/default/hook/global/footer-outro.html.tmpl
deleted file mode 100644 (file)
index f67d280..0000000
--- a/extensions/BMO/template/en/default/hook/global/footer-outro.html.tmpl
+++ /dev/null
@@ -1,18 +0,0 @@
-[%# This Source Code Form is subject to the terms of the Mozilla Public
-  # License, v. 2.0. If a copy of the MPL was not distributed with this
-  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-  #
-  # This Source Code Form is "Incompatible With Secondary Licenses", as
-  # defined by the Mozilla Public License, v. 2.0.
-  #%]
-
-<div id="policy_links">
-  <ul>
-    <li id="privacy_notice">
-      <a href="https://www.mozilla.org/privacy/websites/" target="_blank">Privacy Notice</a> |
-    </li>
-    <li id="legal_terms">
-      <a href="https://www.mozilla.org/about/legal/terms/mozilla" target="_blank">Legal Terms</a>
-    </li>
-  </ul>
-</div>

diff --git a/images/moz-logo-bw-rgb.svg b/images/moz-logo-bw-rgb.svg
new file mode 100644 (file)
index 0000000..08f06e0
--- /dev/null
+++ b/images/moz-logo-bw-rgb.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+        viewBox="0 0 360 102.8" style="enable-background:new 0 0 360 102.8;" xml:space="preserve">
+<style type="text/css">
+       .st0{fill:#FFFFFF;}
+</style>
+<g>
+       <rect y="-0.2" width="360" height="102.9"/>
+       <path class="st0" d="M343.8,73.7c-0.7,0.2-1.3,0.3-1.9,0.3c-2.1,0-3.1-0.9-3.1-3.5V51c0-10.3-8.2-15.3-17.9-15.3
+               c-7.4,0-11.4,0.9-19.3,4.1L300,50.2l10.3,1.1l1.5-5.1c2.1-1.1,4.2-1.3,6.9-1.3c7.3,0,7.4,5.5,7.4,10.1v1.5
+               c-2.3-0.3-4.9-0.4-7.4-0.4c-10.3,0-21,2.6-21,13.7c0,9.4,7.4,12.9,13.9,12.9c7.3,0,11.9-4.4,14.5-9c0.6,5.5,3.9,9,9.9,9
+               c2.8,0,5.7-0.8,8.1-2.1L343.8,73.7z M316.2,73.4c-3.9,0-5.3-2.3-5.3-5.2c0-4.9,4-6.2,8.6-6.2c2.1,0,4.4,0.3,6.5,0.6
+               C325.7,70.1,320.8,73.4,316.2,73.4z M298.9,12.9l-19.5,68.7h-12.7l19.5-68.7H298.9z M272.7,12.9l-19.5,68.7h-12.7L260,12.9H272.7z
+                M218.7,36.6h13.5v16.2h-13.5V36.6z M218.7,65.5h13.5v16.2h-13.5V65.5z M199,64.9l10.2,1l-2.8,15.8h-39.3l-1.3-6.8l24.8-28.5h-14.1
+               l-2,7l-9.3-1l1.6-15.8h39.5l1,6.8l-25,28.5h14.6L199,64.9z M134.5,35.7c-16.2,0-24.2,10.9-24.2,24.1c0,14.4,9.6,22.9,23.5,22.9
+               c14.4,0,24.8-9.1,24.8-23.5C158.6,46.6,150.7,35.7,134.5,35.7z M134.2,72.7c-7,0-10.6-6-10.6-13.8c0-8.5,4.1-13.4,10.7-13.4
+               c6.1,0,11,4.1,11,13.2C145.3,67.4,140.9,72.7,134.2,72.7z M98.7,71.8h6v9.8H85.9V56.3c0-7.8-2.6-10.8-7.7-10.8
+               c-6.2,0-8.7,4.4-8.7,10.7v15.7h6v9.8H56.6V56.3c0-7.8-2.6-10.8-7.7-10.8c-6.2,0-8.7,4.4-8.7,10.7v15.7h8.6v9.8H21.4v-9.8h6V46.4h-6
+               v-9.8h18.9v6.8c2.7-4.8,7.4-7.7,13.7-7.7c6.5,0,12.5,3.1,14.7,9.7c2.5-6,7.6-9.7,14.7-9.7c8.1,0,15.5,4.9,15.5,15.6V71.8z"/>
+</g>
+</svg>

diff --git a/images/tabzilla.png b/images/tabzilla.png
deleted file mode 100644 (file)
index 7619610..0000000
Binary files a/images/tabzilla.png and /dev/null differ

diff --git a/skins/standard/global.css b/skins/standard/global.css
index f6579efee4fe5b5f7beb3b844cd2cdabec92318c..bd822106a162317dc079ac5b853204f2affb7202 100644 (file)
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -147,17 +147,60 @@
  * to both the header and footer.
  */
     #footer {
+        display: flex;
         clear: both;
-        margin-top: 1em;
-        width: 100%;
-        background: #edf2f2;
-        border-top: 1px solid #ddd;
-        border-bottom: 1px solid #ddd;
+        margin: 2em 0 0;
+        border-top: 1px solid rgba(0, 0, 0, 0.1);
+        padding: 2em;
+        color: #bbb;
+        background-color: #fff;
+        line-height: 1.5;
+    }
+
+    #footer .intro {
+        flex: none;
+        display: flex;
+        align-items: center;
+        width: 25%;
+        min-width: 20em;
+    }
+
+    #footer .org-links h1 {
+        margin: 0;
+        font-size: 1em;
+    }
+
+    #footer .org-links h1 a {
+        display: block;
+        width: 100px;
+        height: 30px;
+        background-image: url(../../images/moz-logo-bw-rgb.svg);
+        background-repeat: no-repeat;
+        background-size: contain;
+        text-indent: -9999px;
+    }
+
+    #footer .org-links ul {
+        display: flex;
+        margin: .5em 0 0;
+        padding: 0;
+    }
+
+    #footer .org-links li {
+        flex: none;
+    }
+
+    #footer .org-links li:not(:last-child) {
+        margin-right: 1.5em;
     }
 
     #footer #useful-links {
-        padding-left: 1ex;
-        padding-right: 1ex;
+        flex: auto;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        margin: 0;
+        padding: 0;
     }
 
     #footer ul {
@@ -178,6 +221,20 @@
     #footer .links {
         vertical-align: top;
     }
+
+    #footer .links .quicksearch_form {
+        display: none;
+    }
+
+    #footer .form {
+        display: block;
+        margin-top: 1em;
+    }
+
+    #footer .form input {
+        padding: 1px 2px;
+        margin-top: 3px;
+    }
 /* footer (end) */
 
 /* link lists (begin) */
@@ -517,7 +574,7 @@ div.user_match {
 
 /* Rules specific for printing */
 @media print {
-    #header, #footer, #privacy-policy {
+    #header, #footer {
         display: none;
     }
 
@@ -945,14 +1002,8 @@ body.mfa-warning #mfa-select button {
     font-size: 120%;
 }
 
-#moz_tab {
-    width: 100px;
-    vertical-align: top;
-}
-
 #moz_login {
     text-align: right;
-    padding-right: 2em;
     color: #404040;
 }
 
@@ -1000,10 +1051,6 @@ body.mfa-warning #mfa-select button {
     width: 200px;
 }
 
-#footer .links .quicksearch_form {
-    display: none;
-}
-
 #header .form a {
     margin: 0;
 }
@@ -1416,30 +1463,10 @@ table.edit_form hr {
     padding: 2px 2px 2px 1px;
 }
 
-#footer {
-    background: #fff;
-    border: none;
-    border-top: 1px solid rgba(0, 0, 0, 0.1);
-    border-radius: 0;
-    color: #bbb;
-    width: auto;
-    margin-bottom: 1em;
-    margin-left: 6px;
-}
-
 #links-actions, #links-saved {
     margin-left: -10px;
 }
 
-#footer form input {
-    padding: 1px 2px;
-    margin-top: 3px;
-}
-
-#privacy-policy {
-    margin-bottom: 1em;
-}
-
 button, input[type=submit], input[type=button], #commit, #commit_top, #header .btn, #header input[type=submit] {
     background-color: #43a6e2;
     background-image: -moz-linear-gradient(#43a6e2,#277ac1);
@@ -1570,7 +1597,7 @@ table.tabs {
 
 body {
     margin: 0;
-    padding: 15px 15px 2px 15px;
+    padding: 15px;
 }
 
 #header .btn, #header .txt {
@@ -1625,15 +1652,6 @@ a.controller {
     padding-left: 18px;
 }
 
-#policy_links {
-    padding-right: 5px;
-    text-align: right;
-}
-
-#policy_links li {
-    display: inline;
-}
-
 .highlighted {
     background: lightyellow;
 }

diff --git a/skins/standard/mobile.css b/skins/standard/mobile.css
index c5e47b8a53a883fc68665581b0c19146090ab55d..244726f21d67773aa7e82c8a5be11d6b79ceb14b 100644 (file)
--- a/skins/standard/mobile.css
+++ b/skins/standard/mobile.css
@@ -52,7 +52,7 @@ only screen and (-o-min-device-pixel-ratio: 2/1),
 only screen and (min-device-pixel-ratio: 2),
 only screen and (min-resolution: 192dpi),
 only screen and (min-resolution: 2dppx) {
-    #policy_links {
+    #footer .org-links {
         font-size: small;
     }
 

diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 25b65938ff60de9a6f9604403eebfbdc6efaff74..6d5d54a485816581bab9557cbeadc604b239b416 100644 (file)
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -328,10 +328,6 @@
           </ul>
         [% END %]
       </td>
-      <td id="moz_tab">
-        <a href="https://www.mozilla.org/" title="Mozilla - Home of the Mozilla Project">
-          <img src="images/tabzilla.png" border="0" height="42" width="154"></a>
-      </td>
     </tr>
     </table>