From 40c540a1cc9c8478bf5c87bb44714449d4b8674c Mon Sep 17 00:00:00 2001
From: Jacob Shandling <61553566+jacobshandling@users.noreply.github.com>
Date: Thu, 6 Apr 2023 13:12:41 -0700
Subject: [PATCH] UI: org logo bug fix (#11018)

---
 changes/10981-org-logo-clickable-outside-nav          | 1 +
 frontend/components/icons/OrgLogoIcon/OrgLogoIcon.jsx | 5 ++++-
 frontend/components/icons/OrgLogoIcon/_styles.scss    | 6 +++++-
 frontend/components/top_nav/SiteTopNav/_styles.scss   | 1 -
 4 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 changes/10981-org-logo-clickable-outside-nav

diff --git a/changes/10981-org-logo-clickable-outside-nav b/changes/10981-org-logo-clickable-outside-nav
new file mode 100644
index 0000000000..1b25bc7a79
--- /dev/null
+++ b/changes/10981-org-logo-clickable-outside-nav
@@ -0,0 +1 @@
+- Fixed a bug where for certain org logos, the user could still click on it even outside the navbar
diff --git a/frontend/components/icons/OrgLogoIcon/OrgLogoIcon.jsx b/frontend/components/icons/OrgLogoIcon/OrgLogoIcon.jsx
index 135b3895ea..063d808108 100644
--- a/frontend/components/icons/OrgLogoIcon/OrgLogoIcon.jsx
+++ b/frontend/components/icons/OrgLogoIcon/OrgLogoIcon.jsx
@@ -72,7 +72,10 @@ class OrgLogoIcon extends Component {
     const { imageSrc } = this.state;
     const { onError } = this;
 
-    const classNames = classnames(baseClass, className);
+    const classNames =
+      imageSrc === fleetAvatar
+        ? classnames(baseClass, className, "default-fleet-logo")
+        : classnames(baseClass, className);
 
     return (
       <img
diff --git a/frontend/components/icons/OrgLogoIcon/_styles.scss b/frontend/components/icons/OrgLogoIcon/_styles.scss
index f6c05d1c6c..93d47fae36 100644
--- a/frontend/components/icons/OrgLogoIcon/_styles.scss
+++ b/frontend/components/icons/OrgLogoIcon/_styles.scss
@@ -1,4 +1,8 @@
 .org-logo-icon {
   // ensures consistant nav bar height regardless of the logo image used
-  max-height: 92px;
+  max-height: 46px;
+}
+
+.default-fleet-logo {
+  transform: scale(0.5);
 }
diff --git a/frontend/components/top_nav/SiteTopNav/_styles.scss b/frontend/components/top_nav/SiteTopNav/_styles.scss
index 706a54e8b5..62160ace3a 100644
--- a/frontend/components/top_nav/SiteTopNav/_styles.scss
+++ b/frontend/components/top_nav/SiteTopNav/_styles.scss
@@ -84,7 +84,6 @@
     align-items: center;
     min-width: 64px;
     max-width: 140px;
-    transform: scale(0.5);
   }
 
   &--active {