Merge pull request mozilla#10 from sgarrity/bug-701178-warning-message

Bug 701178 warning message
tallowen · Dec 12, 2012 · 87d57dc · 87d57dc
2 parents 2d49b38 + 9fd8291
commit 87d57dc
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 2 deletions.
diff --git a/css/nightly.css b/css/nightly.css
@@ -174,7 +174,7 @@ body {
 }
 
 #builds {
-    margin: -50px auto 50px;
+    margin: -50px auto 20px;
     width: 900px;
 }
 
@@ -283,6 +283,25 @@ body {
     text-shadow: #000 1px 1px 1px;
 }
 
+#warning {
+    margin: 0 auto 30px;
+    width: 900px;
+    font-style: italic;
+    color: #888;
+    font-size: 13px;
+}
+
+#warning a {
+    color: #86a1d5;
+    text-decoration: none;
+}
+
+#warning a:hover,
+#warning a:active,
+#warning a:focus {
+    text-decoration: underline;
+}
+
 #nightly-links {
     margin: 0 auto 150px;
     width: 900px;
@@ -324,7 +343,9 @@ body {
     transition-property: text-shadow;
 }
 
-#nightly-links a:hover {
+#nightly-links a:active,
+#nightly-links a:hover,
+#nightly-links a:focus {
     text-decoration: underline;
     text-shadow: #404040 1px 1px 1px;
 }
diff --git a/img/covehead/template/footer-title.png b/img/covehead/template/footer-title.png
diff --git a/img/covehead/template/title.png b/img/covehead/template/title.png
diff --git a/img/favicon.png b/img/favicon.png
diff --git a/img/footer-title.png b/img/footer-title.png
diff --git a/img/icon-android.png b/img/icon-android.png
diff --git a/img/icon-arrow.png b/img/icon-arrow.png
diff --git a/img/icon-linux.png b/img/icon-linux.png
diff --git a/img/icon-mac.png b/img/icon-mac.png
diff --git a/img/icon-maemo.png b/img/icon-maemo.png
diff --git a/img/icon-windows.png b/img/icon-windows.png
diff --git a/img/nightly-bg.png b/img/nightly-bg.png
diff --git a/img/nightly-content-bg.png b/img/nightly-content-bg.png
diff --git a/img/nightly-footer-bg.png b/img/nightly-footer-bg.png
diff --git a/img/nightly-header-bg.png b/img/nightly-header-bg.png
diff --git a/img/nightly-title.png b/img/nightly-title.png
diff --git a/img/template/email-link.png b/img/template/email-link.png
diff --git a/templates/index.html b/templates/index.html
@@ -67,6 +67,8 @@ <h3>
     {% endfor %}
   </div>
 
+  <p id="warning">Firefox Nightly automatically sends feedback to Mozilla. <a href="http://www.mozilla.org/legal/privacy/firefox.html">Learn more.</a></p>
+
   <div id="nightly-links">
     <section>
       <h3>Getting Started</h3>