Skip to content

Commit

Permalink
Merge pull request #377 from jerrylovescheese/jerrysbranch
Browse files Browse the repository at this point in the history
Jerrysbranch
  • Loading branch information
jerrylovescheese authored Nov 25, 2024
2 parents 70add6f + b1f8404 commit b263853
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 54 deletions.
90 changes: 44 additions & 46 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,6 @@
</div>
</a>

<div class="canvas" id="canvas-10">
<div class="canvas-text" id="canvas-10-text">
A new look
</div>
<div class="canvas-text-small" id="canvas-10-text-small">
For a new year ahead.
</div>
</div>

<div class="canvas" id="canvas-9">
<div class="canvas-text" id="canvas-9-text">
It's <span>almost</span> time!
Expand All @@ -141,50 +132,57 @@
</a>
</div>

<div class="canvas" id="canvas-8">
<blockquote class="twitter-tweet">
<p lang="en" dir="ltr">You living in a movie where the villains actually win <a
href="https://t.co/ImJgz73bU8">https://t.co/ImJgz73bU8</a></p>&mdash; Hi I’m Solomon
(@solomonmissouri) <a
href="https://twitter.com/solomonmissouri/status/1847481341874524290?ref_src=twsrc%5Etfw">October 19,
2024</a>
</blockquote>
<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
<a href="#canvas-7">
<div id="canvas-clicker">
<i class="fas fa-arrow-down"></i>&emsp13;Next page
</div>
</a>
</div>
<div id="cards-carousel">
<div class="cards" id="canvas-10">

</div>

<div class="canvas" id="canvas-7">
<!-- <div class="canvas-text" id="canvas-7-text">
<b>November</b>
<div class="cards" id="canvas-8">
<blockquote class="twitter-tweet">
<p lang="en" dir="ltr">You living in a movie where the villains actually win <a
href="https://t.co/ImJgz73bU8">https://t.co/ImJgz73bU8</a></p>&mdash; Hi I’m Solomon
(@solomonmissouri) <a
href="https://twitter.com/solomonmissouri/status/1847481341874524290?ref_src=twsrc%5Etfw">October
19,
2024</a>
</blockquote>
<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
<a href="#canvas-7">
<div id="canvas-clicker">
<i class="fas fa-arrow-down"></i>
</div>
</a>
</div>
<div class="canvas-text-small">no means no 🥰</div> -->
<a href="#canvas-6">
<div id="canvas-clicker">
<i class="fas fa-arrow-down"></i>&emsp13;Next page
</div>
</a>
</div>

<div class="canvas" id="canvas-6">
<a href="#canvas-5">
<div id="canvas-clicker">
<i class="fas fa-arrow-down"></i>&emsp13;Next page
<div class="cards" id="canvas-7">
<!-- <div class="canvas-text" id="canvas-7-text">
<b>November</b>
</div>
</a>
</div>
<div class="canvas-text-small">no means no 🥰</div> -->
<a href="#canvas-6">
<div id="canvas-clicker">
<i class="fas fa-arrow-down"></i>
</div>
</a>
</div>

<div class="canvas" id="canvas-5">
<div class="canvas-text" id="canvas-5-text">
<div class="cards" id="canvas-6">
<a href="#canvas-5">
<div id="canvas-clicker">
<i class="fas fa-arrow-down"></i>
</div>
</a>
</div>
<a href="#canvas-2">
<div id="canvas-clicker">
<i class="fas fa-arrow-down"></i>&emsp13;Next page

<div class="cards" id="canvas-5">
<div class="canvas-text" id="canvas-5-text">
</div>
</a>
<a href="#canvas-2">
<div id="canvas-clicker">
<i class="fas fa-arrow-down"></i>
</div>
</a>
</div>
</div>

<div class="canvas" id="canvas-2">
Expand Down
Binary file modified static/.DS_Store
Binary file not shown.
Binary file modified static/css/.DS_Store
Binary file not shown.
38 changes: 30 additions & 8 deletions static/css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,9 @@
}

@media (prefers-color-scheme: dark) {
.canvas {

.canvas,
.cards {
border-color: #333 !important;
}

Expand Down Expand Up @@ -705,6 +707,32 @@
margin-left: 30px;
}

#cards-carousel {
display: flex;
overflow-x: scroll;
overflow-y: hidden;
margin-top: 30px;
width: calc(100% - 30px);
}

.cards {
width: calc(50vh - 60px);
aspect-ratio: 16/9;
background-size: cover;
background-position: center;
background-repeat: no-repeat;
overflow: hidden;
position: relative;
display: flex;
flex-direction: column;
justify-content: center;
align-items: start;
border-radius: 10px;
border: solid 1px #eee;
margin-bottom: 30px;
margin-left: 30px;
}

.canvas-text {
font-family: 'Monaspace Neon', 'Inter', 'Source Han Sans', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
font-size: 25px;
Expand Down Expand Up @@ -1095,7 +1123,6 @@
background-color: unset !important;
justify-content: center;
align-items: center;
margin-top: 30px;
}

#canvas-8 .canvas-text {
Expand Down Expand Up @@ -1152,16 +1179,11 @@
}

#canvas-10 {
width: 100vw;
height: 100vh;
margin: 0;
border-radius: 0px;
border: none;
background-image: url(../img/Nov\ 20\ 2024\ 2.webp);
background-size: cover;
background-repeat: no-repeat;
}

#canvas-10 > div{
#canvas-10>div {
color: white !important;
}
Binary file modified static/fonts/.DS_Store
Binary file not shown.

0 comments on commit b263853

Please sign in to comment.