Skip to content

Commit

Permalink
Merge pull request #139 from jerrylovescheese/jerrysbranch
Browse files Browse the repository at this point in the history
Updated Mar 2 2024 3
  • Loading branch information
jerrylovescheese authored Mar 2, 2024
2 parents 8a39c27 + 40023c4 commit 10bc274
Show file tree
Hide file tree
Showing 10 changed files with 471 additions and 1,065 deletions.
2 changes: 1 addition & 1 deletion en/index-en.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="color-scheme" content="light dark">
<title>欢迎</title>
<link rel="stylesheet" href="../static/css/style-index.css">
<link rel="stylesheet" href="../static/css/style.css">
<link rel="stylesheet" href="../static/iconfont library/fontawesome-free-6.1.2-web/css/all.css">
<script src="../static/js/jquery-3.7.1.js"></script>
<script src="../static/js/include.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="color-scheme" content="light dark">
<title>欢迎</title>
<link rel="stylesheet" href="./static/css/style-index.css">
<link rel="stylesheet" href="./static/css/style.css">
<link rel="stylesheet" href="./static/iconfont library/fontawesome-free-6.1.2-web/css/all.css">
<script src="./static/js/jquery-3.7.1.js"></script>
<script src="./static/js/include.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions pages/layout/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,13 @@
<div class="app-element-pop-ups" id="app-element-pop-ups-2">
<a href="./classical_ch.html" id="app-element-pop-up-label-1">
<span class="app-element-pop-up-label">
<i class="fas fa-pen"></i>&emsp13;&emsp13;高中古文
<i class="fas fa-pen"></i>&emsp13;&emsp13;初中古文
</span>
</a>
<div class="separator"></div>
<a href="./classical_ch_sh.html" id="app-element-pop-up-label-2">
<span class="app-element-pop-up-label">
<i class="fas fa-pen"></i>&emsp13;&emsp13;初中古文
<i class="fas fa-pen"></i>&emsp13;&emsp13;高中古文
</span>
</a>
</div>
Expand Down
247 changes: 150 additions & 97 deletions pages/layout/layout_for_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,119 +2,172 @@
<html lang="en">

<head>

<script>
$(function () {
$("#app-element-2").click(function () {
$(".app-element-pop-ups-3").toggleClass("active");
});
});
$(function () {
$("#app-element-4").click(function () {
$("#app-element-pop-ups-1").toggleClass("active");
});
});
$(function () {
$("#app-element-5").click(function () {
$("#app-element-pop-ups-2").toggleClass("active");
});
});
</script>
</head>

<body>
<div id="core">
<div id="bar-wrapper">
<div id="app" tabindex="1">
<div id="app-element-container">
<a href="jerryly.top">
<div class="app-elements" id="app-element-1"></div>
</a>
<div class="separator"></div>
<div class="app-elements" id="app-element-3">
<a href="pages/aluminum_studio.html"><span class="app-element-label">关于我</span></a>
</div>
<div class="app-elements" id="app-element-4">
<span class="app-element-label">爱好箱</span>
<div id="core-backdrop" tabindex="1">
<div id="bar-wrapper" tabindex="1">
<div id="app">
<div id="app-element-container">
<a id="home-button" href="jerryly.top">
<div class="app-elements" id="app-element-1"></div>
<span class="app-element-label">的网站</span>
</a>
<div class="separator"></div>
<div class="app-elements" id="app-element-3">
<a href="pages/aluminum_studio.html">
<span class="app-element-label">
<i class="fa-solid fa-circle-info"></i>
&emsp13;&emsp13;关于我
</span>
</a>
</div>
<div class="app-elements" id="app-element-4">
<span class="app-element-label">
<i class="fa-solid fa-heart"></i>
&emsp13;&emsp13;爱好箱
</span>
</div>
<div class="app-elements" id="app-element-5">
<span class="app-element-label">
<i class="fa-solid fa-newspaper"></i>
&emsp13;&emsp13;整理箱
</span>
</div>
<div class="app-elements" id="app-element-6">
<a href="pages/clock.html">
<span class="app-element-label">
<i class="fa-solid fa-clock"></i>
&emsp13;&emsp13;时间大厅
</span>
</a>
</div>
</div>
<div class="app-elements" id="app-element-5">
<span class="app-element-label">整理箱</span>
<div class="app-elements" id="app-element-2">
<i class="fa-solid fa-bars"></i>
</div>
<div class="app-elements" id="app-element-6">
<a href="pages/clock.html"><span class="app-element-label">时间大厅</span></a>
</div>
</div>
<div class="app-elements" id="app-element-2">
<i class="fa-solid fa-bars"></i>
</div>
</div>
</div>
</div>

<div id="close-button-container" tabindex="0">
<div id="close-all">
<div class="site-indicator" id="close-indicator">
<i class="fas fa-close"></i><span id="indicator-label">&emsp;关闭所有浮窗</span>
</div>
</div>
</div>

<div id="site-map" tabindex="0">
<div class="site-indicator" id="site-indicator">
<i class="fas fa-map"></i>
</div>
<div id="map-text">
<div id="map-title"><i class="fas fa-map-pin"></i>&emsp;jerryly.top 网站地图</div>
<ul id="map-link-list">
<a href="pages/aluminum_studio.html">
<li>关于</li>
</a>
<a href="pages/apple.html">
<li>苹果</li>
</a>
<a href="pages/christmas.html">
<li>圣诞</li>
</a>
<a href="pages/classical_ch_sh.html">
<li>部编版高中语文古文合集</li>
</a>
<a href="pages/classical_ch.html">
<li>部编版初中语文古文合集</li>
</a>
<a href="pages/clock.html">
<li>时间大厅</li>
</a>
<a href="pages/develop.html">
<li>开发者</li>
</a>
<a href="pages/flashback.html">
<li>采光间</li>
</a>
<a href="pages/friends.html">
<li>老友记</li>
</a>
<a href="pages/homemade_giftcard.html">
<li>手写祝福活动</li>
</a>
<a href="pages/music.html">
<li>音乐</li>
<div class="app-element-pop-ups" id="app-element-pop-ups-1">
<a href="pages/apple.html" id="app-element-pop-up-label-1">
<span class="app-element-pop-up-label">
<i class="fa-brands fa-apple"></i>&emsp13;&emsp13;苹果
</span>
</a>
<a href="pages/search.html">
<li>搜索</li>
<div class="separator"></div>
<a href="pages/taylorswift.html" id="app-element-pop-up-label-2">
<span class="app-element-pop-up-label">
<i class="fas fa-microphone"></i>&emsp13;&emsp13;霉霉
</span>
</a>
<a href="pages/social_network.html">
<li>社交媒体</li>
</a>
<a href="pages/survey.html">
<li>调查问卷</li>
</div>
<div class="app-element-pop-ups" id="app-element-pop-ups-2">
<a href="pages/classical_ch.html" id="app-element-pop-up-label-1">
<span class="app-element-pop-up-label">
<i class="fas fa-pen"></i>&emsp13;&emsp13;高中古文
</span>
</a>
<a href="pages/taylorswift.html">
<li>泰勒·斯威夫特</li>
<div class="separator"></div>
<a href="pages/classical_ch_sh.html" id="app-element-pop-up-label-2">
<span class="app-element-pop-up-label">
<i class="fas fa-pen"></i>&emsp13;&emsp13;初中古文
</span>
</a>
</ul>
</div>
<div class="app-element-pop-ups-3">
<span id="app-element-pop-up-label-3"><i
class="fa-solid fa-map-location-dot"></i>&emsp13;&emsp13;所有页面</span>
<ul id="app-site-list">
<a href="pages/aluminum_studio.html">
<li>关于我</li>
</a>
<a href="pages/apple.html">
<li>苹果</li>
</a>
<a href="pages/christmas.html">
<li>圣诞节</li>
</a>
<a href="pages/classical_ch_sh.html">
<li>部编版高中语文古文合集</li>
</a>
<a href="pages/classical_ch.html">
<li>部编版初中语文古文合集</li>
</a>
<a href="pages/clock.html">
<li>时钟</li>
</a>
<a href="pages/develop.html">
<li>开发者</li>
</a>
<a href="pages/friends.html">
<li>老友记</li>
</a>
<a href="pages/homemade_giftcard.html">
<li>手写祝福</li>
</a>
<a href="pages/music.html">
<li>音乐</li>
</a>
<a href="pages/search.html">
<li>搜索</li>
</a>
<a href="pages/social_network.html">
<li>社交网络</li>
</a>
<a href="pages/survey.html">
<li>调查</li>
</a>
</ul>
</div>
</div>
</div>

<div id="toolkit" tabindex="0">
<div class="site-indicator" id="toolkit-indicator">
<i class="fas fa-ellipsis-v"></i>
<div class="loader-wrapper">
<i class="fa-solid fa-spinner fa-spin"></i>
<span id="loader-prompt"><br>Preparing elements...</span>
</div>

<div id="tool">
<div class="tool-elements" id="return-to-top">
<a href="#">
<span class="tool-element-label">
<i class="fas fa-arrow-up"></i>&emsp13;回顶部
</span>
</a>
</div>
<a href="#">
<div class="return-to-top">
<i class="fas fa-chevron-up"></i>&emsp;回到顶部
</div>
</a>
<a href="../../en/index-en.html">
<div class="en-us">
EN <span style="font-weight: normal;">&emsp14;Switch to English</span>
</div>
</a>
<div id="find-me">
<a href="https://www.twitter.com/@jerrylovestweet"><i class="fa-brands fa-twitter"></i></a>&emsp;<a
href="https://github.com/jerrylovescheese"><i class="fa-brands fa-github"></i></a>
<div class="separator"></div>
<div class="tool-elements" id="language">
<a href="./en/index-en.html">
<span class="tool-element-label">
<i class="fas fa-language"></i>&emsp13;English
</span>
</a>
</div>
<div class="separator"></div>
<div class="tool-elements" id="connect">
<a href="pages/social_network.html">
<span class="tool-element-label">
<i class="fas fa-rss"></i>&emsp13;联系
</span>
</a>
</div>
</div>
</body>
Expand Down
Loading

0 comments on commit 10bc274

Please sign in to comment.