Skip to content

Commit

Permalink
h1 updates (bcgov#2198)
Browse files Browse the repository at this point in the history
  • Loading branch information
djnunez-aot authored Sep 15, 2023
1 parent 905c20c commit ee33b61
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 9 deletions.
1 change: 0 additions & 1 deletion met-web/src/components/banner/BannerWithoutImage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ const BannerWithoutImage = ({ children }: BannerProps) => {
return (
<Box
sx={{
// backgroundColor: isDraft ? '#707070' : '#F2F2F2',
backgroundColor: '#F2F2F2',
width: '100%',
position: 'relative',
Expand Down
15 changes: 8 additions & 7 deletions met-web/src/components/common/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import EditIcon from '@mui/icons-material/Edit';
import HighlightOffIcon from '@mui/icons-material/HighlightOff';
import { Palette } from 'styles/Theme';
import LoadingButton from '@mui/lab/LoadingButton';
import { MET_Header_Font_Family, MET_Header_Font_Weight } from '../../styles/constants';
import { MET_Header_Font_Family, MET_Font_Weight, MET_Header_Font_Weight } from '../../styles/constants';
import { When } from 'react-if';
import ReactPlayer from 'react-player';

Expand Down Expand Up @@ -325,8 +325,9 @@ export const MetHeader1 = ({ bold, children, sx, ...rest }: HeaderProps) => {
<Typography
sx={{
...sx,
fontSize: '2.3rem',
fontWeight: bold ? 'bold' : MET_Header_Font_Weight,
fontSize: '1.5rem',
lineHeight: 1.25,
fontWeight: MET_Header_Font_Weight,
fontFamily: MET_Header_Font_Family,
}}
variant="h1"
Expand All @@ -342,7 +343,7 @@ export const MetHeader2 = ({ bold, children, sx, ...rest }: HeaderProps) => {
sx={{
...sx,
fontSize: '1.9rem',
fontWeight: bold ? 'bold' : MET_Header_Font_Weight,
fontWeight: MET_Header_Font_Weight,
fontFamily: MET_Header_Font_Family,
}}
variant="h2"
Expand All @@ -358,7 +359,7 @@ export const MetHeader3 = ({ bold, children, sx, ...rest }: HeaderProps) => {
sx={{
...sx,
fontSize: '1.5rem',
fontWeight: bold ? 'bold' : MET_Header_Font_Weight,
fontWeight: MET_Header_Font_Weight,
fontFamily: MET_Header_Font_Family,
}}
variant="h3"
Expand All @@ -375,7 +376,7 @@ export const MetHeader4 = ({ bold, color, children, sx, ...rest }: HeaderProps)
sx={{
...sx,
fontSize: '1.3rem',
fontWeight: bold ? 'bold' : MET_Header_Font_Weight,
fontWeight: MET_Header_Font_Weight,
fontFamily: MET_Header_Font_Family,
}}
variant="h4"
Expand All @@ -393,7 +394,7 @@ export const MetBody = ({ bold, children, sx, ...rest }: HeaderProps) => {
...sx,
fontSize: '16px',
fontFamily: MET_Header_Font_Family,
fontWeight: bold ? 'bold' : MET_Header_Font_Weight,
fontWeight: bold ? 'bold' : MET_Font_Weight,
}}
{...rest}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const EngagementInfoSection = ({ savedEngagement, children }: EngagementInfoSect
position: 'absolute',
top: '0px',
left: '0px',
pt: 0,
}}
>
<Grid
Expand All @@ -51,6 +52,7 @@ const EngagementInfoSection = ({ savedEngagement, children }: EngagementInfoSect
backgroundColor: 'rgba(242, 242, 242, 0.95)',
padding: '1em',
margin: '1em',
paddingTop: 0,
}}
m={{ lg: '3em 5em 0 3em', md: '3em', sm: '1em' }}
spacing={1}
Expand Down
1 change: 1 addition & 0 deletions met-web/src/components/landing/LandingComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ const LandingComponent = () => {
sx={{
backgroundColor: 'rgba(242, 242, 242, 0.95)',
padding: '1em',
pt: 0,
margin: '1em',
maxWidth: '90%',
}}
Expand Down
3 changes: 2 additions & 1 deletion met-web/src/styles/constants.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
export const MET_Header_Font_Family = "'BCSans', 'Noto Sans', Verdana, Arial, sans-serif";
export const MET_Header_Font_Weight = 500;
export const MET_Header_Font_Weight = 700;
export const MET_Font_Weight = 500;

0 comments on commit ee33b61

Please sign in to comment.