From aadbb1ebf4418e4678e6fd7fd5788901dbc12655 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 26 Jan 2021 06:47:45 -0600
Subject: [PATCH] Footer: Fixes layout issue in footer  (#30443) (#30494)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Footer: Fixes missing icon issue causing footer layout issue

* Another fix

(cherry picked from commit 5c8d662bfce3ab5cce134efdf7963bd0623ad433)

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
---
 packages/grafana-ui/src/components/Icon/custom/index.tsx | 4 ++--
 public/app/core/components/Footer/Footer.tsx             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/grafana-ui/src/components/Icon/custom/index.tsx b/packages/grafana-ui/src/components/Icon/custom/index.tsx
index e655488edb9..7a3637e0094 100644
--- a/packages/grafana-ui/src/components/Icon/custom/index.tsx
+++ b/packages/grafana-ui/src/components/Icon/custom/index.tsx
@@ -65,8 +65,8 @@ const InterpolationStepAfter: FC<SvgProps> = ({ size, ...rest }) => {
   );
 };
 
-const IconNotFound: FC<SvgProps> = ({ ...rest }) => {
-  return <svg {...rest} />;
+const IconNotFound: FC<SvgProps> = ({ size, ...rest }) => {
+  return <svg width={size} height={size} {...rest} />;
 };
 
 export const customIcons: Record<string, ComponentType<SvgProps>> = {
diff --git a/public/app/core/components/Footer/Footer.tsx b/public/app/core/components/Footer/Footer.tsx
index 2637dcfef3f..5b7be702bd2 100644
--- a/public/app/core/components/Footer/Footer.tsx
+++ b/public/app/core/components/Footer/Footer.tsx
@@ -75,7 +75,7 @@ export const Footer: FC = React.memo(() => {
           {links.map((link) => (
             <li key={link.text}>
               <a href={link.url} target={link.target} rel="noopener">
-                <Icon name={link.icon as IconName} /> {link.text}
+                {link.icon && <Icon name={link.icon as IconName} />} {link.text}
               </a>
             </li>
           ))}