Skip to content

Commit a04684b

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents 7cd1da7 + 21286d7 commit a04684b

File tree

4 files changed

+26
-1
lines changed

4 files changed

+26
-1
lines changed

.idea/jsLibraryMappings.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/新班网.iml

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css_js/main.css

+12
Original file line numberDiff line numberDiff line change
@@ -466,4 +466,16 @@ html.background {
466466
height: auto;
467467
border-radius: 30px;
468468
margin: 30px 5% 30px 5%;
469+
}
470+
471+
@media screen and (max-width: 620px) {
472+
.menu ul{
473+
display: none;
474+
}
475+
.huge_title_1 {
476+
font-size: 4.5em;
477+
}
478+
.huge_title_2 {
479+
font-size: 3em;
480+
}
469481
}

index.html

+6-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<meta charset="utf-8">
55
<title>八五班班级网站</title>
66
<link rel="icon" type="image/x-icon" href="favicon.png" />
7+
<meta content="width=device-width, initial-scale=1.0" name="viewport">
78
</head>
89
<style>
910
@import "css_js/main.css";
@@ -14,6 +15,7 @@
1415
<br>
1516
<br>
1617
<br>
18+
1719
<div class="menu">
1820
<img src="icon.png" alt="">
1921
<h1>八年级五班</h1>
@@ -26,6 +28,7 @@ <h1>八年级五班</h1>
2628
<li><a href="#">敬请期待…</a></li>
2729
</ul>
2830
</div> <!--顶部导航栏-->
31+
2932
<div>
3033
<h1 class="huge_title_1" style="color: #ff7014">暑假快乐!</h1>
3134
<h1 class="huge_title_1">八五班 班级网站</h1>
@@ -70,7 +73,8 @@ <h1 id="hitokoto_text" class="hit_text">
7073
text-align: right;
7174
font-family: Arial, sans-serif;
7275
margin-right: 17px;
73-
margin-top: 20px">designed by Wemsur</h1>
76+
margin-top: 20px;
77+
">designed by Wemsur</h1>
7478
<br>
7579
<br>
7680
</div> <!--第一页内容-->
@@ -160,4 +164,5 @@ <h1>每日作业</h1>
160164
</div><!--第四页:每日作业-->
161165
<br>
162166
</body>
167+
<!--愿世间再无别离-->
163168
</html>

0 commit comments

Comments
 (0)