Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update signature generator to new branding #10

Merged
merged 5 commits into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true,
"source.organizeImports": false
"source.fixAll.eslint": "explicit",
"source.organizeImports": "never"
}
}
Binary file modified makerx-screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/favicon.ico
Binary file not shown.
1 change: 1 addition & 0 deletions public/favicon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="icon" href="%PUBLIC_URL%/favicon.svg" />
<meta
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
Expand Down
Binary file modified public/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/Info/Info.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { createTheme, ThemeProvider } from '@mui/material/styles';
const theme = createTheme({
typography: {
fontFamily: [
'"Inter"',
'-apple-system',
'BlinkMacSystemFont',
'"Segoe UI"',
Expand Down
2 changes: 1 addition & 1 deletion src/RepliesAndForwards/RepliesAndForwards.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const RepliesAndForwards = (props) => {
} = props;
const styleObj = {
color: 'black',
fontFamily: '"Segoe UI", Helvetica, Arial, sans-serif',
melissahoughton marked this conversation as resolved.
Show resolved Hide resolved
fontFamily: 'Helvetica, Arial, sans-serif',
fontSize: '11pt',
};
const titleOptional = title ? <>&nbsp;|&nbsp;{title}</> : null;
Expand Down
12 changes: 6 additions & 6 deletions src/Signature/Signature.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const Signature = (props) => {
cellPadding="0"
style={{
color: 'black',
fontFamily: '"Segoe UI", Helvetica, Arial, sans-serif',
fontFamily: 'Helvetica, Arial, sans-serif',
fontSize: '11pt',
width: '400px',
}}
Expand Down Expand Up @@ -83,7 +83,7 @@ const Signature = (props) => {
cellPadding="0"
style={{
color: 'black',
fontFamily: 'Arial, sans-serif',
fontFamily: 'Helvetica, Arial, sans-serif',
fontSize: '11pt',
margin: 0,
padding: 0,
Expand Down Expand Up @@ -161,9 +161,9 @@ const Signature = (props) => {
}}
>
<img
width="200"
height="30"
style={{ width: '200px', height: '30px', maxWidth: 'none' }}
width="250"
height="50"
style={{ width: '250px', height: '50px', maxWidth: 'none' }}
src={brandLogo.link}
alt={brandLogo.alt}
/>
Expand Down Expand Up @@ -199,7 +199,7 @@ const Signature = (props) => {
<td
style={{
color: '#4a4a4a',
fontFamily: '"Segoe UI", Helvetica, Arial, sans-serif',
melissahoughton marked this conversation as resolved.
Show resolved Hide resolved
fontFamily: 'Helvetica, Arial, sans-serif',
fontSize: '6.5pt',
lineHeight: '1.5',
}}
Expand Down
4 changes: 2 additions & 2 deletions src/constants/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ const constants = {
brandName: 'MakerX',
brandLink: 'https://makerx.com.au/',
brandLinkName: 'www.makerx.com.au',
brandLinkColour: '#0E39FB',
brandLinkColour: '#003FB5',
brandLogo: {
link: 'https://blog.makerx.com.au/content/images/2022/01/makerx_Full.png',
link: 'https://makerxsignatures.blob.core.windows.net/images/MakerX-Full-Logo-Black.jpg',
alt: 'MakerX',
},
brandGPTWLogo: {
Expand Down