Skip to content

Commit

Permalink
Merge branch 'feature/EdwardNew/home-page-animation-v3' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
EdwardNew committed Nov 6, 2024
2 parents cc81f88 + c4336cb commit a34cce5
Show file tree
Hide file tree
Showing 11 changed files with 4,103 additions and 4,959 deletions.
7,726 changes: 3,470 additions & 4,256 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions public/images/page-assets/badge.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
81 changes: 15 additions & 66 deletions public/images/page-assets/cards.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
207 changes: 119 additions & 88 deletions public/images/page-assets/companies.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions public/images/page-assets/feather.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
276 changes: 43 additions & 233 deletions public/images/page-assets/main-content.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
120 changes: 60 additions & 60 deletions public/images/page-assets/orgs.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 11 additions & 11 deletions public/images/page-assets/polaroid.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
125 changes: 50 additions & 75 deletions src/app/Home.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
//not sure if this is bad practice
body {
cursor: url('../../public/images/cursors/Cursor.svg'), auto;
padding: 50px;
border: 1px solid #ccc;
}

a,
Expand All @@ -29,6 +27,18 @@ summary {
--folder-height: 50vh;
}

#page-container {
background-color: black;
// display: grid;
justify-content: center;
justify-items: center;
align-content: center;
gap: 3rem;
height: 100%;
overflow-x: hidden;
position: relative;
}

#folder {
position: relative;
width: calc(var(--folder-height) * 1.411);
Expand Down Expand Up @@ -90,7 +100,6 @@ summary {
position: absolute;
display: none;
width: auto;
// outline: 2px solid red;
z-index: 1;
}

Expand All @@ -106,73 +115,33 @@ summary {
}
#feather,
#folder-feather {
height: calc(var(--folder-height) * 0.424);
height: calc(var(--folder-height) * 0.43);
}
#main-content,
#folder-main-content {
height: calc(var(--folder-height) * 0.373);
height: calc(var(--folder-height) * 0.43);
}
#polaroid,
#folder-polaroid {
height: calc(var(--folder-height) * 0.349);
height: calc(var(--folder-height) * 0.351);
}
#orgs,
#folder-orgs {
height: calc(var(--folder-height) * 0.565);
height: calc(var(--folder-height) * 0.45);
}
#companies,
#folder-companies {
height: calc(var(--folder-height) * 0.402);
height: calc(var(--folder-height) * 0.48);
}
#magnifying-glass,
#folder-magnifying-glass {
height: calc(var(--folder-height) * 0.884);
}
#cards,
#folder-cards {
height: calc(var(--folder-height) * 0.353);
height: calc(var(--folder-height) * 0.36);
}

// TODO: DELETE LATER
// #badge {
// bottom: 15%;
// right: -3%;
// transform: rotate(-11deg);
// }
// #feather {
// top: 0;
// right: 40%;
// transform: rotate(10deg);
// }
// #main-content {
// bottom: 30%;
// right: 50%;
// transform: translateX(50%);
// }
// #polaroid {
// top: 0;
// right: 55%;
// }
// #orgs {
// bottom: 5%;
// left: 1%;
// transform: rotate(42deg);
// }
// #companies {
// top: 28%;
// right: 3%;
// transform: rotate(-30deg);
// }
// #magnifying-glass {
// left: 0%;
// bottom: 25%;
// transform: rotate(54deg);
// }
// #cards {
// top: 32%;
// left: 8%;
// }

/* folder asset positions */
#folder-badge {
top: 15%;
Expand Down Expand Up @@ -243,7 +212,7 @@ summary {
left: 30%;
}

/* Styles for landscape screens (aspect ratio greater than 1) */
/* Styles for vertical screens (aspect ratio less than 1) */
@media (max-aspect-ratio: 1/1) {
#folder {
height: calc(var(--folder-width) * 0.708);
Expand All @@ -260,6 +229,7 @@ summary {
#folder,
#folder-back,
#folder-bottom,
#page-folder-bottom,
#folder-flap {
width: var(--folder-width);
}
Expand All @@ -268,48 +238,53 @@ summary {
height: calc(var(--folder-width) * 0.24);
}

#folder > .folder-asset {
height: auto;
}

#badge,
#feather,
#main-content,
#polaroid,
#orgs,
#companies,
#magnifying-glass,
#cards {
#cards,
#page-folder-bottom {
height: auto;
}

#badge {
width: calc(var(--folder-width) * 0.258);
transform: translate(65%, -125%) rotate(12deg);
#badge,
#folder-badge {
width: calc(var(--folder-width) * 0.311);
}
#feather {
width: calc(var(--folder-width) * 0.354);
transform: translate(-40%, -200%) rotate(-22.5deg);
#feather,
#folder-feather {
width: calc(var(--folder-width) * 0.269);
}
#main-content {
width: calc(var(--folder-width) * 0.54);
transform: translate(-58%, -60%) rotate(-5deg);
#main-content,
#folder-main-content {
width: calc(var(--folder-width) * 0.572);
}
#polaroid {
width: calc(var(--folder-width) * 0.176);
transform: translate(-90%, -200%) rotate(-21deg);
#polaroid,
#folder-polaroid {
width: calc(var(--folder-width) * 0.234);
}
#orgs {
width: calc(var(--folder-width) * 0.344);
transform: translate(20%, -140%) rotate(-46deg);
#orgs,
#folder-orgs {
width: calc(var(--folder-width) * 0.326);
}
#companies {
width: calc(var(--folder-width) * 0.351);
transform: translate(35%, -70%) rotate(29deg);
#companies,
#folder-companies {
width: calc(var(--folder-width) * 0.352);
}
#magnifying-glass {
width: calc(var(--folder-width) * 0.408);
transform: translate(-130%, -75%);
#magnifying-glass,
#folder-magnifying-glass {
width: calc(var(--folder-width) * 0.297);
}
#cards {
width: calc(var(--folder-width) * 0.35);
transform: translate(-110%, -140%) rotate(8deg);
#cards,
#folder-cards {
width: calc(var(--folder-width) * 0.36);
}

#paper-border-top-left {
Expand Down
Loading

0 comments on commit a34cce5

Please sign in to comment.