generated from west2-online-reserve/collection-template
-
Notifications
You must be signed in to change notification settings - Fork 46
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
832304110 - work2 #97
Open
Peggy1017
wants to merge
13
commits into
west2-online-reserve:main
Choose a base branch
from
Peggy1017:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
93b280b
add:complete work1
Peggy1017 f01d260
add: complete work1
Peggy1017 c9c378a
fix: file ext name
renbaoshuo 3487083
add: complete work2
Peggy1017 34b8a0b
Merge branch 'main' of http://github.com/Peggy1017/collection-frontend
Peggy1017 308dcf8
add complete :work2
Peggy1017 9f65eaa
add: complete work2
Peggy1017 cecced1
newbranch
Peggy1017 217c3b0
add: complete work3
Peggy1017 114c4d7
add:complete work3
Peggy1017 c5dff33
add:complete work3
Peggy1017 9bfebe3
add:complete work3
Peggy1017 d3c9f37
add:complete work2
Peggy1017 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,101 @@ | ||
<!DOCTYPE html> | ||
<html> | ||
<head> | ||
<meta charset="UTF-8"> | ||
<meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
<title>人物介绍</title> | ||
<link rel="stylesheet" href="stylesss.css"> | ||
|
||
</head> | ||
|
||
<body style="background-color:rgb(172, 219, 234)"> | ||
|
||
<div class="container"> | ||
<header> | ||
<a href="#character">人物介绍</a> | ||
<a href="#series">系列作品</a> | ||
<a href="#feedback">我们相关</a> | ||
</header> | ||
|
||
<section class="character-intro" id="character"> | ||
<img src="all.jpeg" alt="海绵宝宝系列"> | ||
<p>海绵宝宝是一只黄颜色的方形海绵, 住在太平洋深处风光优美无人知的比基尼海滩水域下。那里是一个没有忧愁的世界,住着一群快乐的海洋生物。</p> | ||
</section> | ||
|
||
<section class="characters"> | ||
<div class="character-card" style="background-color: #f8cf3a;"> | ||
<h2>海绵宝宝</h2> | ||
<p>是动画《海绵宝宝》系列的主角。超级活泼和可爱,给人带来快乐。</p> | ||
</div> | ||
<div class="character-card" style="background-color: #d08177;"> | ||
<h2>派大星</h2> | ||
<p>粉红色的海星,很可爱,和海绵宝宝交情最好。</p> | ||
</div> | ||
<div class="character-card" style="background-color: #386098;"> | ||
<h2>章鱼哥</h2> | ||
<p>大鼻子章鱼,有艺术天赋,常有脾气的名字,本质上是个善良且有正义感的好鱼。</p> | ||
</div> | ||
</section> | ||
|
||
<section class="characters"> | ||
<div class="character-img"> | ||
<img src="haimianbaobao.jpeg" alt="海绵宝宝"> | ||
</div> | ||
<div class="character-img"> | ||
<img src="paidaxing.jpeg" alt="派大星"> | ||
</div> | ||
<div class="character-img"> | ||
<img src="zhangyuge.jpeg" alt="章鱼哥"> | ||
</div> | ||
</section> | ||
|
||
<section class="series" id="series"> | ||
<table> | ||
<thead> | ||
<tr> | ||
<th>系列</th> | ||
<th>日期</th> | ||
<th>集数</th> | ||
</tr> | ||
</thead> | ||
<tbody> | ||
<tr> | ||
<td class="col1">海绵宝宝</td> | ||
<td class="col2">2008年10月23日</td> | ||
<td class="col3">60集</td> | ||
</tr> | ||
<tr> | ||
<td class="col1">海绵宝宝</td> | ||
<td class="col2">2008年10月23日</td> | ||
<td class="col3">60集</td> | ||
</tr> | ||
<tr> | ||
<td class="col1">海绵宝宝</td> | ||
<td class="col2">2008年10月23日</td> | ||
<td class="col3">60集</td> | ||
</tr> | ||
<tr> | ||
<td class="col1">海绵宝宝</td> | ||
<td class="col2">2008年10月23日</td> | ||
<td class="col3">60集</td> | ||
</tr> | ||
<tr> | ||
<td class="col1">海绵宝宝</td> | ||
<td class="col2">2008年10月23日</td> | ||
<td class="col3">60集</td> | ||
</tr> | ||
</tbody> | ||
</table> | ||
</section> | ||
|
||
<section class="feedback" id="feedback"> | ||
<textarea placeholder="对我们的建议"></textarea> | ||
<button type="submit">提交</button> | ||
</section> | ||
</div> | ||
|
||
|
||
|
||
</body> | ||
|
||
</html> |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,156 @@ | ||
* { | ||
margin: 0; | ||
padding: 0; | ||
box-sizing: border-box; | ||
} | ||
|
||
body { | ||
font-family: Arial, sans-serif; | ||
background-color: #e0f8fb; | ||
color: #333; | ||
} | ||
|
||
.container { | ||
width: 70%; | ||
margin: 0 auto; | ||
padding: 20px; | ||
} | ||
|
||
header { | ||
display: flex; | ||
justify-content: space-between; | ||
align-items: center; | ||
padding: 20px; | ||
border-radius: 8px; | ||
} | ||
|
||
header a { | ||
font-size: 24px; | ||
text-decoration: none; | ||
color: black; | ||
} | ||
|
||
.character-intro { | ||
display: flex; | ||
align-items: center; | ||
padding: 20px; | ||
margin-top: 20px; | ||
border-radius: 8px; | ||
border: 2px solid #7491bb; | ||
} | ||
|
||
.character-intro img { | ||
width: 120px; | ||
height: 120px; | ||
margin-right: 20px; | ||
border-radius: 120px; | ||
} | ||
|
||
.character-intro p { | ||
flex: 1; | ||
font-size: 16px; | ||
line-height: 1.5; | ||
} | ||
|
||
.characters { | ||
display: flex; | ||
justify-content: space-between; | ||
margin-top: 20px; | ||
} | ||
|
||
.character-card { | ||
background-color: #fff; | ||
text-align: center; | ||
padding: 20px; | ||
border-radius: 8px; | ||
width: 200px; | ||
} | ||
|
||
.character-img { | ||
background-color: #fff; | ||
text-align: center; | ||
border-radius: 8px; | ||
width: 200px; | ||
} | ||
|
||
.character-img img { | ||
width: 100%; | ||
height: 100%; | ||
border-radius: 8px; | ||
} | ||
|
||
.character-card h2 { | ||
margin-top: 10px; | ||
color: white; | ||
} | ||
|
||
.character-card p { | ||
margin-top: 10px; | ||
font-size: 16px; | ||
color: white; | ||
} | ||
|
||
.series { | ||
margin-top: 20px; | ||
padding: 20px; | ||
border-radius: 8px; | ||
} | ||
|
||
table { | ||
width: 100%; | ||
border-collapse: collapse; | ||
} | ||
|
||
table th, table td { | ||
text-align: center; | ||
} | ||
|
||
tbody { | ||
border-radius: 8px; | ||
} | ||
|
||
table th { | ||
color: black; | ||
} | ||
|
||
.col1 { | ||
background-color: #99ccff; | ||
} | ||
|
||
.col2 { | ||
background-color: #87ceec; | ||
} | ||
|
||
.col3 { | ||
background-color: #6699cc; | ||
} | ||
|
||
.feedback { | ||
margin-top: 20px; | ||
padding: 20px; | ||
border-radius: 8px; | ||
} | ||
|
||
.feedback textarea { | ||
width: 100%; | ||
height: 200px; | ||
padding: 10px; | ||
border: 2px solid #87ceec; | ||
border-radius: 4px; | ||
margin-bottom: 10px; | ||
background: #e0f8fb; | ||
} | ||
|
||
.feedback button { | ||
padding: 10px 20px; | ||
background-color: #6495ed; | ||
color: white; | ||
border: none; | ||
border-radius: 4px; | ||
cursor: pointer; | ||
float: right; | ||
} | ||
|
||
.feedback button:hover { | ||
background-color: #004d40; | ||
} |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,96 @@ | ||
<!DOCTYPE html> | ||
<html lang="en"> | ||
<head> | ||
<meta charset="UTF-8" /> | ||
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
<title>阿笠博士的新发明</title> | ||
|
||
<style> | ||
body { | ||
padding-left: 10vw; | ||
} | ||
.question { | ||
margin-top: 30px; | ||
font-size: 22px; | ||
} | ||
|
||
.box { | ||
margin-top: 64px; | ||
width: 60%; | ||
height: 200px; | ||
font-size: 24px; | ||
display: flex; | ||
justify-content: space-between; | ||
} | ||
#blue { | ||
width: 46%; | ||
text-align: center; | ||
line-height: 200px; | ||
border: 2px solid #21a4f1; | ||
} | ||
#red { | ||
width: 46%; | ||
text-align: center; | ||
line-height: 200px; | ||
border: 2px solid #fc4b5a; | ||
} | ||
</style> | ||
</head> | ||
|
||
<body> | ||
<div class="question"> | ||
<p>柯南的手表坏了,最近阿笠博士刚好设计了一款新型时钟(下方蓝框)。</p> | ||
<p> | ||
蓝框显示当前日期,当鼠标移入蓝框时,有放大效果且时间暂停;鼠标移出后时间继续更新。 | ||
</p> | ||
<p>点击定格按钮,红框内显示定格的时间。</p> | ||
</div> | ||
<div class="box"> | ||
<div id="blue"> | ||
<span id="time"></span> | ||
</div> | ||
<div id="red"> | ||
<span id="pauseTime"></span> | ||
</div> | ||
</div> | ||
<button id="btn" style="font-size: 24px; margin-top: 48px">定格</button> | ||
|
||
<!-- 以上代码不可修改 --> | ||
|
||
<!-- | ||
要求在下列代码中实现: | ||
1. 页面上的时间每秒更新一次。 | ||
2. 鼠标移入 #blue 的时候 暂停时间的更新,并且有边框放大效果。 | ||
3. 鼠标移出 #blue 的时候 继续时间的更新,CSS 样式还原。 | ||
4. 点击定格按钮,#red 里面显示点击时候的时间。 | ||
--> | ||
|
||
|
||
<script> | ||
function set_time(){ | ||
var currentTime = new Date().toLocaleString(); | ||
var time = document.getElementById('time'); | ||
time.innerText = currentTime; | ||
} | ||
var timer=setInterval(set_time,1000); | ||
|
||
var blue=document.getElementById('blue'); | ||
blue.onmouseenter=function(){ | ||
blue.style.transform='scale(1.1)'; | ||
clearInterval(timer); | ||
} | ||
blue.onmouseleave=function(){ | ||
blue.style.transform='scale(1.0)'; | ||
timer=setInterval(set_time,1000); | ||
} | ||
|
||
var btn=document.getElementById('btn'); | ||
btn.onclick=function(){ | ||
var pauseTime = document.getElementById('pauseTime'); | ||
pauseTime.innerText = new Date().toLocaleString(); | ||
} | ||
|
||
|
||
</script> | ||
</body> | ||
</html> |
Empty file.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这里是不是应该先执行一遍,避免一进来的时候是没有内容的状态
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
好的好的