Merge branch 'privacy-policy'

bellroy · Apr 23, 2015 · 4acb1f0 · 4acb1f0
2 parents 163930c + c1035f0
commit 4acb1f0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/r2/r2/public/files/Lesswrong-Privacy-Policy.pdf b/r2/r2/public/files/Lesswrong-Privacy-Policy.pdf
diff --git a/r2/r2/public/static/main.css b/r2/r2/public/static/main.css
@@ -1411,6 +1411,9 @@ div.footer ul.footer-links li a {
 	font-weight: bold;
 	text-decoration: none;
 }
+div.footer ul.footer-links li.privacy-policy span {
+  color: #cc0000;
+}
 
 * .loading {
     display: none;

diff --git a/r2/r2/templates/redditfooter.html b/r2/r2/templates/redditfooter.html
@@ -6,16 +6,16 @@
 ## software over a computer network and provide for limited attribution for the
 ## Original Developer. In addition, Exhibit A has been modified to be consistent
 ## with Exhibit B.
-## 
+##
 ## Software distributed under the License is distributed on an "AS IS" basis,
 ## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
 ## the specific language governing rights and limitations under the License.
-## 
+##
 ## The Original Code is Reddit.
-## 
+##
 ## The Original Developer is the Initial Developer.  The Initial Developer of
 ## the Original Code is CondeNet, Inc.
-## 
+##
 ## All portions of the code written by CondeNet are Copyright (c) 2006-2008
 ## CondeNet, Inc. All Rights Reserved.
 ################################################################################
@@ -38,6 +38,7 @@
   <ul class="footer-links">
     <li>${plain_link(_('About Less Wrong'), '/about', _sr_path=False)}</li>
     <li><a href="http://wiki.github.com/tricycle/lesswrong/issues-bugs-and-requested-features">Report Issues</a></li>
+    <li class="privacy-policy"><a href="/files/Lesswrong-Privacy-Policy.pdf" target="_blank">Privacy Policy <span>(NEW 25/01/15)</span></a></li>
   </ul>
  %if g.tracker_url:
   <img alt="" src="${tracking.UserInfo.gen_url()}"/>