Skip to content

Commit

Permalink
Merge branch 'master' into Events
Browse files Browse the repository at this point in the history
  • Loading branch information
elaineZhang67 committed Dec 7, 2023
2 parents 0711e69 + c3be6e3 commit 30db521
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
2 changes: 1 addition & 1 deletion front-end/src/components/AddExpense.js
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ const AddExpense = (props) => {
<div className="submitBtn">
<button type="submit">Done</button>
</div>
<div className="space-to-scroll"></div>
<div className="space-to-scrolls"></div>
</form>
</div>
<SplitModal
Expand Down
13 changes: 7 additions & 6 deletions front-end/src/styles/AddExpense.css
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
background-color: #d32f2f;
}

.space-to-scroll {
height: 60px;
.space-to-scrolls {
height: 60px;
}

/* Dark Mode for Add Expense Modal */
Expand Down Expand Up @@ -100,7 +100,8 @@
@apply bg-red-600;
}

.dark-mode .space-to-scroll {
@apply bg-gray-800;
height: 40px;
}
.dark-mode .space-to-scrolls {
@apply bg-gray-700;
height: 60px;

}
8 changes: 8 additions & 0 deletions front-end/src/styles/Expense.css
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,14 @@
@apply bg-gray-700 border-gray-600;
}

.dark-mode .expense .expense-item .positive {
color: green;
}

.dark-mode .expense .expense-item .negative {
color: red;
}

.dark-mode .expense-item span:first-child,
.dark-mode .expense-item span:nth-child(2),
.dark-mode .expense-details {
Expand Down

0 comments on commit 30db521

Please sign in to comment.