From 95679d7594c1cab459b2db63b6b67ab2e396f73a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CA=88=E1=B5=83=E1=B5=A2?= <tdupreetan@gmail.com>
Date: Fri, 6 Aug 2021 05:48:22 -0700
Subject: [PATCH] fix: move watermark to about section (#16097)

(cherry picked from commit b80f0186915b91df03f5ee5c15eba4b176596a96)
---
 .../src/components/Menu/MenuRight.tsx           | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/superset-frontend/src/components/Menu/MenuRight.tsx b/superset-frontend/src/components/Menu/MenuRight.tsx
index 6a50a9416c9..86a47846b52 100644
--- a/superset-frontend/src/components/Menu/MenuRight.tsx
+++ b/superset-frontend/src/components/Menu/MenuRight.tsx
@@ -69,15 +69,6 @@ const StyledAnchor = styled.a`
   padding-left: ${({ theme }) => theme.gridUnit}px;
 `;
 
-const WaterMark = styled.span`
-  font-size: 13px;
-  color: #b0b4c3;
-  margin: 0 ${({ theme }) => theme.gridUnit * 4}px;
-  @media (max-width: 1070px) {
-    display: none;
-  }
-`;
-
 const { SubMenu } = Menu;
 
 interface RightMenuProps {
@@ -95,9 +86,6 @@ const RightMenu = ({
 }: RightMenuProps) => (
   <StyledDiv align={align}>
     <Menu mode="horizontal">
-      {navbarRight.show_watermark && (
-        <WaterMark>{t('Powered by Apache Superset')}</WaterMark>
-      )}
       {!navbarRight.user_is_anonymous && (
         <SubMenu
           data-test="new-dropdown"
@@ -160,6 +148,11 @@ const RightMenu = ({
           <Menu.Divider key="version-info-divider" />,
           <Menu.ItemGroup key="about-section" title={t('About')}>
             <div className="about-section">
+              {navbarRight.show_watermark && (
+                <div css={versionInfoStyles}>
+                  {t('Powered by Apache Superset')}
+                </div>
+              )}
               {navbarRight.version_string && (
                 <div css={versionInfoStyles}>
                   Version: {navbarRight.version_string}