Merge pull request #101 from chriswblake/develop

Release v0.22.2
chriswblake · Sep 6, 2023 · 2a8aefd · 2a8aefd
2 parents abae75b + 06dad16
commit 2a8aefd
Show file tree

Hide file tree

Showing 13 changed files with 9 additions and 8 deletions.
diff --git a/HackathonWebApp/Views/Account/Certificate.cshtml b/HackathonWebApp/Views/Account/Certificate.cshtml
@@ -92,7 +92,7 @@
  </div>
 
  @* Event Logo *@
- <img style="top:1.5in; left:0.75in; width:4.5in;" src="/img/hackokstate-black.png"/>
+ <img style="top:1.65in; left:0.75in; width:4.5in;" src="/img/hackokstate-logo/2023-black.png"/>
 
  @* Event Date *@
  <div style="top:3.4in; left:0.9in; font-size:18pt; font-weight:bold;">
@@ -138,7 +138,7 @@
  </div>
 
  @* Signatures *@
- <img style="top:1in; right:1in; width:4in;" src="/img/bh_mobius-thin.png"/>
+ <img style="bottom:0.24in; right:0.23in; width:5.25in; filter: grayscale(100%); opacity:0.3;" src="/img/baker-hughes/bh_cm_36tl_rgb.svg"/>
  <div style="bottom:1in; right:1in; width:4in; font-size: larger;">
  <div style="border-top: 1px solid #999; padding-top: 0.125in;">
  @award.FirstSignatureName<br/>

diff --git a/HackathonWebApp/Views/Event/NameTags.cshtml b/HackathonWebApp/Views/Event/NameTags.cshtml
@@ -170,7 +170,7 @@
 
  // Create nametag
  <div class="name-tag @colClass">
- <img src="/img/hackokstate-black.png" class="logo"/>
+ <img src="/img/hackokstate-logo/2023-black.png" class="logo"/>
  <div class="user-name">@appUser.FirstName @appUser.LastName</div>
  <div class="hosts">
  <img src="/img/osu_logo.svg"/> + <img src="/img/bh_logo_wide_green.png"/>

diff --git a/HackathonWebApp/Views/Home/Index.cshtml b/HackathonWebApp/Views/Home/Index.cshtml
@@ -13,7 +13,7 @@
 <div class="text-center">
  <!-- Intro -->
  <section class="first-section" style="color:white; padding-bottom:5em;">
- <img class="col-10 col-sm-8 col-md-7 col-lg-6 col-xl-5 logo-shake" src="~/img/hackokstate.png"/>
+ <img class="col-10 col-sm-8 col-md-7 col-lg-6 col-xl-5 logo-shake" src="~/img/hackokstate-logo/2023-white.png"/>
  <br>
  <h2 class="osu-orange">@startTime.ToString("dd")-@endTime.ToString("dd MMM. yyyy")</h2>
  <h2>OSU Endeavor<br/> 215 N Hester St, Stillwater, OK 74078</h2>

diff --git a/HackathonWebApp/wwwroot/email-templates/ConfirmAvailability.html b/HackathonWebApp/wwwroot/email-templates/ConfirmAvailability.html
@@ -5,7 +5,7 @@
  <table style="border: 1px solid #018374; width: 460px; border-collapse: collapse;">
  <tr>
  <td style="background-color: #018374; padding: 50px 50px 20px 50px; text-align: center;">
- <img src="https://hackokstate.com/img/hackokstate.png" style="width:100%;">
+ <img src="https://hackokstate.com/img/hackokstate-logo/2023-white.png" style="width:100%;">
  </td>
  </tr>
  <tr>

diff --git a/HackathonWebApp/wwwroot/email-templates/ConfirmEmailAddress.html b/HackathonWebApp/wwwroot/email-templates/ConfirmEmailAddress.html
@@ -5,7 +5,7 @@
  <table style="border: 1px solid #018374; width: 460px; border-collapse: collapse;">
  <tr>
  <td style="background-color: #018374; padding: 50px 50px 20px 50px; text-align: center;">
- <img src="https://hackokstate.com/img/hackokstate.png" style="width:100%;">
+ <img src="https://hackokstate.com/img/hackokstate-logo/2023-white.png" style="width:100%;">
  </td>
  </tr>
  <tr>

diff --git a/HackathonWebApp/wwwroot/email-templates/ForgotPassword.html b/HackathonWebApp/wwwroot/email-templates/ForgotPassword.html
@@ -5,7 +5,7 @@
  <table style="border: 1px solid #018374; width: 460px; border-collapse: collapse;">
  <tr>
  <td style="background-color: #018374; padding: 50px 50px 20px 50px; text-align: center;">
- <img src="https://hackokstate.com/img/hackokstate.png" style="width:100%;">
+ <img src="https://hackokstate.com/img/hackokstate-logo/2023-white.png" style="width:100%;">
  </td>
  </tr>
  <tr>

diff --git a/HackathonWebApp/wwwroot/email-templates/LoginByEmailLink.html b/HackathonWebApp/wwwroot/email-templates/LoginByEmailLink.html
@@ -5,7 +5,7 @@
  <table style="border: 1px solid #018374; width: 460px; border-collapse: collapse;">
  <tr>
  <td style="background-color: #018374; padding: 50px 50px 20px 50px; text-align: center;">
- <img src="https://hackokstate.com/img/hackokstate.png" style="width:100%;">
+ <img src="https://hackokstate.com/img/hackokstate-logo/2023-white.png" style="width:100%;">
  </td>
  </tr>
  <tr>

diff --git a/HackathonWebApp/wwwroot/img/baker-hughes/bh_cm_36tl_rgb.svg b/HackathonWebApp/wwwroot/img/baker-hughes/bh_cm_36tl_rgb.svg
diff --git a/HackathonWebApp/wwwroot/img/bh_mobius-thin.png b/HackathonWebApp/wwwroot/img/bh_mobius-thin.png
diff --git a/...nWebApp/wwwroot/img/hackokstate-black.png → ...wroot/img/hackokstate-logo/2022-black.png b/...nWebApp/wwwroot/img/hackokstate-black.png → ...wroot/img/hackokstate-logo/2022-black.png
diff --git a/HackathonWebApp/wwwroot/img/hackokstate.png → ...wroot/img/hackokstate-logo/2022-white.png b/HackathonWebApp/wwwroot/img/hackokstate.png → ...wroot/img/hackokstate-logo/2022-white.png
diff --git a/HackathonWebApp/wwwroot/img/hackokstate-logo/2023-black.png b/HackathonWebApp/wwwroot/img/hackokstate-logo/2023-black.png
diff --git a/HackathonWebApp/wwwroot/img/hackokstate-logo/2023-white.png b/HackathonWebApp/wwwroot/img/hackokstate-logo/2023-white.png