Fixes for SVG in Safari

Josh-Cena · Josh-Cena · commit 98f5fc0fcb44 · 2023-11-06T11:59:11.000-05:00
diff --git a/assets/discord-logo.svg b/assets/discord-logo.svg
@@ -1,4 +1,4 @@
-<svg viewBox="2 2 20 20" xmlns="http://www.w3.org/2000/svg">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="2 2 20 20">
   <title>My Discord</title>
   <path
     fill="#5865F2"
diff --git a/assets/github-logo.svg b/assets/github-logo.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 20 20" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
   <title>My GitHub</title>
   <g transform="translate(-84.000000, -7399.000000)">
     <path
diff --git a/assets/linkedin-logo.svg b/assets/linkedin-logo.svg
@@ -1,4 +1,4 @@
-<svg version="1.1" viewBox="-30 -30 370 370">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-30 -30 370 370">
   <title>My LinkedIn</title>
 	<g fill="#0077B5">
 		<path
diff --git a/assets/mail-logo.svg b/assets/mail-logo.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 -3.5 32 32" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -3.5 32 32">
   <title>My email</title>
   <g transform="translate(-414.000000, -261.000000)">
     <path
diff --git a/assets/moon-icon.svg b/assets/moon-icon.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 24 24">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path
     d="M9.37,5.51C9.19,6.15,9.1,6.82,9.1,7.5c0,4.08,3.32,7.4,7.4,7.4c0.68,0,1.35-0.09,1.99-0.27C17.45,17.19,14.93,19,12,19 c-3.86,0-7-3.14-7-7C5,9.07,6.81,6.55,9.37,5.51z M12,3c-4.97,0-9,4.03-9,9s4.03,9,9,9s9-4.03,9-9c0-0.46-0.04-0.92-0.1-1.36 c-0.98,1.37-2.58,2.26-4.4,2.26c-2.98,0-5.4-2.42-5.4-5.4c0-1.81,0.89-3.42,2.26-4.4C12.92,3.04,12.46,3,12,3L12,3z"
   />
diff --git a/assets/sun-icon.svg b/assets/sun-icon.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 24 24">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path
     d="M12,9c1.65,0,3,1.35,3,3s-1.35,3-3,3s-3-1.35-3-3S10.35,9,12,9 M12,7c-2.76,0-5,2.24-5,5s2.24,5,5,5s5-2.24,5-5 S14.76,7,12,7L12,7z M2,13l2,0c0.55,0,1-0.45,1-1s-0.45-1-1-1l-2,0c-0.55,0-1,0.45-1,1S1.45,13,2,13z M20,13l2,0c0.55,0,1-0.45,1-1 s-0.45-1-1-1l-2,0c-0.55,0-1,0.45-1,1S19.45,13,20,13z M11,2v2c0,0.55,0.45,1,1,1s1-0.45,1-1V2c0-0.55-0.45-1-1-1S11,1.45,11,2z M11,20v2c0,0.55,0.45,1,1,1s1-0.45,1-1v-2c0-0.55-0.45-1-1-1C11.45,19,11,19.45,11,20z M5.99,4.58c-0.39-0.39-1.03-0.39-1.41,0 c-0.39,0.39-0.39,1.03,0,1.41l1.06,1.06c0.39,0.39,1.03,0.39,1.41,0s0.39-1.03,0-1.41L5.99,4.58z M18.36,16.95 c-0.39-0.39-1.03-0.39-1.41,0c-0.39,0.39-0.39,1.03,0,1.41l1.06,1.06c0.39,0.39,1.03,0.39,1.41,0c0.39-0.39,0.39-1.03,0-1.41 L18.36,16.95z M19.42,5.99c0.39-0.39,0.39-1.03,0-1.41c-0.39-0.39-1.03-0.39-1.41,0l-1.06,1.06c-0.39,0.39-0.39,1.03,0,1.41 s1.03,0.39,1.41,0L19.42,5.99z M7.05,18.36c0.39-0.39,0.39-1.03,0-1.41c-0.39-0.39-1.03-0.39-1.41,0l-1.06,1.06 c-0.39,0.39-0.39,1.03,0,1.41s1.03,0.39,1.41,0L7.05,18.36z"
   />
diff --git a/assets/twitter-logo.svg b/assets/twitter-logo.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 -2 20 20" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -2 20 20">
   <title>My Twitter</title>
   <g transform="translate(-4, -7361.000000)">
     <path
diff --git a/assets/x-logo.svg b/assets/x-logo.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 300 300" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 300">
   <path
     d="M178.57 127.15 290.27 0h-26.46l-97.03 110.38L89.34 0H0l117.13 166.93L0 300.25h26.46l102.4-116.59 81.8 116.59h89.34M36.01 19.54H76.66l187.13 262.13h-40.66" />
 </svg>
diff --git a/assets/zhihu-logo.svg b/assets/zhihu-logo.svg
@@ -1,4 +1,4 @@
-<svg viewBox="50 50 924 924">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="50 50 924 924">
   <title>My 知乎 (Zhihu)</title>
   <path
     fill="#066DD8"
diff --git a/src/Layout/Navbar/ColorModeToggle/index.module.css b/src/Layout/Navbar/ColorModeToggle/index.module.css
@@ -14,6 +14,7 @@
 
 .icon {
   padding: 0.2rem;
+  width: 100%;
   color: var(--color-text);
   fill: var(--color-text);
 }
diff --git a/src/components/Scrolly/Elements.module.css b/src/components/Scrolly/Elements.module.css
@@ -66,4 +66,5 @@
 
 .eyebrow {
   animation: raising 10s infinite;
+  fill: var(--color-text);
 }
diff --git a/src/components/Scrolly/Elements.tsx b/src/components/Scrolly/Elements.tsx
@@ -48,7 +48,7 @@ function ScrollyElements(
   const cSizeH = getVal(cSizeHs);
   const textSize = getVal(textSizes);
   const { colorMode } = useColorMode();
-  const jColors = colorMode === "dark" ? [1, 1] : [0, 1];
+  const jColors = colorMode === "dark" ? [255, 255] : [0, 255];
   return (
     <svg
       ref={ref}
@@ -67,8 +67,9 @@ function ScrollyElements(
           }, ${getVal(jCenterXs) - (jCenterOrig.x * jSizeW) / jSizeOrig.w}, ${
             getVal(jCenterYs) - (jCenterOrig.y * jSizeH) / jSizeOrig.h
           })`}
-          fill="var(--color-text)"
-          filter={`brightness(${getVal(jColors)})`}
+          fill={`rgb(${getVal(jColors)}, ${getVal(jColors)}, ${getVal(
+            jColors,
+          )})`}
           d="m 25.000024,33.983972 c 0,6.666603 0,13.333209 0,19.999811 21.206457,0 42.412914,0 63.619371,0 C 76.268383,84.308203 63.917371,114.63262 51.56636,144.95704 43.949254,138.6582 36.332149,132.35936 28.715044,126.06052 c -4.215592,5.09771 -8.431183,10.19542 -12.646774,15.29312 14.560523,12.04027 29.121047,24.08053 43.68157,36.1208 16.765902,-41.16356 33.531802,-82.327105 50.2977,-123.490657 21.65088,0 43.30175,0 64.95263,0 0,-6.666602 0,-13.333208 0,-19.999811 -50.00005,0 -100.000099,0 -150.000146,0 z"
         />
         <path
@@ -85,7 +86,7 @@ function ScrollyElements(
           x={getVal(text1Xs)}
           y={getVal(text1Ys)}
           fontSize={textSize}
-          fill="white">
+          fill="var(--color-text)">
           {/* cSpell:ignore oshua */}
           {getVal([0, 1]) > 0.5 ? "oshua" : ""}
         </text>
diff --git a/src/pages/about/index.tsx b/src/pages/about/index.tsx
@@ -78,7 +78,7 @@ export default function About(): JSX.Element {
         className={styles.pdf}
         aria-label="Open as PDF"
         title="Open as PDF">
-        <svg viewBox="0 0 1920 1920" xmlns="http://www.w3.org/2000/svg">
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1920 1920">
           <g>
             <path d="M1251.654 0c44.499 0 88.207 18.07 119.718 49.581l329.223 329.224c31.963 31.962 49.581 74.54 49.581 119.717V1920H169V0Zm-66.183 112.941H281.94V1807.06h1355.294V564.706H1185.47V112.94Zm112.94 23.379v315.445h315.445L1298.412 136.32Z" />
             <path d="M900.497 677.67c26.767 0 50.372 12.65 67.991 37.835 41.901 59.068 38.965 121.976 23.492 206.682-5.308 29.14.113 58.617 16.263 83.125 22.814 34.786 55.68 82.673 87.981 123.219 23.718 29.93 60.198 45.854 97.13 40.885 23.718-3.276 52.292-5.986 81.656-5.986 131.012 0 121.186 46.757 133.045 89.675 6.55 25.976 3.275 48.678-10.165 65.506-16.715 22.701-51.162 34.447-101.534 34.447-55.793 0-74.202-9.487-122.767-24.96-27.445-8.81-55.906-10.617-83.69-3.275-55.453 14.456-146.936 36.48-223.284 46.983-40.772 5.647-77.816 26.654-102.438 60.875-55.454 76.8-106.842 148.518-188.273 148.518-21.007 0-40.32-7.567-56.244-22.701-23.492-23.492-33.544-49.581-28.574-79.85 13.778-92.95 128.075-144.79 196.066-182.625 16.037-8.923 28.687-22.589 36.592-39.53l107.86-233.223c7.68-16.377 10.051-34.56 7.228-52.518-12.537-79.059-31.06-211.99 18.748-272.075 10.955-13.44 26.09-21.007 42.917-21.007Zm20.556 339.953c-43.257 126.607-119.718 264.282-129.996 280.32 92.273-43.37 275.916-65.28 275.916-65.28-92.386-88.998-145.92-215.04-145.92-215.04Z" />
diff --git a/src/pages/tools/color-converter/index.tsx b/src/pages/tools/color-converter/index.tsx
@@ -120,9 +120,9 @@ function CopiableColor({ colorString }: { readonly colorString: string }) {
       <code>{colorString}</code>
       {copied ? (
         <svg
+          xmlns="http://www.w3.org/2000/svg"
           viewBox="0 0 24 24"
           fill="none"
-          xmlns="http://www.w3.org/2000/svg"
           className={styles.copyIcon}>
           <path
             d="M4.89163 13.2687L9.16582 17.5427L18.7085 8"
@@ -134,9 +134,9 @@ function CopiableColor({ colorString }: { readonly colorString: string }) {
         </svg>
       ) : (
         <svg
+          xmlns="http://www.w3.org/2000/svg"
           viewBox="0 0 24 24"
           fill="none"
-          xmlns="http://www.w3.org/2000/svg"
           className={styles.copyIcon}>
           <path
             fillRule="evenodd"

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`
`15`	`15`	`.icon {`
`16`	`16`	`padding: 0.2rem;`
	`17`	`+ width: 100%;`
`17`	`18`	`color: var(--color-text);`
`18`	`19`	`fill: var(--color-text);`
`19`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,4 +66,5 @@`
`66`	`66`
`67`	`67`	`.eyebrow {`
`68`	`68`	`animation: raising 10s infinite;`
	`69`	`+ fill: var(--color-text);`
`69`	`70`	`}`