Skip to content

Commit

Permalink
Merge pull request #272 from jerrylovescheese/jerrysbranch
Browse files Browse the repository at this point in the history 
Updated Aug 13 2024
  • Loading branch information
@jerrylovescheese
jerrylovescheese authored Aug 13, 2024
2 parents 1ad9d24 + 26b9575 commit 844c1e6
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 62 deletions.
59 changes: 6 additions & 53 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
<div class="canvas" id="canvas-13">
<div class="canvas-clicker">
<a href="#canvas-12">
<div class="canvas-clicker-inside"><i class="fas fa-circle-chevron-down"></i>&emsp;1 of 6</div>
<div class="canvas-clicker-inside"><i class="fas fa-circle-chevron-down"></i>&emsp;1 of 5</div>
</a>
</div>
</div>
Expand All @@ -119,65 +119,18 @@
<div id="canvas-12-img"></div>
<div class="canvas-text">get in the car it's august</div>
<div class="canvas-clicker">
<a href="#canvas-11">
<div class="canvas-clicker-inside"><i class="fas fa-circle-chevron-down"></i>&emsp;2 of 6</div>
<a href="#canvas-10">
<div class="canvas-clicker-inside"><i class="fas fa-circle-chevron-down"></i>&emsp;2 of 5</div>
</a>
</div>
</div>

<div class="canvas" id="canvas-11">
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" x="0" y="0" viewBox="0 0 140 160" xml:space="preserve">
<g class="white">
<g class="emblem">
<path
d="M74.9,76.8c-1.2-0.4-3.2-0.5-4.9,0.9c-1.7-1.4-3.7-1.3-4.9-0.9c-1,0.4-1.8,0.6-3.3,0.6c1.5,3,4.6,5.1,8.2,5.1 c3.6,0,6.7-2.1,8.2-5.1C76.7,77.4,75.9,77.1,74.9,76.8z" />
<path
d="M70,0C45.3,0,25.2,20,25.2,44.7c0,21.2,14.7,38.9,34.5,43.6C44,79.9,37.6,60.6,45.2,44.5 c1.2,6.4,5.4,12.1,11.6,15C48.7,40.6,54.7,18.3,71.4,6C68.1,17.2,73.1,27.5,84,35.3c12.4,8.9,12.9,27.1,2,36.9 c4.3-1,8.4-3.4,11.4-7.1c-1.9,9.6-7.9,18.3-17.1,23.2c19.8-4.6,34.5-22.4,34.5-43.6C114.8,20,94.7,0,70,0z" />
</g>

<g class="paris2024">
<title>Paris 2024</title>
<path
d="M137.9 103.9v4.6c-1-.7-2.3-.9-3.4-1.6-.9-.5-1.2-1.5-1.2-2.5v-4.2h-2.2v4.2c0 1.4.4 2.9 1.6 3.8.8.6 1.7.9 2.6 1.2.8.3 1.7.6 2.2 1.3.4.5.5 1.1.5 1.8v1.3h2.1v-9.9h-2.2zM122.6 107.6c.5-.6 1-1.2 1.3-1.9.3-.7.4-1.4.3-2.1-.2-1.4-1.2-2.6-2.5-3.1-1.3-.6-3-.6-4.3.1-1.3.6-2.2 1.9-2.3 3.3-.1 1.5.6 2.8 1.8 3.7l1.2-1.5c-.4-.4-.8-.9-.9-1.5-.1-.6 0-1.1.4-1.6.7-.9 2.1-1.2 3.2-.7.5.3 1 .7 1.1 1.2.2.6.1 1.2-.1 1.7-.3.5-.6 1-1 1.5-1.5 1.8-2.9 3.5-4.4 5.3-.5.6-1 1.3-1.6 1.9h9.8V112H119l3.6-4.4zM106.1 109c-.8 1.9-2.9 3.2-5 3-2.1-.1-3.9-1.6-4.5-3.5-.6-2 .1-4.2 1.8-5.5 1.7-1.3 4.1-1.3 5.9-.1 2 1.3 2.8 3.9 1.8 6.1zm.5-7c-2.2-2.1-5.6-2.6-8.3-1.4-2.8 1.2-4.4 4.1-4.2 7 .3 2.9 2.5 5.4 5.4 6.1 2.9.7 6.2-.3 7.9-2.8 1.8-2.4 1.7-5.8-.1-8.2-.2-.2-.5-.4-.7-.7zM86.1 107.6c.5-.6 1-1.2 1.3-1.9.3-.7.4-1.4.3-2.1-.2-1.4-1.2-2.6-2.5-3.1-1.3-.6-3-.6-4.3.1-1.3.6-2.2 1.9-2.3 3.3-.1 1.5.6 2.8 1.8 3.7l1.2-1.5c-.4-.4-.8-.9-.9-1.5-.1-.6 0-1.1.4-1.6.7-.9 2.1-1.2 3.2-.7.5.3 1 .7 1.1 1.2.2.6.1 1.2-.1 1.7-.3.5-.6 1-1 1.5-1.5 1.8-2.9 3.5-4.4 5.3l-1.6 1.9h9.8V112h-5.6l3.6-4.4zM65.9 107.3c-.8-.6-1.7-.9-2.6-1.3-.9-.3-1.8-.6-2.5-1.3-.6-.6-.4-1.6.1-2.2.6-.6 1.6-.7 2.4-.5.9.3 1.5 1.1 1.5 2H67c0-1-.3-1.9-1-2.7-.7-.7-1.6-1.1-2.6-1.3-1-.1-2.1 0-3 .5-.9.5-1.6 1.2-1.9 2.1-.3.9-.2 2 .2 2.8.5.9 1.4 1.4 2.4 1.8 1 .4 2.2.7 3.2 1.3.4.3.7.6.8 1 .1.4.1.9-.1 1.3-.5 1-1.8 1.3-2.8 1.1-1.1-.2-2-1.1-2-2.3h-2.1c0 1.1.4 2.1 1.2 2.9.8.8 1.9 1.2 3.1 1.3 1.2.1 2.4-.1 3.4-.8.9-.6 1.5-1.6 1.6-2.6-.1-1.1-.5-2.3-1.5-3.1zM49.2 103.3v10.5h2.2V103c-.8 0-1.5.1-2.2.3zM49.2 102.1c.7-.2 1.4-.3 2.2-.3v-1.6h-2.2v1.9zM36.8 102.2c1.4 0 2.8.7 2.9 2.1.1.7-.1 1.4-.6 1.9-.5.6-1.3.9-2 1.3-.9.4-1.7.8-2.5 1.5v-6.8h2.2zm3.3 6.5c-.2-.1-.5-.2-.8-.3.7-.4 1.4-.8 1.9-1.4.4-.6.7-1.2.8-1.9.2-1.5-.3-2.9-1.6-3.8-1.7-1.2-3.8-1-5.8-1h-2.1v13.6h2.2v-1.2c0-.9.5-1.8 1.3-2.2.8-.5 1.9-.5 2.7-.2.8.4 1.4 1.2 1.5 2 .1.5 0 1.1 0 1.6h2.2c0-.7 0-1.5-.1-2.2-.3-1.3-1.1-2.4-2.2-3zM23 108.7c-1.3-1.3-3.2-1.7-5-1.4v-2.2c0-.4 0-.8.1-1.2.2-.8.8-1.4 1.6-1.6.8-.3 1.7-.1 2.4.4s1 1.3 1 2.1V109c0-.2-.1-.3-.1-.3zm0-8.1c-1.9-1-4.6-.7-6 .9-.7.8-1.1 1.8-1.1 2.8v9.5H18v-4.5c1.3-.2 2.7 0 3.8.7 1 .7 1.4 1.7 1.4 2.8v.9h2.2v-9.1c-.1-1.6-.8-3.2-2.4-4zM6.9 106c-.5.7-1.4 1.2-2.2 1.6-.9.4-1.8.9-2.5 1.5v-6.8h2.1c1.2 0 2.4.3 2.9 1.5.2.6.1 1.5-.3 2.2zm.1-5.2c-1-.5-2.2-.5-3.3-.5H0v13.6h2.2c0-.8-.1-1.6.3-2.3.5-1.2 1.8-1.7 2.9-2.2 1.2-.6 2.5-1.1 3.3-2.2.7-1 .9-2.2.7-3.4-.2-1.4-1.2-2.5-2.4-3z" />
</g>

<g class="olympics fade">
<circle class="ring blue" cx="44.9" cy="137.8" r="10.5" fill="none" stroke="#0081C8"
stroke-width="2" stroke-miterlimit="10" />
<circle class="ring black" cx="70" cy="137.8" r="10.5" fill="none" stroke="#000000" stroke-width="2"
stroke-miterlimit="10" />
<circle class="ring red" cx="95" cy="137.8" r="10.5" fill="none" stroke="#EE334E" stroke-width="2"
stroke-miterlimit="10" />
<circle class="ring yellow" cx="57.3" cy="148.5" r="10.5" fill="none" stroke="#FCB131"
stroke-width="2" stroke-miterlimit="10" />
<circle class="ring green" cx="82.5" cy="148.5" r="10.5" fill="none" stroke="#00A651"
stroke-width="2" stroke-miterlimit="10" />
</g>

</g>

</svg>
<div class="canvas-text-small">
Paris 2024 Olympic Games
<div class="canvas-text">
Find out more on <a href="https://olympics.com">olympics.com&emsp13;<i
class="fas fa-arrow-right"></i></a>
</div>
<br>
<div class="canvas-clicker">
<a href="#canvas-10">
<div class="canvas-clicker-inside"><i class="fas fa-circle-chevron-down"></i>&emsp;3 of 6</div>
</a>
</div>
</div>
</div>

<div class="canvas" id="canvas-10">
<div class="canvas-text">感谢五载相伴</div>
<span class="canvas-text-small">江源工作室期待与您共度下一个五年。</span>
<div class="canvas-clicker">
<a href="#canvas-1">
<div class="canvas-clicker-inside"><i class="fas fa-circle-chevron-down"></i>&emsp;4 of 6</div>
<div class="canvas-clicker-inside"><i class="fas fa-circle-chevron-down"></i>&emsp;3 of 5</div>
</a>
</div>
</div>
Expand All @@ -198,7 +151,7 @@
<audio src="./static/audio/May 13 2024 3.mp3" controls controlsList="nodownload"></audio>
<div class="canvas-clicker">
<a href="#canvas-3">
<div class="canvas-clicker-inside"><i class="fas fa-circle-chevron-down"></i>&emsp;5 of 6</div>
<div class="canvas-clicker-inside"><i class="fas fa-circle-chevron-down"></i>&emsp;4 of 5</div>
</a>
</div>
</div>
Expand Down Expand Up @@ -285,7 +238,7 @@
</div>
<div class="canvas-clicker">
<a href="#canvas-13">
<div class="canvas-clicker-inside"><i class="fas fa-circle-chevron-up"></i>&emsp;6 of 6</div>
<div class="canvas-clicker-inside"><i class="fas fa-circle-chevron-up"></i>&emsp;5 of 5</div>
</a>
</div>
</div>
Expand Down
30 changes: 21 additions & 9 deletions pages/aluminum_studio.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,18 @@
}
}

@media (max-width: 768px) {
.pages-container>#dev-cal-2 {
margin: 0 !important;
margin-bottom: 10px !important;
}

#dev-cal-2>b {
display: block;
margin-bottom: 5px;
}
}

@media (prefers-color-scheme: dark) {
#my-favorite-things {
border-top: solid 1px rgb(255, 255, 255) !important;
Expand Down Expand Up @@ -85,7 +97,7 @@
margin: 0 auto;
border-top: solid 1px black;
border-bottom: solid 1px black;
font-size: 18px;
font-size: 15px;
font-family: 'Inter', 'Source Han Sans', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
}

Expand Down Expand Up @@ -130,20 +142,20 @@
<div class="pages-container" id="alu-stu-namecard">
<p id="dev-cal-2"><span id="alu-stu-name">Jiangyuan Li (Jerry Cyan)</span></p>
<p id="dev-cal-2">un garçon, 18</p>
<p id="dev-cal-2"><i class="fa-solid fa-briefcase"></i>&emsp;<b>Job</b>&emsp;Full-time student</p>
<p id="dev-cal-2"><i class="fa-solid fa-building-columns"></i>&emsp;<b>Previously at</b>&emsp;The Second
<p id="dev-cal-2"><b><i class="fa-solid fa-briefcase"></i>&emsp;Job&emsp;</b>Full-time student</p>
<p id="dev-cal-2"><b><i class="fa-solid fa-building-columns"></i>&emsp;Previously at&emsp;</b>The Second
High School attached to Beijing Normal University</p>
<p id="dev-cal-2"><i class="fa-solid fa-building-columns"></i>&emsp;<b>Currently at</b>&emsp;University of
<p id="dev-cal-2"><b><i class="fa-solid fa-building-columns"></i>&emsp;Currently at&emsp;</b>University of
Virginia</p>
<p id="dev-cal-2"><i class="fa-solid fa-envelope"></i>&emsp;<b>Mailto</b>&emsp;<a
<p id="dev-cal-2"><b><i class="fa-solid fa-envelope"></i>&emsp;Mailto&emsp;</b><a
href="mailto:[email protected]">[email protected]</a></p>
<p id="dev-cal-2"><i class="fa-solid fa-language"></i>&emsp;<b>Available in</b>&emsp;Simplified Chinese
<p id="dev-cal-2"><b><i class="fa-solid fa-language"></i>&emsp;Available in&emsp;</b>Simplified Chinese
简体中文, English (US)</p>
<p id="dev-cal-2"><i class="fa-solid fa-terminal"></i>&emsp;<b>Works
with</b>&emsp;<i class="fa-brands fa-python"></i>&emsp13;Python, <i
<p id="dev-cal-2"><b><i class="fa-solid fa-terminal"></i>&emsp;Works
with&emsp;</b><i class="fa-brands fa-python"></i>&emsp13;Python, <i
class="fa-brands fa-java"></i>&emsp13;Java, <i class="fa-brands fa-html5"></i>&emsp13;HTML, <i
class="fa-brands fa-css3"></i>&emsp13;CSS</p>
<p id="dev-cal-2"><i class="fa-solid fa-book-open-reader"></i>&emsp;<b>Learning</b>&emsp;French</p>
<p id="dev-cal-2"><b><i class="fa-solid fa-book-open-reader"></i>&emsp;Learning&emsp;</b>French</p>
</div>
<p id="dev-cal-2" class="subtitle"><span id="subtitle-2">为什么2024年了，我还要一行一行的写静态网页</span></p>
<p id="dev-cal-2">
Expand Down

0 comments on commit 844c1e6

Please sign in to comment.