Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed css? #77

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Fixed css? #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
08fc18a
Not used
JingtingL Dec 5, 2024
ecd511d
Merge branch 'main' of https://github.com/JingtingL/SleepBuddies
JingtingL Dec 5, 2024
e0d0893
merge error
JingtingL Dec 5, 2024
25ec7c7
Update App.tsx
JingtingL Dec 5, 2024
28c3fe5
Merge error for me
JingtingL Dec 5, 2024
1cc41c4
Merge branch 'main' of https://github.com/CSE-110-FA24-Team-17/SleepB…
JingtingL Dec 5, 2024
ea55419
fixed misalignment
JingtingL Dec 5, 2024
39816e0
fixed journal page misalignment
JingtingL Dec 5, 2024
c5cefea
Fixed Music page styling
JingtingL Dec 5, 2024
1fe6ae2
change color
JingtingL Dec 5, 2024
3574763
Update music.css
JingtingL Dec 6, 2024
d1518e0
Merge branch 'main' into main
JingtingL Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions client/src/components/elements/AlarmItem.tsx
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions client/src/components/elements/AlarmList.tsx
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions client/src/css/journal.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@

/* Journal Entry Textarea */
.journal-entry-textarea {
width: 100%;
height: 150px;width: 95%;
width: 95%;
height: 150px;
padding: 10px;
border: 1px solid #ddd;
border-radius: 5px;
Expand Down
2 changes: 1 addition & 1 deletion client/src/css/music.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
/* Title Styling */
.title {
font-size: 2em; /* Smaller font size */
color: #012140; /* Darker color for contrast */
color: #4f4e8e; /* Darker color for contrast */
margin-bottom: 0.3em;
}

Expand Down
Loading