Removed Trademarks Fixes #139

alexspence · rickr · commit 13e5cbcefbf5 · 2017-06-13T18:42:44.000-06:00
diff --git a/index.html b/index.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <title>Operation Code™</title>
+        <title>Operation Code</title>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <meta name="description" content="Veteran-founded and led, Operation Code™ is a 501(c)(3) non-profit whose mission is to aid military, vets and their families learn coding and web technologies.">
+        <meta name="description" content="Veteran-founded and led, Operation Code is a 501(c)(3) non-profit whose mission is to aid military, vets and their families learn coding and web technologies.">
         <meta name="keywords" content="operation code, veterans, software development, learn to code, keep coding, veteran coders, senate veterans, house veterans, gi bill, new gi bill, operationcode.org, #operationcode, military vets, vets">
         <meta name="author" content="Veteran Coders, for Veterans Coders">
         <meta property="og:image" content="https://static1.squarespace.com/static/586d87de725e2585df6e8448/t/5870110d6b8f5b61fdd8ee05/1483739408996/?format=500w" />
diff --git a/public/index.html b/public/index.html
@@ -30,7 +30,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>Operation Code™</title>
+    <title>Operation Code</title>
         <!-- Start of Async Drift Code -->
         <script>
         !function() {
diff --git a/src/scenes/home/codeSchools/partnerSchools/partnerSchools.js b/src/scenes/home/codeSchools/partnerSchools/partnerSchools.js
@@ -119,7 +119,7 @@ class PartnerSchools extends Component {
 
         <div className={styles.noteForSchoolReps}>
           <p>
-            Are you a code school seeking a partnership with Operation Code™?
+            Are you a code school seeking a partnership with Operation Code?
             <br />
             <a href="mailto:staff@operationcode.org">
               Reach out to us!
diff --git a/src/scenes/home/footer/footer.js b/src/scenes/home/footer/footer.js
@@ -32,9 +32,9 @@ class Footer extends Component {
           </div>
         </div>
         <div className={styles.copyright}>
-          Please note that this website is managed by Operation Code™.
+          Please note that this website is managed by Operation Code.
           The content of this website is solely the responsibility of
-          Operation Code™.<br />
+          Operation Code.<br />
           Copyright 2017 Operation Code™
         </div>
       </div>
diff --git a/src/scenes/home/header/logo/logo.css b/src/scenes/home/header/logo/logo.css
@@ -9,12 +9,6 @@
   height: 50px;
 }
 
-.trademark {
-  color: #FFF;
-  align-self: flex-start;
-  margin-top:15px;
-}
-
 @media screen and (max-width: 900px) {
   .logo {
     margin-left: 10px;
diff --git a/src/scenes/home/header/logo/logo.js b/src/scenes/home/header/logo/logo.js
@@ -7,7 +7,7 @@ class Logo extends Component {
   render() {
     return (
       <div className={styles.logo} >
-        <Link to="/"><img src={logo} alt="" /></Link><span className={styles.trademark}>™</span>
+        <Link to="/"><img src={logo} alt="" /></Link>
       </div>
     );
   }
diff --git a/src/scenes/home/header/sideNav/sideNav.js b/src/scenes/home/header/sideNav/sideNav.js
@@ -91,7 +91,7 @@ class SideNav extends Component {
               <a className={styles.close} href="/" onClick={this.handleCloseClick}>&#10006;</a>
             </div>
             <a className={styles.logoWrapper} href="/">
-              <img className={styles.logo} src={logo} alt="Operation Code™ logo" />
+              <img className={styles.logo} src={logo} alt="Operation Code logo" />
             </a>
           </div>
           <div className={styles.list}>
diff --git a/src/scenes/home/landing/membership/membership.js b/src/scenes/home/landing/membership/membership.js
@@ -13,7 +13,7 @@ class Membership extends Component {
       <Section title="Membership" theme="white">
         <div className={styles.intro}>
           <p>
-            Joining Operation Code™ is easy - and free! Once you&#39;re signed up, you can join us on
+            Joining Operation Code is easy - and free! Once you&#39;re signed up, you can join us on
             Slack and start enjoying the benefits of your membership:
           </p>
         </div>
diff --git a/src/scenes/home/landing/partners/partners.js b/src/scenes/home/landing/partners/partners.js
@@ -19,7 +19,7 @@ class Partners extends Component {
       >
         <div className={styles.partners}>
           <p>
-            Operation Code™ and our all-volunteer team offers our
+            Operation Code and our all-volunteer team offers our
             programs and services through the generous support
             of our partners. Their support, made via either
             financial contributions or in-kind donations,
diff --git a/src/scenes/home/landing/whatWeDo/whatWeDoContent.json b/src/scenes/home/landing/whatWeDo/whatWeDoContent.json
@@ -16,7 +16,7 @@
     },
     {
       "title": "Conference Scholarships",
-      "body": "Operation Code™ partners with tech conferences around the world and offers scholarship tickets to events throughout the year.",
+      "body": "Operation Code partners with tech conferences around the world and offers scholarship tickets to events throughout the year.",
       "buttonText": "View Past Events",
       "linkTo": "/pastEvents",
       "imageUrl": "images/ThinkstockPhotos-489787502.jpg"
diff --git a/src/scenes/home/signup/signup.js b/src/scenes/home/signup/signup.js
@@ -102,10 +102,10 @@ class SignUp extends Component {
 
   render() {
     return (
-      <Section className={styles.signup} title="Join Operation Code™">
+      <Section className={styles.signup} title="Join Operation Code">
         <Form className={styles.signupForm}>
           <span>
-            Are you ready to deploy your future?  Join Operation Code™
+            Are you ready to deploy your future?  Join Operation Code
             today and launch your career in software development.
             Once you complete the form below you&#8217;ll be invited
             to join our Slack team.  Make sure you stop in and say hi!
@@ -125,7 +125,7 @@ class SignUp extends Component {
             id="passwordConfirm" placeholder="Confirm Password"
             onChange={this.onConfirmPasswordChange} validateFunc={this.validatePasswordConfirm}
           />
-          {this.state.error && <span>There was an error joining Operation Code™: {this.state.error}</span>}
+          {this.state.error && <span>There was an error joining Operation Code: {this.state.error}</span>}
           {this.state.success && <Redirect to="/thanks" />}
           <FormButton className={styles.joinButton} text="Join" onClick={this.handleOnClick} theme="red" />
         </Form>
diff --git a/src/scenes/home/thanks/thanks.js b/src/scenes/home/thanks/thanks.js
@@ -5,7 +5,7 @@ class Thanks extends Component {
   render() {
     return (
       <Section title="Thanks for joining">
-        <span>Thanks for joining operation code™.  Please check your email for orders.</span>
+        <span>Thanks for joining operation code.  Please check your email for orders.</span>
       </Section>
     );
   }
diff --git a/src/shared/components/join/join.js b/src/shared/components/join/join.js
@@ -13,7 +13,7 @@ const Join = (props) => {
     >
       <div className={styles.join} >
         <p>
-          Operation Code™ is leading the way to expand opportunities
+          Operation Code is leading the way to expand opportunities
           for military veterans and their families to learn new skills,
           and build a career in the fast-growing technology sector.
         </p>

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ class Logo extends Component {`
`7`	`7`	`render() {`
`8`	`8`	`return (`
`9`	`9`	`<div className={styles.logo} >`
`10`		`- <Link to="/"><img src={logo} alt="" /></Link><span className={styles.trademark}>™</span>`
	`10`	`+ <Link to="/"><img src={logo} alt="" /></Link>`
`11`	`11`	`</div>`
`12`	`12`	`);`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class Partners extends Component {`
`19`	`19`	`>`
`20`	`20`	`<div className={styles.partners}>`
`21`	`21`	`<p>`
`22`		`- Operation Code™ and our all-volunteer team offers our`
	`22`	`+ Operation Code and our all-volunteer team offers our`
`23`	`23`	`programs and services through the generous support`
`24`	`24`	`of our partners. Their support, made via either`
`25`	`25`	`financial contributions or in-kind donations,`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`},`
`17`	`17`	`{`
`18`	`18`	`"title": "Conference Scholarships",`
`19`		`- "body": "Operation Code™ partners with tech conferences around the world and offers scholarship tickets to events throughout the year.",`
	`19`	`+ "body": "Operation Code partners with tech conferences around the world and offers scholarship tickets to events throughout the year.",`
`20`	`20`	`"buttonText": "View Past Events",`
`21`	`21`	`"linkTo": "/pastEvents",`
`22`	`22`	`"imageUrl": "images/ThinkstockPhotos-489787502.jpg"`