feat(styling): issues/6 refresh for brand logos, styling (#27)

* rename, image updates towards product discovery * scss directory generic rename
quipucords · Mar 28, 2019 · e2bb2fc · e2bb2fc
1 parent c9d5f21
commit e2bb2fc
Show file tree

Hide file tree

Showing 24 changed files with 229 additions and 211 deletions.
diff --git a/public/index.html b/public/index.html
@@ -6,7 +6,7 @@
     <meta name="theme-color" content="#000000">
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
     <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
-    <title>Entitlements Reporting</title>
+    <title>product discovery</title>
   </head>
   <body class="cards-pf">
     <noscript>

diff --git a/public/manifest.json b/public/manifest.json
@@ -1,6 +1,6 @@
 {
-  "short_name": "Entitlements",
-  "name": "Entitlements Reporting",
+  "short_name": "product discovery",
+  "name": "product discovery",
   "icons": [
     {
       "src": "favicon.ico",

diff --git a/src/components/aboutModal/__tests__/__snapshots__/aboutModal.test.js.snap b/src/components/aboutModal/__tests__/__snapshots__/aboutModal.test.js.snap
@@ -8,7 +8,7 @@ exports[`AboutModal Component should contain brand: brand 1`] = `
   onHide={[Function]}
   productTitle={
     <img
-      alt="Red Hat Entitlements Reporting"
+      alt="Red Hat product discovery"
       src="title-brand.svg"
     />
   }
@@ -56,7 +56,7 @@ exports[`AboutModal Component should render a non-connected component: hidden mo
     onHide={[Function]}
     productTitle={
       <img
-        alt="Entitlements Reporting"
+        alt="product discovery"
         src="title.svg"
       />
     }

diff --git a/src/components/aboutModal/aboutModal.js b/src/components/aboutModal/aboutModal.js
@@ -31,13 +31,13 @@ class AboutModal extends React.Component {
 
     const props = {
       logo: logoImg,
-      productTitle: <img src={titleImg} alt="Entitlements Reporting" />,
+      productTitle: <img src={titleImg} alt="product discovery" />,
       altLogo: 'ER'
     };
 
     if (brand) {
       props.logo = logoImgBrand;
-      props.productTitle = <img src={titleImgBrand} alt="Red Hat Entitlements Reporting" />;
+      props.productTitle = <img src={titleImgBrand} alt="Red Hat product discovery" />;
       props.altLogo = 'RH ER';
       props.trademarkText = 'Copyright (c) 2019 Red Hat Inc.';
     }

diff --git a/src/components/credentials/__tests__/__snapshots__/credentialsEmptyState.test.js.snap b/src/components/credentials/__tests__/__snapshots__/credentialsEmptyState.test.js.snap
@@ -21,14 +21,14 @@ exports[`CredentialsEmptyState Component should render a basic component 1`] = `
       <h4
         class="h1 blank-slate-pf-title"
       >
-        Welcome to  Entitlements Reporting
+        Welcome to discovery
       </h4>
       <p
         class="blank-slate-pf-info"
       >
         Credentials contain authentication information needed to scan a source. A credential includes 
         <br />
-        a username and a password or SSH key. Entitlements Reporting uses SSH to connect to servers 
+        a username and a password or SSH key. Discovery uses SSH to connect to servers 
         <br />
          on the network and uses credentials to access those servers.
       </p>

diff --git a/src/components/credentials/credentialsEmptyState.js b/src/components/credentials/credentialsEmptyState.js
@@ -8,11 +8,11 @@ const CredentialsEmptyState = ({ onAddCredential, onAddSource }) => (
     <Row>
       <EmptyState className="full-page-blank-slate">
         <EmptyState.Icon />
-        <EmptyState.Title>Welcome to {helpers.RH_BRAND && 'Red Hat'} Entitlements Reporting</EmptyState.Title>
+        <EmptyState.Title>Welcome to {helpers.RH_BRAND && 'Red Hat '}discovery</EmptyState.Title>
         <EmptyState.Info>
           Credentials contain authentication information needed to scan a source. A credential includes <br />a username
-          and a password or SSH key. Entitlements Reporting uses SSH to connect to servers <br /> on the network and
-          uses credentials to access those servers.
+          and a password or SSH key. Discovery uses SSH to connect to servers <br /> on the network and uses credentials
+          to access those servers.
         </EmptyState.Info>
         <EmptyState.Action>
           <DropdownButton bsStyle="primary" bsSize="large" title="Add Credential" pullRight id="createCredentialButton">

diff --git a/src/components/sources/__tests__/__snapshots__/sources.test.js.snap b/src/components/sources/__tests__/__snapshots__/sources.test.js.snap
@@ -189,7 +189,7 @@ exports[`Sources Component should render a non-connected component with empty st
       <h4
         class="h1 blank-slate-pf-title"
       >
-        Welcome to  Entitlements Reporting
+        Welcome to discovery
       </h4>
       <p
         class="blank-slate-pf-info"

diff --git a/src/components/sources/__tests__/__snapshots__/sourcesEmptyState.test.js.snap b/src/components/sources/__tests__/__snapshots__/sourcesEmptyState.test.js.snap
@@ -21,7 +21,7 @@ exports[`SourcesEmptyState Component should render a basic component 1`] = `
       <h4
         class="h1 blank-slate-pf-title"
       >
-        Welcome to  Entitlements Reporting
+        Welcome to discovery
       </h4>
       <p
         class="blank-slate-pf-info"

diff --git a/src/components/sources/sourcesEmptyState.js b/src/components/sources/sourcesEmptyState.js
@@ -8,7 +8,7 @@ const SourcesEmptyState = ({ onAddSource }) => (
     <Row>
       <EmptyState className="full-page-blank-slate">
         <EmptyState.Icon />
-        <EmptyState.Title>Welcome to {helpers.RH_BRAND && 'Red Hat'} Entitlements Reporting</EmptyState.Title>
+        <EmptyState.Title>Welcome to {helpers.RH_BRAND && 'Red Hat '}discovery</EmptyState.Title>
         <EmptyState.Info>
           Begin by adding one or more sources. A source contains a collection of network information, <br />
           including systems management solution information, IP addresses, or host names, in addition to <br />

diff --git a/src/styles/entitlements/_app.scss → src/styles/app/_app.scss b/src/styles/entitlements/_app.scss → src/styles/app/_app.scss
diff --git a/src/styles/entitlements/_common.scss → src/styles/app/_common.scss b/src/styles/entitlements/_common.scss → src/styles/app/_common.scss
diff --git a/src/styles/entitlements/_forms.scss → src/styles/app/_forms.scss b/src/styles/entitlements/_forms.scss → src/styles/app/_forms.scss
diff --git a/src/styles/entitlements/_login.scss → src/styles/app/_login.scss b/src/styles/entitlements/_login.scss → src/styles/app/_login.scss
@@ -3,3 +3,7 @@
   background: transparent;
   color: $color-pf-white;
 }
+
+#brand.login-title img {
+  width: 38%;
+}
diff --git a/src/styles/entitlements/_masthead.scss → src/styles/app/_masthead.scss b/src/styles/entitlements/_masthead.scss → src/styles/app/_masthead.scss
diff --git a/src/styles/entitlements/_overrides.scss → src/styles/app/_overrides.scss b/src/styles/entitlements/_overrides.scss → src/styles/app/_overrides.scss
@@ -10,8 +10,8 @@
 }
 
 .navbar-pf-vertical .navbar-brand .navbar-brand-name {
-  height: 11px;
-  margin-top: 13px;
+  height: 26px;
+  margin-top: 6px;
 }
 
 .list-view-pf-top-align {

diff --git a/src/styles/entitlements/_scans.scss → src/styles/app/_scans.scss b/src/styles/entitlements/_scans.scss → src/styles/app/_scans.scss
diff --git a/src/styles/entitlements/_views.scss → src/styles/app/_views.scss b/src/styles/entitlements/_views.scss → src/styles/app/_views.scss
diff --git a/src/styles/entitlements/_wizard.scss → src/styles/app/_wizard.scss b/src/styles/entitlements/_wizard.scss → src/styles/app/_wizard.scss