Skip to content

Commit a5b161a

Browse files
authored
Merge pull request #207 from SCCapstone/development
Development
2 parents a96e8b3 + 3abbe60 commit a5b161a

4 files changed

Lines changed: 8 additions & 6 deletions

File tree

frontend/app/src/pages/Dashboard/Dashboard.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ const Dashboard = () => {
142142
</div>: ''
143143
}
144144
{ user && (user.position === 'chair' || user.position === 'professor') ?
145-
<div className='dashboardCard'>
145+
<div className='dashboardCard dashboardExpenCard'>
146146
<div className='dashboardCardHeader'>
147147
<h1>Expenditures</h1>
148148
<button onClick={ (e) => navigate('/research-info?page=expenditures') }>See All</button>

frontend/app/src/pages/Dashboard/dashboard.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,9 @@
107107
.dashboardPlot {
108108
border: black solid thin;
109109
}
110-
110+
.dashboardExpenCard {
111+
overflow-x: auto;
112+
}
111113
/* Display One Column On Small Screen Sizes */
112114
@media (max-width: 1300px) {
113115
.dashboardBody { grid-template-columns: repeat(1, 1fr); }

frontend/app/src/pages/SplashPage/SplashPage.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ const SplashPage = () => {
7979
</div>
8080
<div className="splashPageSection splashPageDemo">
8181
<h1>Demo</h1>
82-
<iframe width="420" height="315"
83-
src="https://www.youtube.com/embed/tgbNymZ7vqY">
82+
<iframe
83+
src="https://www.youtube.com/embed/JF7RciIm4Fc">
8484
</iframe>
8585
<h2>
8686
See demo to experience the USC Faculty Dashboard in action!
@@ -127,7 +127,7 @@ const SplashPage = () => {
127127
</div>
128128
<div className="splashPageTeamMember">
129129
<div>
130-
<h2>Mitchel Jonker</h2>
130+
<h2>Mitchell Jonker</h2>
131131
<p>mjonker@email.sc.edu</p>
132132
</div>
133133
<a className="splashPageTeamMemberLinkedIn" href="https://www.linkedin.com/in/jonker-mitchell/" target="_blank">

frontend/app/src/pages/SplashPage/splash-page.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
.splashPageDemo iframe {
176176
display: block;
177177
width: 80%;
178-
height: 60vh;
178+
height: 70vh;
179179
border: 2px solid black;
180180
box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
181181
}

0 commit comments

Comments
 (0)