Santa (#1299)

UltiMafia · Dec 13, 2023 · a699d84 · a699d84
1 parent bc1a72d
commit a699d84
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 14 deletions.
diff --git a/react_main/public/images/santahat.png b/react_main/public/images/santahat.png
diff --git a/react_main/src/css/user.css b/react_main/src/css/user.css
@@ -65,8 +65,11 @@ iframe {
   align-items: center;
   justify-content: center;
 
-  width: 100%;
-  height: 100%;
+  /* width: 100%;
+  height: 100%; */
+  width: inherit;
+  height: inherit;
+  position: fixed;
 
   border-radius: 50px;
 

diff --git a/react_main/src/pages/User/User.jsx b/react_main/src/pages/User/User.jsx
@@ -171,6 +171,8 @@ export function Avatar(props) {
   const avatarId = props.avatarId;
   const deckProfile = props.deckProfile;
 
+  const santaDir = "/images/santahat.png";
+
   const siteInfo = useContext(SiteInfoContext);
   const style = {};
   const colors = [
@@ -214,19 +216,39 @@ export function Avatar(props) {
     style.backgroundColor = colors[Math.floor(rand * colors.length)];
   }
 
+  var santaWidth;
+  var santaHorizAdjust;
+  var santaVertAdjust;
+
+  if (large) {
+    santaWidth = "100px";
+    santaHorizAdjust = -35;
+    santaVertAdjust = -40;
+  } else if (small) {
+    santaWidth = "20px;"
+    santaHorizAdjust = -5;
+    santaVertAdjust = -8;
+  }
+  else {
+    santaWidth = "40px";
+    santaHorizAdjust = -12;
+    santaVertAdjust = -15;
+  }
+
   return (
-    <div
-      className={`avatar ${size} ${dead ? "dead" : ""} ${
-        active ? "active" : ""
-      }`}
-      style={style}
-    >
-      {edit && (
-        <HiddenUpload className="edit" name="avatar" onFileUpload={onUpload}>
-          <i className="far fa-file-image" />
-        </HiddenUpload>
-      )}
-    </div>
+      <div
+        className={`avatar ${size} ${dead ? "dead" : ""} ${
+          active ? "active" : ""
+        }`}
+        style={style}
+      >
+        {edit && (
+          <HiddenUpload className="edit" name="avatar" onFileUpload={onUpload}>
+            <i className="far fa-file-image" />
+          </HiddenUpload>
+        )}
+        <img className="santa" width={santaWidth} style={{position: "relative", top: santaVertAdjust, left: santaHorizAdjust}} src={santaDir}></img>
+      </div>
   );
 }