fix svgs

maproulette · Feb 15, 2025 · a502ed6 · a502ed6
1 parent 7bbeeb9
commit a502ed6
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 45 deletions.
diff --git a/src/components/Footer/Footer.jsx b/src/components/Footer/Footer.jsx
@@ -46,14 +46,17 @@ class Footer extends Component {
                 target="_blank"
                 rel="noopener noreferrer"
                 className="mr-block hover:mr-opacity-90 mr-transition-opacity"
+                aria-label={<FormattedMessage {...messages.osmLink} />}
               >
                 <img src={img} alt="OpenStreetMap" className="mr-h-20 mr-w-auto" />
               </a>
             </div>
 
             {/* Version Info Section */}
             <div className="md:mr-col-span-1">
-              <h3 className="mr-text-green-lighter mr-text-sm mr-font-medium mr-mb-4">VERSIONS</h3>
+              <h3 className="mr-text-green-lighter mr-text-sm mr-font-medium mr-mb-4">
+                <FormattedMessage {...messages.versionsHeading} />
+              </h3>
               <div className="mr-space-y-2">
                 <p className="mr-text-white mr-text-sm">
                   <FormattedMessage {...messages.versionLabel} />{" "}
@@ -80,7 +83,9 @@ class Footer extends Component {
 
             {/* Links Section */}
             <div className="md:mr-col-span-1">
-              <h3 className="mr-text-green-lighter mr-text-sm mr-font-medium mr-mb-4">RESOURCES</h3>
+              <h3 className="mr-text-green-lighter mr-text-sm mr-font-medium mr-mb-4">
+                <FormattedMessage {...messages.linksHeading} />
+              </h3>
               <ul className="mr-space-y-2">
                 <li>
                   <a
@@ -133,21 +138,28 @@ class Footer extends Component {
             {/* Donate Section */}
             <div className="md:mr-col-span-1">
               <h3 className="mr-text-green-lighter mr-text-sm mr-font-medium mr-mb-4">
-                SUPPORT US
+                <FormattedMessage {...messages.donateHeading} />
               </h3>
               <a
                 href="https://openstreetmap.app.neoncrm.com/forms/maproulette"
                 target="_blank"
                 rel="noopener noreferrer"
-                className="mr-inline-block mr-text-sm mr-font-medium mr-text-white mr-bg-green-600 mr-rounded-md hover:mr-bg-green-500 mr-transition-colors mr-shadow-sm"
+                className="mr-inline-flex mr-items-center mr-text-white mr-text-sm hover:mr-text-green-300 mr-transition-colors"
               >
+                <SvgSymbol
+                  sym="icon-donation"
+                  viewBox="0 0 20 20"
+                  className="mr-w-4 mr-h-4 mr-mr-2 mr-fill-current"
+                />
                 <FormattedMessage {...messages.donateButton} />
               </a>
             </div>
 
             {/* Social Section */}
             <div className="md:mr-col-span-1">
-              <h3 className="mr-text-green-lighter mr-text-sm mr-font-medium mr-mb-4">FOLLOW US</h3>
+              <h3 className="mr-text-green-lighter mr-text-sm mr-font-medium mr-mb-4">
+                <FormattedMessage {...messages.socialHeading} />
+              </h3>
               <a
                 href="https://en.osm.town/@MapRoulette"
                 target="_blank"
@@ -156,10 +168,10 @@ class Footer extends Component {
               >
                 <SvgSymbol
                   sym="icon-mastodon"
-                  viewBox="0 0 30 24"
-                  className="mr-w-5 mr-h-5 mr-mr-2 mr-fill-current"
+                  viewBox="0 0 20 20"
+                  className="mr-w-4 mr-h-4 mr-mr-2 mr-fill-current"
                 />
-                <span>@maproulette</span>
+                <FormattedMessage {...messages.mastodonButton} />
               </a>
             </div>
           </div>

diff --git a/src/components/Footer/Messages.js b/src/components/Footer/Messages.js
@@ -53,4 +53,28 @@ export default defineMessages({
     id: "Footer.email.donateButton",
     defaultMessage: "Donate to Maproulette",
   },
+
+  mastodonButton: {
+    id: "Footer.email.mastodonButton",
+    defaultMessage: "Mastodon @maproulette",
+  },
+
+  versionsHeading: {
+    id: "Footer.versions.heading",
+    defaultMessage: "VERSIONS",
+  },
+
+  linksHeading: {
+    id: "Footer.links.heading",
+    defaultMessage: "LINKS",
+  },
+
+  socialHeading: {
+    id: "Footer.social.heading",
+    defaultMessage: "FOLLOW US",
+  },
+  donateHeading: {
+    id: "Footer.donate.heading",
+    defaultMessage: "SUPPORT US",
+  },
 });
diff --git a/src/components/FundraisingNotices/FundraisingNotices.jsx b/src/components/FundraisingNotices/FundraisingNotices.jsx
@@ -16,7 +16,7 @@ const FundraisingNotices = function (props) {
       <span className="mr-flex mr-items-center">
         <SvgSymbol
           sym="icon-donation"
-          viewBox="0 0 40 50"
+          viewBox="0 0 40 40"
           className="mr-w-10 mr-w-10 mr-cursor-pointer mr-mx-4"
         />
         <MarkdownContent markdown={notice.message} className="mr-markdown--base" />

diff --git a/src/components/Sprites/Sprites.jsx b/src/components/Sprites/Sprites.jsx
@@ -324,44 +324,12 @@ export default function () {
           />
         </symbol>
 
-        <symbol id="icon-mastodon" viewBox="0 0 30 24">
-          <path
-            d="M11.19 12.195c2.016-.24 3.77-1.475 3.99-2.603.348-1.778.32-4.339.32-4.339 0-3.47-2.286-4.488-2.286-4.488C12.062.238 10.083.017 8.027 0h-.05C5.92.017 3.942.238 2.79.765c0 0-2.285 1.017-2.285 4.488l-.002.662c-.004.64-.007 1.35.011 2.091.083 3.394.626 6.74 3.78 7.57 1.454.383 2.703.463 3.709.408 1.823-.1 2.847-.647 2.847-.647l-.06-1.317s-1.303.41-2.767.36c-1.45-.05-2.98-.156-3.215-1.928a3.614 3.614 0 0 1-.033-.496s1.424.346 3.228.428c1.103.05 2.137-.064 3.188-.189zm1.613-2.47H11.13v-4.08c0-.859-.364-1.295-1.091-1.295-.804 0-1.207.517-1.207 1.541v2.233H7.168V5.89c0-1.024-.403-1.541-1.207-1.541-.727 0-1.091.436-1.091 1.296v4.079H3.197V5.522c0-.859.22-1.541.66-2.046.456-.505 1.052-.764 1.793-.764.856 0 1.504.328 1.933.983L8 4.39l.417-.695c.429-.655 1.077-.983 1.934-.983.74 0 1.336.259 1.791.764.442.505.661 1.187.661 2.046v4.203z"
-            transform="translate(0 5)"
-          />
+        <symbol id="icon-mastodon" viewBox="0 0 20 20">
+          <path d="M11.19 12.195c2.016-.24 3.77-1.475 3.99-2.603.348-1.778.32-4.339.32-4.339 0-3.47-2.286-4.488-2.286-4.488C12.062.238 10.083.017 8.027 0h-.05C5.92.017 3.942.238 2.79.765c0 0-2.285 1.017-2.285 4.488l-.002.662c-.004.64-.007 1.35.011 2.091.083 3.394.626 6.74 3.78 7.57 1.454.383 2.703.463 3.709.408 1.823-.1 2.847-.647 2.847-.647l-.06-1.317s-1.303.41-2.767.36c-1.45-.05-2.98-.156-3.215-1.928a3.614 3.614 0 0 1-.033-.496s1.424.346 3.228.428c1.103.05 2.137-.064 3.188-.189zm1.613-2.47H11.13v-4.08c0-.859-.364-1.295-1.091-1.295-.804 0-1.207.517-1.207 1.541v2.233H7.168V5.89c0-1.024-.403-1.541-1.207-1.541-.727 0-1.091.436-1.091 1.296v4.079H3.197V5.522c0-.859.22-1.541.66-2.046.456-.505 1.052-.764 1.793-.764.856 0 1.504.328 1.933.983L8 4.39l.417-.695c.429-.655 1.077-.983 1.934-.983.74 0 1.336.259 1.791.764.442.505.661 1.187.661 2.046v4.203z" />
         </symbol>
 
-        <symbol id="icon-donation" viewBox="0 0 30 24">
-          <path
-            fill="#FF92A5"
-            d="M16 6.27975C16 6.88118 15.7625 7.45883 15.3383 7.88611C14.3619 8.87007 13.415 9.89605 12.4021 10.8443C12.17 11.0585 11.8017 11.0507 11.5795 10.8268L8.6615 7.88611C7.7795 6.99725 7.7795 5.56225 8.6615 4.67339C9.55218 3.77579 11.0032 3.77579 11.8938 4.67339L11.9999 4.78027L12.1059 4.67345C12.533 4.24286 13.1146 4 13.7221 4C14.3297 4 14.9113 4.24284 15.3383 4.67339C15.7625 5.10073 16 5.67835 16 6.27975Z"
-            stroke="currentColor"
-            strokeLinejoin="round"
-          />
-          <path
-            d="M18 20L21.8243 16.1757C21.9368 16.0632 22 15.9106 22 15.7515V10.5C22 9.67157 21.3284 9 20.5 9V9C19.6716 9 19 9.67157 19 10.5V15"
-            stroke="currentColor"
-            strokeLinecap="round"
-            strokeLinejoin="round"
-          />
-          <path
-            d="M18 16L18.8581 15.1419C18.949 15.051 19 14.9278 19 14.7994V14.7994C19 14.6159 18.8963 14.4482 18.7322 14.3661L18.2893 14.1447C17.5194 13.7597 16.5894 13.9106 15.9807 14.5193L15.0858 15.4142C14.7107 15.7893 14.5 16.298 14.5 16.8284V20"
-            stroke="currentColor"
-            strokeLinecap="round"
-            strokeLinejoin="round"
-          />
-          <path
-            d="M6 20L2.17574 16.1757C2.06321 16.0632 2 15.9106 2 15.7515V10.5C2 9.67157 2.67157 9 3.5 9V9C4.32843 9 5 9.67157 5 10.5V15"
-            stroke="currentColor"
-            strokeLinecap="round"
-            strokeLinejoin="round"
-          />
-          <path
-            d="M6 16L5.14187 15.1419C5.05103 15.051 5 14.9278 5 14.7994V14.7994C5 14.6159 5.10366 14.4482 5.26776 14.3661L5.71067 14.1447C6.48064 13.7597 7.41059 13.9106 8.01931 14.5193L8.91421 15.4142C9.28929 15.7893 9.5 16.298 9.5 16.8284V20"
-            stroke="currentColor"
-            strokeLinecap="round"
-            strokeLinejoin="round"
-          />
+        <symbol id="icon-donation" viewBox="0 0 20 20">
+          <path d="M10 3.22l-.61-.6a5.5 5.5 0 0 0-7.78 7.77L10 18.78l8.39-8.4a5.5 5.5 0 0 0-7.78-7.77l-.61.61z" />
         </symbol>
 
         <symbol id="mr-logo" viewBox="0 0 174 40">