Browse Source

added back ingress ip when it exists

Justin Rhee 3 years ago
parent
commit
d136f60b5c

+ 1 - 1
dashboard/src/main/home/cluster-dashboard/DashboardHeader.tsx

@@ -8,7 +8,7 @@ import TitleSection from "components/TitleSection";
 type PropsType = {
 type PropsType = {
   image?: any;
   image?: any;
   title: any;
   title: any;
-  description?: string;
+  description?: any;
   materialIconClass?: string;
   materialIconClass?: string;
   disableLineBreak?: boolean;
   disableLineBreak?: boolean;
   capitalize?: boolean;
   capitalize?: boolean;

+ 11 - 23
dashboard/src/main/home/cluster-dashboard/dashboard/Dashboard.tsx

@@ -222,28 +222,17 @@ export const Dashboard: React.FunctionComponent = () => {
       <DashboardHeader
       <DashboardHeader
         image={settings}
         image={settings}
         title={context.currentCluster.name}
         title={context.currentCluster.name}
-        description={`Cluster settings and status for ${context.currentCluster.name}.`}
+        description={
+          ingressIp ? (
+            <>{renderIngressIp(ingressIp, ingressError)}</>
+          ) : (
+            `Cluster settings and status for ${context.currentCluster.name}.`
+          )
+        }
         disableLineBreak
         disableLineBreak
         capitalize={false}
         capitalize={false}
       />
       />
 
 
-      {/*
-      <TitleSection>
-        <DashboardIcon>
-          <i className="material-icons">device_hub</i>
-        </DashboardIcon>
-        {context.currentCluster.name}
-      </TitleSection>
-      <InfoSection>
-        <TopRow>
-          <InfoLabel>
-            <i className="material-icons">info</i> Info
-          </InfoLabel>
-        </TopRow>
-        <Description>{renderIngressIp(ingressIp, ingressError)}</Description>
-      </InfoSection>
-      */}
-
       {renderContents()}
       {renderContents()}
     </>
     </>
   );
   );
@@ -347,10 +336,9 @@ const InfoLabel = styled.div`
 `;
 `;
 
 
 const InfoSection = styled.div`
 const InfoSection = styled.div`
-  margin-top: 36px;
-  font-family: "Work Sans", sans-serif;
-  margin-left: 0px;
-  margin-bottom: 30px;
+  margin-top: -20px;
+  font-size: 13px;
+  margin-bottom: 25px;
 `;
 `;
 
 
 const Url = styled.a`
 const Url = styled.a`
@@ -373,7 +361,7 @@ const Url = styled.a`
 `;
 `;
 
 
 const Bolded = styled.span`
 const Bolded = styled.span`
-  color: #8b949f;
+  color: #aaaabb;
   margin-right: 6px;
   margin-right: 6px;
   white-space: nowrap;
   white-space: nowrap;
 `;
 `;