Merge branch 'dev' into minor-changes

Author: nrakhshan

client/src/components/ScuntTitle/ScuntTitle.jsx

@@ -9,11 +9,12 @@ import { getScuntSettings } from '../../state/scuntSettings/saga';
 import { getScuntTeams } from '../../state/scuntTeams/saga';
 const { axios } = useAxios();
 import './ScuntTitle.scss';
+import bannerphoto from '../../assets/scunt/scunt-photo.jpg';
 
 export const ScuntTitle = () => {
   return (
     <div className="scunt-title-container">
-      <img className="scunt-title-image" src="\src\assets\scunt\scunt-photo.jpg"></img>
+      <img className="scunt-title-image" src={bannerphoto}></img>
       <div className="scunt-title-gradient"></div>
       <h1 className="scunt-home-title-text">
         SKULE<span className="trademark">™</span>

client/src/components/ScuntTitle/ScuntTitle.scss

@@ -85,9 +85,9 @@
     padding: 20px;
     border-radius: 15px;
     background-color: var(--mikado);
-    min-width: 130px;
+    // min-width: 130px;
     @media only screen and (max-width: 1000px) {
-      min-width: 90px; //!
+      // min-width: 90px; //!
       padding: 10px; //!
       h3 {
         font-size: 15px !important;

client/src/pages/Profile/PageProfileFrosh.jsx

@@ -101,10 +101,10 @@ const PageProfileFrosh = () => {
     <>
       <ProfilePageFroshHeader editButton={true} />
 
-      {/* Mobile-only QR at top */}
+      {/* Mobile-only QR at top
       <div className="profile-qr-mobile mobile-only">
         <ProfilePageQRCode />
-      </div>
+      </div> */}
 
       <div className="profile-info-row">
         <div className="profile-info-row-left">
@@ -557,7 +557,9 @@ export const ProfilePageScuntTeam = () => {
     <div className="profile-page-scunt-team profile-page-side-section">
       <h3>YOUR SKULE™ HUNT TEAM:</h3>
       <h2>
-        <b>{scuntTeam ? scuntTeam.name : null}</b>
+        <b>
+          Team {scuntTeam ? scuntTeam.number : null}: {scuntTeam ? scuntTeam.name : null}
+        </b>
       </h2>
     </div>
   );

client/src/util/scunt-constants.jsx

@@ -101,7 +101,7 @@ export const rules = {
     },
     {
       title: 'The Royal Wedding',
-      sub: 'The Royal Wedding is the wedding to bring Godiva’s Crown and Mr. Blue & Gold together eternally. The list items for the Royal Wedding will only be accepted by the bride and groom, as well as the SubComm Chairs. The wedding items and submissions for these items will be opened starting at 9:00 PM ish. Each group that wants to claim an item must bring the participating F!rosh and the item to the bride and groom, or SubComm chairs. The wedding will take place at 10:00 PM. Only the F!rosh approved beforehand may participate in the wedding. Any F!rosh that interferes during the wedding will be removed from the scene.',
+      sub: 'The Royal Wedding is the wedding to bring Godiva’s Crown and Mr. Blue & Gold together eternally. The list items for the Royal Wedding will only be accepted by the bride and groom, as well as the SubComm Chairs. The wedding items and submissions for these items will be opened starting at 8:00 PM ish. Each group that wants to claim an item must bring the participating F!rosh and the item to the bride and groom, or SubComm chairs. The wedding will take place at 9:00 PM. Only the F!rosh approved beforehand may participate in the wedding. Any F!rosh that interferes during the wedding will be removed from the scene.',
     },
     {
       title: 'Winning',