From 5083550e5f5b09d43bfc7bad4ae060d5a1c80beb Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Tue, 11 Jun 2013 15:01:08 +0800
Subject: Bug 881603: fix the mozilla skin's footer

---
 .../en/default/hook/global/footer-end.html.tmpl    | 11 +++++++
 .../en/default/hook/global/footer-outro.html.tmpl  |  1 -
 skins/contrib/Mozilla/global.css                   | 35 ++++++++--------------
 skins/custom/global.css                            |  6 ++++
 4 files changed, 30 insertions(+), 23 deletions(-)
 create mode 100644 extensions/BMO/template/en/default/hook/global/footer-end.html.tmpl
 delete mode 100644 extensions/BMO/template/en/default/hook/global/footer-outro.html.tmpl

diff --git a/extensions/BMO/template/en/default/hook/global/footer-end.html.tmpl b/extensions/BMO/template/en/default/hook/global/footer-end.html.tmpl
new file mode 100644
index 000000000..12957c3c1
--- /dev/null
+++ b/extensions/BMO/template/en/default/hook/global/footer-end.html.tmpl
@@ -0,0 +1,11 @@
+[%# 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="privacy-policy">
+  <a href="https://www.mozilla.org/about/policies/privacy-policy.html" target="_blank">Privacy Policy</a>
+</div>
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
index b5bb4719c..000000000
--- a/extensions/BMO/template/en/default/hook/global/footer-outro.html.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-<a href="https://www.mozilla.org/about/policies/privacy-policy.html">Privacy Policy</a>
diff --git a/skins/contrib/Mozilla/global.css b/skins/contrib/Mozilla/global.css
index 30dedcf97..b251dc093 100644
--- a/skins/contrib/Mozilla/global.css
+++ b/skins/contrib/Mozilla/global.css
@@ -6,7 +6,6 @@ body {
     background-image: url(noise.png), -webkit-linear-gradient(#d7d3c8, #f6f4ec 400px);
     background-image: url(noise.png), linear-gradient(#d7d3c8, #f6f4ec 400px);
     color: #404040;
-    min-width: 990px;
 }
 
 body, td, th, input {
@@ -108,7 +107,7 @@ hr {
     border-radius: 0;
     color: #404040;
     position: relative;
-     margin-top: -15px; 
+    margin-top: -15px;
     width: 50%;
 }
 
@@ -177,7 +176,7 @@ hr {
     border: 1px solid rgba(0, 0, 0, 0.2);
     border-radius: 0 0 5px 5px;
     box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
-    display: none; 
+    display: none;
     padding: 4px;
     position: absolute;
     right: -1px;
@@ -291,7 +290,7 @@ table.edit_form hr {
 
 .field_label a, .field_label b {
     color: #000;
-    font-weight: normal; 
+    font-weight: normal;
 }
 
 .field_value .text_input {
@@ -503,20 +502,12 @@ table.edit_form hr {
     border-top: 1px solid rgba(0, 0, 0, 0.1);
     border-radius: 0;
     color: #bbb;
-    margin-left: -15px;
-    padding: 20px;
-}
-
-#footer #useful-links {
-    background: url(footer-mozilla.png) no-repeat;
-    min-height: 24px;
+    width: auto;
+    margin-bottom: 1em;
 }
 
-#footer > * {
-    margin-right: auto;
-    margin-left: auto;
-    padding: 0 0 0 200px !important;
-    width: 80%;
+#privacy-policy {
+    margin-bottom: 1em;
 }
 
 #commit, #commit_top {
@@ -586,19 +577,19 @@ table.edit_form hr {
     body {
         min-width: 768px;
     }
-  
+
     #header .wrapper, #bugzilla-body {
         -moz-box-sizing: border-box;
         -webkit-box-sizing: border-box;
         box-sizing: border-box;
-        width: 768px;
+        min-width: 768px;
     }
 
     #footer > * {
         -moz-box-sizing: border-box;
         -webkit-box-sizing: border-box;
         box-sizing: border-box;
-        width: 448px;
+        min-width: 768px;
     }
 }
 
@@ -611,7 +602,7 @@ table.edit_form hr {
         display: block;
         width: 100% !important;
     }
-    
+
     .bz_column_spacer {
         width: auto;
         height: 20px;
@@ -625,7 +616,7 @@ table.edit_form hr {
     body {
         min-width: 480px;
     }
-  
+
     #header .wrapper, #bugzilla-body, #attachment_table,
     .bz_comment, #add_comment > table, #comment {
         -moz-box-sizing: border-box;
@@ -647,7 +638,7 @@ table.edit_form hr {
     body {
         min-width: 100%;
     }
-  
+
     #header .wrapper, #bugzilla-body, #attachment_table,
     .bz_comment, #add_comment > table, #comment {
         -moz-box-sizing: border-box;
diff --git a/skins/custom/global.css b/skins/custom/global.css
index e80f656fb..27232c274 100644
--- a/skins/custom/global.css
+++ b/skins/custom/global.css
@@ -65,3 +65,9 @@ a.controller {
     background-repeat: no-repeat;
     padding-left: 18px;
 }
+
+#privacy-policy {
+    font-size: x-small;
+    width: 100%;
+    text-align: right;
+}
-- 
cgit v1.2.3-24-g4f1b