cls fixes

your-digital-rights · Feb 28, 2024 · 6cb4074 · 6cb4074
1 parent 5562b6e
commit 6cb4074
Show file tree

Hide file tree

Showing 13 changed files with 71 additions and 38 deletions.
diff --git a/compiled-lang/az.json b/compiled-lang/az.json
@@ -975,6 +975,12 @@
       "value": "crwdns2527:0crwdne2527:0"
     }
   ],
+  "nav.blog": [
+    {
+      "type": 0,
+      "value": "crwdns5912:0crwdne5912:0"
+    }
+  ],
   "nav.contact": [
     {
       "type": 0,

diff --git a/compiled-lang/de.json b/compiled-lang/de.json
@@ -1267,6 +1267,12 @@
       "value": "Etwa"
     }
   ],
+  "nav.blog": [
+    {
+      "type": 0,
+      "value": "Blog"
+    }
+  ],
   "nav.contact": [
     {
       "type": 0,

diff --git a/compiled-lang/en.json b/compiled-lang/en.json
@@ -1397,6 +1397,12 @@
       "value": "Send GDPR, CCPA and LGPD Data Deletion and Access Requests"
     }
   ],
+  "orgHero.imageAlt": [
+    {
+      "type": 0,
+      "value": "Organization logo"
+    }
+  ],
   "orgHero.newOrgTitle": [
     {
       "type": 0,

diff --git a/compiled-lang/es.json b/compiled-lang/es.json
@@ -1263,6 +1263,12 @@
       "value": "Nosotros"
     }
   ],
+  "nav.blog": [
+    {
+      "type": 0,
+      "value": "Blog"
+    }
+  ],
   "nav.contact": [
     {
       "type": 0,

diff --git a/compiled-lang/fr.json b/compiled-lang/fr.json
@@ -1259,6 +1259,12 @@
       "value": "Sur"
     }
   ],
+  "nav.blog": [
+    {
+      "type": 0,
+      "value": "Blog"
+    }
+  ],
   "nav.contact": [
     {
       "type": 0,

diff --git a/compiled-lang/it.json b/compiled-lang/it.json
@@ -1267,6 +1267,12 @@
       "value": "Di"
     }
   ],
+  "nav.blog": [
+    {
+      "type": 0,
+      "value": "Blog"
+    }
+  ],
   "nav.contact": [
     {
       "type": 0,

diff --git a/compiled-lang/ja.json b/compiled-lang/ja.json
@@ -1259,6 +1259,12 @@
       "value": "私たちについて"
     }
   ],
+  "nav.blog": [
+    {
+      "type": 0,
+      "value": "Blog"
+    }
+  ],
   "nav.contact": [
     {
       "type": 0,

diff --git a/compiled-lang/pt.json b/compiled-lang/pt.json
@@ -1267,6 +1267,12 @@
       "value": "Sobre nós"
     }
   ],
+  "nav.blog": [
+    {
+      "type": 0,
+      "value": "Blog"
+    }
+  ],
   "nav.contact": [
     {
       "type": 0,

diff --git a/lang/en.json b/lang/en.json
@@ -455,6 +455,9 @@
   "org.titleNewOrg": {
     "message": "Send GDPR, CCPA and LGPD Data Deletion and Access Requests"
   },
+  "orgHero.imageAlt": {
+    "message": "Organization logo"
+  },
   "orgHero.newOrgTitle": {
     "message": "Delete or Get a Copy of Your Personal Data."
   },

diff --git a/src/components/Footer/index.js b/src/components/Footer/index.js
@@ -70,10 +70,8 @@ const styles = (theme) => ({
   },
   VercelLogo: {
     height: "1.8em",
-    marginTop: "5px",
-    [theme.breakpoints.up('md')]: {
-      marginLeft: "-27px",
-    },    
+    width: "auto",
+    marginTop: "5px",   
   }
 });
 

diff --git a/src/components/Nav/index.js b/src/components/Nav/index.js
@@ -16,6 +16,7 @@ import TWGrey from "../../../public/images/sh/tw-grey.svg";
 import Logo from "../../../public/images/type.svg";
 import CloseIcon from "../../../public/images/close-icon.svg";
 import HamburgerIcon from "../../../public/images/hamburgerIcon.svg";
+import Button from "@mui/material/Button";
 
 const trackSearchButtonLinkClick = (device) => {
   tracking.trackSearchButtonLinkClick(device);
@@ -111,17 +112,19 @@ const NavListDesktop = ({ classes, router, handleLangChange }) => {
       </li>
 
       <li>
-        <a
+        <Button
+          onClick={() => trackDonateButtonLinkClick("nav desktop")}
+          variant="contained"
+          color="secondary"
           href="https://opencollective.com/consciousdigital"
           target="_blank"
           className={classes.DonateRedButtonDesktop}
           tabIndex={0}
-          onClick={() => trackDonateButtonLinkClick("nav desktop")}
         >
           <Typography component="span" className={classes.linkButton}>
             <FormattedMessage id="nav.donate" defaultMessage="Make a Donation"/>
           </Typography>
-        </a>
+        </Button>        
       </li>
 
     </ul>
@@ -191,20 +194,23 @@ const NavListMobile = ({ classes, mobileNavOpen, toggleMobileNav, router, handle
             <FormattedMessage id="nav.helpTranslate" defaultMessage="Help translate" />
           </MenuItem>             
         </Select>
-        <a
-          href="https://opencollective.com/consciousdigital"
-          target="_blank"
-          className={classes.DonateRedButton}
-          tabIndex={0}
+
+        <Button
           onClick={() => {
             toggleMobileNav();
             trackDonateButtonLinkClick("nav mobile");
           }}
+          variant="contained"
+          color="secondary"
+          href="https://opencollective.com/consciousdigital"
+          target="_blank"
+          className={classes.DonateRedButton}
+          tabIndex={0}
         >
           <Typography component="span" className={classes.linkButton}>
             <FormattedMessage id="nav.donate" defaultMessage="Make a Donation"/>
           </Typography>
-        </a>
+        </Button>  
 
         <NavItem
           onClickHandler={toggleMobileNav}
@@ -327,7 +333,7 @@ class Nav extends Component {
       <div>
         <nav ref={this.toggleMenu} className={classes.nav}>
           <a className={classes.logoLink} href="/">
-            <Image className={classes.logo} src={Logo} tabIndex={0} />
+            <Image className={classes.logo} alt="YourDigitalRights.org" src={Logo} tabIndex={0} />
           </a>
           <NavListDesktop 
             classes={classes} 

diff --git a/src/components/Nav/styles.js b/src/components/Nav/styles.js
@@ -22,7 +22,7 @@ const Theme = (theme) => ({
     logo: {
         width: "90px",
         outlineColor: "#e8f4f8",
-
+        height: "auto",
         [theme.breakpoints.down('sm')]: {
             width: "80px",
         },
@@ -53,7 +53,6 @@ const Theme = (theme) => ({
         fontSize: "14px",
         textAlign: "center",
         textDecoration: "none",
-        outlineColor: "#e8f4f8",
         textTransform: "uppercase",
     },
     subsectionLink: {
@@ -173,42 +172,20 @@ const Theme = (theme) => ({
     },
     DonateRedButtonDesktop: {
         display: "flex",
-        justifyContent: "center",
         alignItems: "center",
-        width: "auto",
         height: "40px",
         backgroundColor: "#ef6a6e",
-        fontSize: "14px",
-        fontWeight: "800",
-        fontStyle: "normal",
-        fontStretch: "normal",
-        lineHeight: "1.15",
-        color: "#ffffff",
         borderRadius: "25px",
-        outlineColor: "#e8f4f8",
-        cursor: "pointer",
-        marginRight: "24px",
         paddingLeft: "20px",
         paddingRight: "20px",
         textDecoration: "none",
     },    
     OptOutRedButtonDesktop: {
         display: "flex",
-        justifyContent: "center",
         alignItems: "center",
-        width: "auto",
         height: "40px",
         backgroundColor: "#ef6a6e",
-        fontSize: "14px",
-        fontWeight: "800",
-        fontStyle: "normal",
-        fontStretch: "normal",
-        lineHeight: "1.15",
-        color: "#ffffff",
         borderRadius: "25px",
-        outlineColor: "#e8f4f8",
-        cursor: "pointer",
-        marginRight: "24px",
         paddingLeft: "20px",
         paddingRight: "20px",
         textDecoration: "none",

diff --git a/src/components/OrgHero/index.js b/src/components/OrgHero/index.js
@@ -43,6 +43,7 @@ const Hero = ({ classes, selectedCompany }) => {
               width={44}
               height={44}
               fallbackSrc="/images/Keep-it-private.png"
+              alt="Organization logo"
             />
           </div>
         )}