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.

Sign up for GitHub

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

merging dev and prod #803

Closed
wants to merge 20 commits into from
Closed

merging dev and prod #803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6f75d03
Merge pull request #777 from UofT-Frosh-Orientation/alissaLandingBranch
ashleyleal Jun 20, 2024
ac282d0
Merge branch 'dev' into prod
gaurikam2003 Jun 26, 2024
f1fc68b
Merge branch 'dev' into prod
gaurikam2003 Jun 26, 2024
7d82b83
Merge pull request #785 from UofT-Frosh-Orientation/dev
gaurikam2003 Jun 28, 2024
4319910
Merge pull request #801 from UofT-Frosh-Orientation/dev
ashleyleal Jul 4, 2024
2fdcb59
Merge branch 'dev' into prod
gaurikam2003 Jul 5, 2024
149987e
Merge branch 'dev' into prod
gaurikam2003 Jul 5, 2024
6391975
Merge pull request #804 from UofT-Frosh-Orientation/dev
ashleyleal Jul 5, 2024
dd6372e
Merge branch 'dev' into prod
gaurikam2003 Jul 5, 2024
053d9bd
trying out a new discount code
gaurikam2003 Jul 5, 2024
6533692
Merge branch 'dev' into prod
gaurikam2003 Jul 5, 2024
2724b2f
Merge branch 'dev' into prod
gaurikam2003 Jul 5, 2024
9a747cb
Merge branch 'dev' into prod
gaurikam2003 Jul 5, 2024
32a03e7
changed sizing of images for emails
gaurikam2003 Jul 5, 2024
0a2ed54
changed email text color
gaurikam2003 Jul 5, 2024
fa770e1
changed font color for email to black
gaurikam2003 Jul 5, 2024
6e8ac51
Merge branch 'dev' into prod
gaurikam2003 Jul 5, 2024
7d80f60
Merge branch 'dev' into prod
gaurikam2003 Jul 5, 2024
73b59fc
Merge branch 'dev' into prod
gaurikam2003 Jul 5, 2024
1257d65
Merge branch 'dev' into prod
gaurikam2003 Jul 6, 2024
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
Binary file modified server/src/services/emailAssets/frosh-hard-hat-white.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified server/src/services/emailAssets/frosh-main-logo-outline.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions server/src/services/emailAssets/registrationEmail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
rgba(113, 31, 139, 0.9) 43.23%,
rgba(61, 15, 88, 0.75) 100%
);
color: white;
color: #000000,;
overflow: hidden;
}
.text-container p {
Expand All @@ -64,10 +64,10 @@
</style>
</head>
<body>
<header></header>client\src\assets\logo\main-logo.png
<header></header>
<div class="space-bar"></div>
<div class="content">
<img class="frosh-logo-main" src="../../../../client/src/assets/logo/main-logo.png" alt="frosh logo" />
<img class="frosh-logo-main" src="./frosh-main-logo-outline.png" alt="frosh logo" />
<div class="text-container">
<h1>Hi ${},</h1>
<p><b>Thank you for registering for F!rosh Week 2T4!!!</b></p>
Expand Down
Loading