Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:ucsddesignco/stride2024 into pag…
Browse files Browse the repository at this point in the history
…e/comnk/about-page
  • Loading branch information
comnk committed Nov 7, 2024
2 parents 728de49 + 463d235 commit 0f89af4
Show file tree
Hide file tree
Showing 33 changed files with 542 additions and 194 deletions.
4 changes: 4 additions & 0 deletions public/images/accessory-icons/icon-bow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/images/accessory-icons/icon-moustache-1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions public/images/accessory-icons/icon-moustache-2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/images/accessory-icons/icon-moustache.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/images/accessory-icons/icon-tie.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/images/accessory-icons/x-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/images/hat-icons/icon-beret.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/images/hat-icons/icon-bowler.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/images/hat-icons/icon-hawk.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/images/hat-icons/icon-ivan.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/images/hat-icons/icon-nerve.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/images/hat-icons/icon-tophat.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions public/images/icons/click-to-crack-the-case-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion public/images/page-borders/bottom-edge.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions public/images/page-borders/top-edge.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions public/images/page-borders/top-left-corner.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
43 changes: 21 additions & 22 deletions src/app/Home.scss
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,13 @@ summary {
position: relative;
}

#click-to-open-text {
display: flex;
justify-content: center;
align-items: center;
gap: 20px;
}

#folder {
position: relative;
width: calc(var(--folder-height) * 1.411);
Expand Down Expand Up @@ -182,33 +189,26 @@ summary {
text-align: center;
}

#paper-border-top-left,
#paper-border-bottom-right,
#paper-border-top-edge,
#paper-border-bottom-edge {
.paper-border {
position: absolute;
z-index: 4;
height: auto;
}

#paper-border-top-left {
width: calc(var(--folder-height) * 0.5);
top: -1%;
left: -1%;
top: -5px;
left: 0;
}
#paper-border-bottom-right {
width: calc(var(--folder-height) * 0.4);
bottom: 0;
right: 0;
}
#paper-border-top-edge {
width: calc(var(--folder-height) * 0.8);
top: 0;
right: 0;
right: 2%;
}
#paper-border-bottom-edge {
width: calc(var(--folder-height) * 0.7);
bottom: 0;
bottom: -10px;
left: 30%;
}

Expand Down Expand Up @@ -305,24 +305,23 @@ summary {
}

#paper-border-top-left {
width: calc(var(--folder-width) * 0.4);
top: -3%;
left: -2%;
top: 0;
left: auto;
right: -20px;
transform: scaleX(-1);
}
#paper-border-bottom-right {
width: calc(var(--folder-width) * 0.4);
bottom: 0;
left: 0;
bottom: -5px;
left: -7px;
transform: scaleX(-1);
}
#paper-border-top-edge {
width: calc(var(--folder-width) * 0.8);
top: 0;
right: 0;
right: 40%;
}
#paper-border-bottom-edge {
width: calc(var(--folder-width) * 0.7);
bottom: 0;
scale: 0.7;
bottom: -10px;
right: 0;
}
}
Loading

0 comments on commit 0f89af4

Please sign in to comment.