Revert "Ttracy/microba 70 update footer trademarks (#25)" (#26)

This reverts commit 92e145f.
edx · Dec 13, 2019 · b96bdf3 · b96bdf3
1 parent 92e145f
commit b96bdf3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 27 deletions.
diff --git a/src/components/Footer.jsx b/src/components/Footer.jsx
@@ -205,16 +205,16 @@ class Footer extends React.Component {
               </li>
             </ul>
             <p>
-              © {new Date().getFullYear()} edX Inc. All rights reserved.
+              © 2012–2019 edX Inc.
               <br />
               <FormattedMessage
                 id="footer.trademarks"
-                defaultMessage="{icpMessage}"
+                defaultMessage="EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. {icpMessage}"
                 description="A description of the trademarks that belong to edX."
                 values={{
                   icpMessage: (
                     <React.Fragment>
-                      深圳市恒宇博科技有限公司 <a style={{ textDecoration: 'underline' }} href="http://www.beian.miit.gov.cn">粤ICP备17044299号-2</a>
+                      深圳市恒宇博科技有限公司 <a href="http://www.beian.miit.gov.cn">粤ICP备17044299号-2</a>
                     </React.Fragment>
                   ),
                 }}

diff --git a/src/components/__snapshots__/Footer.test.jsx.snap b/src/components/__snapshots__/Footer.test.jsx.snap
@@ -397,19 +397,13 @@ exports[`<Footer /> renders correctly renders with a language selector 1`] = `
         </li>
       </ul>
       <p>
-        © 
-        2019
-         edX Inc. All rights reserved.
+        © 2012–2019 edX Inc.
         <br />
         <span>
+          EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. 
           深圳市恒宇博科技有限公司 
           <a
             href="http://www.beian.miit.gov.cn"
-            style={
-              Object {
-                "textDecoration": "underline",
-              }
-            }
           >
             粤ICP备17044299号-2
           </a>
@@ -755,19 +749,13 @@ exports[`<Footer /> renders correctly renders without a language selector 1`] =
         </li>
       </ul>
       <p>
-        © 
-        2019
-         edX Inc. All rights reserved.
+        © 2012–2019 edX Inc.
         <br />
         <span>
+          EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. 
           深圳市恒宇博科技有限公司 
           <a
             href="http://www.beian.miit.gov.cn"
-            style={
-              Object {
-                "textDecoration": "underline",
-              }
-            }
           >
             粤ICP备17044299号-2
           </a>
@@ -1064,19 +1052,13 @@ exports[`<Footer /> renders correctly renders without a language selector in es
         </li>
       </ul>
       <p>
-        © 
-        2019
-         edX Inc. All rights reserved.
+        © 2012–2019 edX Inc.
         <br />
         <span>
+          EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. 
           深圳市恒宇博科技有限公司 
           <a
             href="http://www.beian.miit.gov.cn"
-            style={
-              Object {
-                "textDecoration": "underline",
-              }
-            }
           >
             粤ICP备17044299号-2
           </a>