Merge pull request #207 from SCCapstone/development

Development
SCCapstone · Apr 22, 2024 · a5b161a · a5b161a
2 parents a96e8b3 + 3abbe60
commit a5b161a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/frontend/app/src/pages/Dashboard/Dashboard.js b/frontend/app/src/pages/Dashboard/Dashboard.js
@@ -142,7 +142,7 @@ const Dashboard = () => {
             </div>: ''
         }
         { user && (user.position === 'chair' || user.position === 'professor') ?
-          <div className='dashboardCard'>
+          <div className='dashboardCard dashboardExpenCard'>
             <div className='dashboardCardHeader'>
               <h1>Expenditures</h1>
               <button onClick={ (e) => navigate('/research-info?page=expenditures') }>See All</button>

diff --git a/frontend/app/src/pages/Dashboard/dashboard.css b/frontend/app/src/pages/Dashboard/dashboard.css
@@ -107,7 +107,9 @@
 .dashboardPlot {
   border: black solid thin;
 }
-
+.dashboardExpenCard {
+  overflow-x: auto;
+}
 /* Display One Column On Small Screen Sizes */ 
 @media (max-width: 1300px) {
   .dashboardBody { grid-template-columns: repeat(1, 1fr); }

diff --git a/frontend/app/src/pages/SplashPage/SplashPage.js b/frontend/app/src/pages/SplashPage/SplashPage.js
@@ -79,8 +79,8 @@ const SplashPage = () => {
       </div>
       <div className="splashPageSection splashPageDemo">
         <h1>Demo</h1>
-        <iframe width="420" height="315"
-          src="https://www.youtube.com/embed/tgbNymZ7vqY">
+        <iframe
+          src="https://www.youtube.com/embed/JF7RciIm4Fc">
         </iframe>
         <h2>
           See demo to experience the USC Faculty Dashboard in action!
@@ -127,7 +127,7 @@ const SplashPage = () => {
           </div>
           <div className="splashPageTeamMember">
             <div>
-              <h2>Mitchel Jonker</h2>
+              <h2>Mitchell Jonker</h2>
               <p>[email protected]</p>
             </div>
             <a className="splashPageTeamMemberLinkedIn" href="https://www.linkedin.com/in/jonker-mitchell/" target="_blank">

diff --git a/frontend/app/src/pages/SplashPage/splash-page.css b/frontend/app/src/pages/SplashPage/splash-page.css
@@ -175,7 +175,7 @@
 .splashPageDemo iframe {
   display: block;
   width: 80%;
-  height: 60vh;
+  height: 70vh;
   border: 2px solid black;
   box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
 }