Update logos/layout

msupply-foundation · Nov 25, 2021 · 8b2c542 · 8b2c542
1 parent 3252bcf
commit 8b2c542
Show file tree

Hide file tree

Showing 22 changed files with 14 additions and 11 deletions.
diff --git a/image_resources/conforma logos/conforma_logo.psd b/image_resources/conforma logos/conforma_logo.psd
diff --git a/image_resources/conforma logos/conforma_logo_wide.psd b/image_resources/conforma logos/conforma_logo_wide.psd
diff --git a/images/logos/conforma_logo_1024.png b/images/logos/conforma_logo_1024.png
diff --git a/images/logos/conforma_logo_128.png b/images/logos/conforma_logo_128.png
diff --git a/images/logos/conforma_logo_256.png b/images/logos/conforma_logo_256.png
diff --git a/images/logos/conforma_logo_512.png b/images/logos/conforma_logo_512.png
diff --git a/images/logos/conforma_logo_white_1024.png b/images/logos/conforma_logo_white_1024.png
diff --git a/images/logos/conforma_logo_white_128.png b/images/logos/conforma_logo_white_128.png
diff --git a/images/logos/conforma_logo_white_256.png b/images/logos/conforma_logo_white_256.png
diff --git a/images/logos/conforma_logo_white_512.png b/images/logos/conforma_logo_white_512.png
diff --git a/images/logos/conforma_logo_wide_1024.png b/images/logos/conforma_logo_wide_1024.png
diff --git a/images/logos/conforma_logo_wide_2048.png b/images/logos/conforma_logo_wide_2048.png
diff --git a/images/logos/conforma_logo_wide_256.png b/images/logos/conforma_logo_wide_256.png
diff --git a/images/logos/conforma_logo_wide_512.png b/images/logos/conforma_logo_wide_512.png
diff --git a/images/logos/conforma_logo_wide_white_1024.png b/images/logos/conforma_logo_wide_white_1024.png
diff --git a/images/logos/conforma_logo_wide_white_2048.png b/images/logos/conforma_logo_wide_white_2048.png
diff --git a/images/logos/conforma_logo_wide_white_256.png b/images/logos/conforma_logo_wide_white_256.png
diff --git a/images/logos/conforma_logo_wide_white_512.png b/images/logos/conforma_logo_wide_white_512.png
diff --git a/semantic/src/site/globals/site.overrides b/semantic/src/site/globals/site.overrides
@@ -191,7 +191,7 @@ a:hover {
   display: flex;
   flex-direction: column;
   background-color: white;
-  max-width: 450px;
+  width: clamp(250px, 35%, 450px);
   box-shadow: @basicBoxShadow;
   border-radius: @borderRadius;
   padding: 20px;
@@ -205,12 +205,13 @@ a:hover {
 }
 
 .login-header {
-  margin: 0 !important;
+  margin: 20px 0 0 0 !important;
   letter-spacing: @letterSpacingRegular !important;
 }
 
 .image-icon {
-  height: 45px;
+  // height: 45px;
+  width: 250px;
   margin-right: 12px;
 }
 
@@ -258,7 +259,7 @@ a:hover {
 }
 
 #brand-area {
-  width: clamp(100px, 25%, 400px);
+  width: clamp(100px, 25%, 200px);
   display: flex;
   align-items: center;
   gap: 20px;

diff --git a/src/containers/User/Login.tsx b/src/containers/User/Login.tsx
@@ -7,7 +7,7 @@ import isLoggedIn from '../../utils/helpers/loginCheck'
 import { useLanguageProvider } from '../../contexts/Localisation'
 import { attemptLogin, attemptLoginOrg } from '../../utils/helpers/attemptLogin'
 import { LoginPayload, OrganisationSimple } from '../../utils/types'
-const logo = require('../../../images/logos/logo_512.png').default
+const logo = require('../../../images/logos/conforma_logo_wide_1024.png').default
 import config from '../../config'
 
 const LOGIN_AS_NO_ORG = 0
@@ -100,7 +100,7 @@ const Login: React.FC = () => {
     <Container id="login-container">
       {languageOptions.length > 1 && <LanguageSelector />}
       <div id="login-box">
-        <div className="flex-centered">
+        <div className="flex-column-center">
           <Image src={logo} className="image-icon" />
           <Header as="h3" className="login-header">
             {strings.TITLE_LOGIN_HEADER}

diff --git a/src/containers/User/UserArea.tsx b/src/containers/User/UserArea.tsx
@@ -21,7 +21,7 @@ import { useRouter } from '../../utils/hooks/useRouter'
 import config from '../../config'
 import { getFullUrl } from '../../utils/helpers/utilityFunctions'
 import { UiLocation } from '../../utils/generated/graphql'
-const brandLogo = require('../../../images/brand_logo.png').default
+const brandLogo = require('../../../images/logos/conforma_logo_wide_white_1024.png').default
 
 const UserArea: React.FC = () => {
   const {
@@ -182,12 +182,14 @@ const BrandArea: React.FC = () => {
   const { strings } = useLanguageProvider()
   return (
     <div id="brand-area" className="hide-on-mobile">
-      <Image src={brandLogo} />
+      <Link to="/">
+        <Image src={brandLogo} />
+      </Link>
       <div>
-        <Link to="/">
+        {/* <Link to="/">
           <h2 className="brand-area-text">{strings.APP_NAME}</h2>
           <h3 className="brand-area-text">{strings.APP_NAME_SUBHEADER}</h3>
-        </Link>
+        </Link> */}
       </div>
     </div>
   )

diff --git a/src/utils/defaultLanguageStrings.ts b/src/utils/defaultLanguageStrings.ts
@@ -191,7 +191,7 @@ export default {
   TITLE_HISTORY_REVIEW: 'Review',
   TITLE_HISTORY_SUBMITTED_BY_APPLICANT: 'Submitted by applicant',
   TITLE_HISTORY_PANEL: 'Review History',
-  TITLE_LOGIN_HEADER: 'Conforma Application Manager',
+  TITLE_LOGIN_HEADER: 'Application Manager',
   TITLE_LOGIN: 'Login',
   TITLE_APPLICATION_FORM: 'application form',
   TITLE_APPLICATION_SUMMARY: 'Review and Submit',