From 4fc55b6feed6b9a29c03b7324431a1dc2824b3e6 Mon Sep 17 00:00:00 2001
From: sfisher <scott.fisher@ucop.edu>
Date: Wed, 13 Nov 2024 15:07:45 -0800
Subject: [PATCH] The X button was not showing up at all in Chrome.  This fixes
 that problem by adding to styles and re-compiling the SVG.

---
 dev/images/icon_cross.svg            | 17 +++--------------
 dev/scss/_login-modal.scss           |  1 +
 static_src/images/icon_cross.svg     | 22 +++-------------------
 static_src/stylesheets/main2.min.css |  4 +++-
 4 files changed, 10 insertions(+), 34 deletions(-)
 mode change 100755 => 100644 dev/images/icon_cross.svg

diff --git a/dev/images/icon_cross.svg b/dev/images/icon_cross.svg
old mode 100755
new mode 100644
index ba2b3cc1f..a037959bd
--- a/dev/images/icon_cross.svg
+++ b/dev/images/icon_cross.svg
@@ -1,14 +1,3 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="470px" height="470px" viewBox="0 0 470 470" style="fill:rgb(0,119,138);"
-	 xml:space="preserve">
-<g>
-	<path d="M310.4,235.083L459.88,85.527c12.545-12.546,12.545-32.972,0-45.671L429.433,9.409c-12.547-12.546-32.971-12.546-45.67,0
-		L234.282,158.967L85.642,10.327c-12.546-12.546-32.972-12.546-45.67,0L9.524,40.774c-12.546,12.546-12.546,32.972,0,45.671
-		l148.64,148.639L9.678,383.495c-12.546,12.546-12.546,32.971,0,45.67l30.447,30.447c12.546,12.546,32.972,12.546,45.67,0
-		l148.487-148.41l148.792,148.793c12.547,12.546,32.973,12.546,45.67,0l30.447-30.447c12.547-12.546,12.547-32.972,0-45.671
-		L310.4,235.083z"/>
-</g>
-
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="470" height="470" style="fill:#00778a" xml:space="preserve">
+  <path d="M310.4 235.083 459.88 85.527c12.545-12.546 12.545-32.972 0-45.671L429.433 9.409c-12.547-12.546-32.971-12.546-45.67 0L234.282 158.967 85.642 10.327c-12.546-12.546-32.972-12.546-45.67 0L9.524 40.774c-12.546 12.546-12.546 32.972 0 45.671l148.64 148.639L9.678 383.495c-12.546 12.546-12.546 32.971 0 45.67l30.447 30.447c12.546 12.546 32.972 12.546 45.67 0l148.487-148.41 148.792 148.793c12.547 12.546 32.973 12.546 45.67 0l30.447-30.447c12.547-12.546 12.547-32.972 0-45.671L310.4 235.083z"/>
+</svg>
diff --git a/dev/scss/_login-modal.scss b/dev/scss/_login-modal.scss
index 245e7808e..7c204d6b3 100644
--- a/dev/scss/_login-modal.scss
+++ b/dev/scss/_login-modal.scss
@@ -33,6 +33,7 @@
 	padding: 2px;
 	background-color: $design-white-color;
 	cursor: pointer;
+	object-fit: contain; // Or "cover" depending on the fit you need
 }
 
 .login-modal__form {
diff --git a/static_src/images/icon_cross.svg b/static_src/images/icon_cross.svg
index 6de30c8bb..a037959bd 100644
--- a/static_src/images/icon_cross.svg
+++ b/static_src/images/icon_cross.svg
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-  - Copyright©2021, Regents of the University of California
-  - http://creativecommons.org/licenses/BSD
-  -->
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="470px" height="470px" viewBox="0 0 470 470" style="fill:rgb(0,119,138);"
-	 xml:space="preserve">
-<g>
-	<path d="M310.4,235.083L459.88,85.527c12.545-12.546,12.545-32.972,0-45.671L429.433,9.409c-12.547-12.546-32.971-12.546-45.67,0
-		L234.282,158.967L85.642,10.327c-12.546-12.546-32.972-12.546-45.67,0L9.524,40.774c-12.546,12.546-12.546,32.972,0,45.671
-		l148.64,148.639L9.678,383.495c-12.546,12.546-12.546,32.971,0,45.67l30.447,30.447c12.546,12.546,32.972,12.546,45.67,0
-		l148.487-148.41l148.792,148.793c12.547,12.546,32.973,12.546,45.67,0l30.447-30.447c12.547-12.546,12.547-32.972,0-45.671
-		L310.4,235.083z"/>
-</g>
-
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="470" height="470" style="fill:#00778a" xml:space="preserve">
+  <path d="M310.4 235.083 459.88 85.527c12.545-12.546 12.545-32.972 0-45.671L429.433 9.409c-12.547-12.546-32.971-12.546-45.67 0L234.282 158.967 85.642 10.327c-12.546-12.546-32.972-12.546-45.67 0L9.524 40.774c-12.546 12.546-12.546 32.972 0 45.671l148.64 148.639L9.678 383.495c-12.546 12.546-12.546 32.971 0 45.67l30.447 30.447c12.546 12.546 32.972 12.546 45.67 0l148.487-148.41 148.792 148.793c12.547 12.546 32.973 12.546 45.67 0l30.447-30.447c12.547-12.546 12.547-32.972 0-45.671L310.4 235.083z"/>
+</svg>
diff --git a/static_src/stylesheets/main2.min.css b/static_src/stylesheets/main2.min.css
index 11c7a4c53..2d946b0ed 100644
--- a/static_src/stylesheets/main2.min.css
+++ b/static_src/stylesheets/main2.min.css
@@ -1521,7 +1521,9 @@ Selector pattern using above mixin:
   height: 15px;
   padding: 2px;
   background-color: white;
-  cursor: pointer; }
+  cursor: pointer;
+  -o-object-fit: contain;
+     object-fit: contain; }
 
 .login-modal__form {
   display: -webkit-box;