Skip to content

Commit

Permalink
Merge branch 'test'
Browse files Browse the repository at this point in the history
  • Loading branch information
Kicamon committed Jun 8, 2024
2 parents 0c5cf00 + 815557a commit 5286ffe
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion css/timeline.css
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
transition: 0.4s;
padding: 0 10px;
box-sizing: border-box;
color: #fff;
color: #B0E0E6;
}

.content-desc {
Expand Down
3 changes: 1 addition & 2 deletions pages/story.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<link rel="icon" href="../static/love.ico">
<link href="../css/timeline.css" rel="stylesheet">
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
<script type="module" src="../scripts/story.js"></script>
</head>

<body>
Expand All @@ -25,9 +24,9 @@ <h3 class="subtitle">我们的故事</h3>
<h2 class="endtitle">我们的故事,未完待续……</h2>
</div>
</div>

</div>

<script type="module" src="../scripts/story.js"></script>
<script type="module" src="../scripts/timeline.js"></script>
</body>

Expand Down
6 changes: 4 additions & 2 deletions scripts/nav.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
let $nav = $(".nav");

let Nav = function () {
$nav.append(`<div class="title">
$nav.append(`
<div class="title">
我们的爱
</div>
<div class="title">
我们会深情拥抱,我们会一直到老。
</div>`);
</div>
`);
}

Nav();

0 comments on commit 5286ffe

Please sign in to comment.