Skip to content

Merge pull request #18 from CharlesExists/main #21

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

Merged
sarahtoussaint merged 1 commit into from
Nov 11, 2025
Merged

Merge pull request #18 from CharlesExists/main #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file modified .DS_Store
View file
Open in desktop
Binary file not shown.
23 changes: 23 additions & 0 deletions client/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 10 additions & 9 deletions client/src/components/Home.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

.brand-text{
font-family: 'Young Serif', serif;
font-size:22px; color: #1AABE5;
font-size:22px; color: #1AABE5; font-weight: 800;
}

.menuLink {
Expand Down Expand Up @@ -113,32 +113,33 @@
display: flex;
flex-direction: row;
position: relative;
overflow: hidden;
}

.boat-container{
position: relative;
width: 100%; height: 100%;
width: 100%; height: 100vh;
}

.water{
position: absolute;
position: relative;
width: 1271px; height: 344px;
background: linear-gradient(180deg, #1AABE5 21.15%, #2466DB 100%);
top: 320px; left: -50px;
z-index: 2;
top: 300px; left: -50px;
z-index: 2;
}

.dock-img{
position: absolute;
left: 350px; top: 380px;
left: 320px; top: 380px;
width: 878px; height: 249px;
z-index: 3;
}

.boat-avatar-home{
position: absolute;
left: 15px; top: 15px;
width: 472px; height: 481px;
left: 12px; top: 15px;
width: 452px; height: 481px;
z-index:5;
}

Expand Down Expand Up @@ -247,4 +248,4 @@
max-width: 800px;
display: flex;
flex-direction: column;
}
}
122 changes: 39 additions & 83 deletions client/src/components/SoloStudyStart.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,83 +1,39 @@
:root {
--primary: #0ea5e9;
--text: #2b2b2b;
--bg-gradient-start: #38bdf8;
--bg-gradient-end: #3b82f6;
}

.solostart-container {
position: relative;
min-height: 100vh;
background: linear-gradient(180deg, var(--bg-gradient-start), var(--bg-gradient-end));
padding: 24px 40px;
overflow: hidden;
}

.solostart-logo {
display: flex;
align-items: center;
gap: 10px;
margin-bottom: 40px;
}

.brand-text {
font-family: 'Young Serif', serif;
font-size: 22px;
color: var(--primary);
font-weight: 800;
}

.water {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 60%;
background: rgba(14, 165, 233, 0.2);
z-index: 1;
}

.boat-avatar-start {
position: absolute;
left: 315px; top: 213px;
width: 472px; height: 481px;
z-index: 5;
}

.study-options {
position: relative;
z-index: 10;
margin-top: 60vh;
text-align: center;
}

.study-title {
font-size: 36px;
font-weight: 700;
color: var(--text);
background: white;
padding: 24px 32px;
border-radius: 16px;
display: inline-block;
}

.home-btn {
position: absolute;
top: 24px;
right: 40px;
background: rgba(255, 255, 255, 0.9);
color: var(--primary);
font-weight: 700;
font-size: 18px;
padding: 12px 24px;
border-radius: 12px;
border: none;
cursor: pointer;
box-shadow: 0 4px 12px rgba(0,0,0,0.1);
transition: transform 140ms ease, box-shadow 140ms ease;
}

.home-btn:hover {
transform: translateY(-2px);
box-shadow: 0 6px 16px rgba(0,0,0,0.15);
}
.solo-start {
min-height: 100vh;
background: linear-gradient(180deg, #A4E5FF 51.44%, #E6F8FF 65.87%);
padding: 40px 60px; position: relative;
font-family: "Instrument Sans", sans-serif;
}

.logo-wrapper {
position: relative; display: flex;
top: -5px; left: -25px;
align-items: center;
gap: 10px;
}

.home-button {
display: inline-flex; margin-top: 20px;
position: relative; left: -28px;
align-items: center; gap: 10px;
background-color: #E6E6E6; color: #454545;
border: 5px solid #E6E6E6; border-radius: 20px;
padding: 10px 16px;
cursor: pointer;
font-weight: 700; font-size: 16px; font-family: "Instrument Sans";
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
transition: transform 140ms ease, box-shadow 140ms ease;
flex: 1;
}

.home-button:hover {
transform: translateY(-2px);
box-shadow: 0 6px 16px rgba(0, 0, 0, 0.15);
}

.water-solo {
width: 1520px; height: 245px;
flex-shrink: 0;
background: linear-gradient(180deg, #1AABE5 21.15%, #2466DB 100%);
position: absolute; margin-top: 410px; margin-left: -70px;
}
Loading