Skip to content

Commit 409ea1f

Browse files
committed
Merge remote-tracking branch 'origin/main'
# Conflicts: # css_js/main.css
1 parent 0e29f5e commit 409ea1f

File tree

6 files changed

+33
-4
lines changed

6 files changed

+33
-4
lines changed

.idea/inspectionProfiles/Project_Default.xml

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

css_js/main.css

+28
Original file line numberDiff line numberDiff line change
@@ -623,6 +623,34 @@ audio {
623623
}
624624
}
625625

626+
@media screen and (max-width: 400px) {
627+
.menu h1 {
628+
display: none;
629+
}
630+
.menu img {
631+
display: none;
632+
}
633+
.menu{
634+
height: 40px;
635+
top:10px;
636+
}
637+
.menu ul li a{
638+
font-size: 0.8em;
639+
}
640+
.container {
641+
;
642+
}
643+
.huge_title_1 {
644+
font-size: 4.5em;
645+
}
646+
.huge_title_2 {
647+
font-size: 3em;
648+
}
649+
.info_card {
650+
display: flex
651+
}
652+
}
653+
626654
#fade.hiding{
627655
opacity: 0;
628656
transform: translateY(100px) scale(90%);

css_js/script.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ let audiO = document.getElementById("audiO");//获取audio的id
4646
let Play = document.getElementById("Bplay");//播放
4747
let bofang = document.getElementById("bofang");//播放img
4848
let zanting = document.getElementById("zanting");//暂停img
49-
let onFout = true;//播放标记
50-
audiO.play();
49+
let onFout = false;//播放标记
5150
Play.onclick = function (){
5251
if(onFout===true){
5352
audiO.play();

index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ <h1>八年五班</h1>
4141
<img style="display: none;" id="zanting" src="https://png.pngtree.com/png-vector/20190501/ourmid/pngtree-vector-pause-icon-png-image_1019793.jpg" alt="">
4242
-->
4343
</div>
44-
<audio id="audiO" src="梦然%20-%20是你.flac"></audio>
44+
<audio controls id="audiO" loop src="梦然%20-%20是你.mp3"></audio>
4545
</div>
4646

4747
<div id="fade3">

梦然 - 是你.flac

-75 MB
Binary file not shown.

梦然 - 是你.mp3

8.67 MB
Binary file not shown.

0 commit comments

Comments
 (0)