From 4fc4b2f3ded3a4d32a006e4e565d1038243c2dac Mon Sep 17 00:00:00 2001
From: Sarina Canelake <sarina@edx.org>
Date: Mon, 2 Feb 2015 15:23:01 -0500
Subject: [PATCH] LMS: correcting poorly scoped font-family rule for footer
 links inside of p, ul, ol elements.

Fix link stylings in LMS and CMS footers
---
 cms/templates/widgets/footer.html   |  6 +++---
 lms/static/sass/shared/_footer.scss | 12 +++++++++++-
 lms/templates/footer-edx-new.html   | 20 ++++++++++----------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/cms/templates/widgets/footer.html b/cms/templates/widgets/footer.html
index 707efdcd20..d5c5035ac6 100644
--- a/cms/templates/widgets/footer.html
+++ b/cms/templates/widgets/footer.html
@@ -4,12 +4,12 @@
 <div class="wrapper-footer wrapper">
   <footer class="primary" role="contentinfo">
     <div class="colophon">
-      <p>&copy; ${settings.COPYRIGHT_YEAR} <a href="${marketing_link('ROOT')}" rel="external">${settings.PLATFORM_NAME}</a>.</p>
+      <p>&copy; ${settings.COPYRIGHT_YEAR} <a data-rel="edx.org" href="${marketing_link('ROOT')}" rel="external">${settings.PLATFORM_NAME}</a>.</p>
       ## Site operators: Please do not remove this paragraph! This attributes back to edX and makes your acknowledgement of edX's trademarks clear.
       <p>
 	## Translators: 'EdX', 'edX', 'Studio', and 'Open edX' are trademarks of 'edX Inc.'. Please do not translate any of these trademarks and company names.
 	${_("EdX, Open edX, Studio, and the edX and Open edX logos are registered trademarks or trademarks of {link_start}edX Inc.{link_end}").format(
-	  link_start=u"<a href='https://www.edx.org/'>",
+	  link_start=u"<a data-rel='edx.org' href='https://www.edx.org/'>",
 	  link_end=u"</a>"
 	)}
       </p>
@@ -25,7 +25,7 @@
         </li>
         % if settings.TENDER_DOMAIN and user.is_authenticated():
         <li class="nav-item nav-peripheral-feedback">
-          <a href="http://${settings.TENDER_DOMAIN}/discussion/new" class="show-tender" title="${_('Use our feedback tool, Tender, to share your feedback')}">${_("Contact Us")}</a>
+          <a data-rel="edx.org" href="http://${settings.TENDER_DOMAIN}/discussion/new" class="show-tender" title="${_('Use our feedback tool, Tender, to share your feedback')}">${_("Contact Us")}</a>
         </li>
         % endif
       </ol>
diff --git a/lms/static/sass/shared/_footer.scss b/lms/static/sass/shared/_footer.scss
index e9eb83d166..a70f4e2165 100644
--- a/lms/static/sass/shared/_footer.scss
+++ b/lms/static/sass/shared/_footer.scss
@@ -20,6 +20,11 @@
 
     p, ol, ul {
       font-family: $sans-serif;
+
+      // override needed for poorly scoped font-family styling on p a:link {}
+      a {
+        font-family: $sans-serif;
+      }
     }
 
     a {
@@ -27,7 +32,6 @@
       border-bottom: none;
       color: $link-color;
       text-decoration: none !important;
-      font-family: $sans-serif;
 
       &:hover, &:focus, &:active {
         border-bottom: 1px dotted $link-color;
@@ -327,6 +331,12 @@ $edx-footer-bg-color: rgb(252,252,252);
       // NOTE: needed for poor LMS span styling
       color: inherit;
     }
+
+    a {
+      @extend %edx-footer-link;
+      display: inline-block;
+      margin-bottom: ($edx-footer-spacing/2);
+    }
   }
 
   .footer-about-links {
diff --git a/lms/templates/footer-edx-new.html b/lms/templates/footer-edx-new.html
index 7e6481fb40..16a32d9560 100644
--- a/lms/templates/footer-edx-new.html
+++ b/lms/templates/footer-edx-new.html
@@ -30,17 +30,17 @@
       </div>
 
       <div class="footer-about-copyright">
-	## Using "edX Inc." explicitly here for copyright purposes (settings.PLATFORM_NAME is just "edX", and this footer is only used on edx.org)
-	<p>&copy; ${settings.COPYRIGHT_YEAR} edX Inc.</p>
+      	## Using "edX Inc." explicitly here for copyright purposes (settings.PLATFORM_NAME is just "edX", and this footer is only used on edx.org)
+      	<p>&copy; ${settings.COPYRIGHT_YEAR} edX Inc.</p>
 
-	## Site operators: Please do not remove this paragraph! This attributes back to edX and makes your acknowledgement of edX's trademarks clear.
-	<p>
-	  ## Translators: 'EdX', 'edX', and 'Open edX' are trademarks of 'edX Inc.'. Please do not translate any of these trademarks and company names.
-	  ${_("EdX, Open edX, and the edX and Open edX logos are registered trademarks or trademarks of {link_start}edX Inc.{link_end}").format(
-	      link_start=u"<a href='https://www.edx.org/'>",
-	      link_end=u"</a>"
-	  )}
-	</p>
+      	## Site operators: Please do not remove this paragraph! This attributes back to edX and makes your acknowledgement of edX's trademarks clear.
+      	<p>
+      	  ## Translators: 'EdX', 'edX', and 'Open edX' are trademarks of 'edX Inc.'. Please do not translate any of these trademarks and company names.
+      	  ${_("EdX, Open edX, and the edX and Open edX logos are registered trademarks or trademarks of {link_start}edX Inc.{link_end}").format(
+      	      link_start=u"<a href='https://www.edx.org/'><span class='copy'>",
+      	      link_end=u"</span></a>"
+      	  )}
+      	</p>
       </div>
 
       <div class="footer-about-links">