Skip to content

Commit f2536bf

Browse files
TYRMarsTYRMars
committed
update
1 parent 4d76d01 commit f2536bf

File tree

8 files changed

+131
-127
lines changed

8 files changed

+131
-127
lines changed

‎.idea/workspace.xml‎

Lines changed: 49 additions & 100 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Accordions/css/base.css‎

Lines changed: 62 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,76 @@ body,ul,li,p,h3{margin: 0;padding: 0;}
22
ul,ol {list-style: none;}
33

44
.wrapper{
5-
width: 938px;
6-
height: 128px;
7-
border:1px solid #444;
5+
width: 1920px;
6+
height: 240px;
87
}
98

109
.wrapper li{
11-
width: 156px;
12-
height: 128px;
10+
width: 384px;
11+
height: 240px;
1312
float: left;
1413
overflow: hidden;
1514
}
1615

1716
.wrapper li a{
1817
display: block;
19-
height: 128px;
20-
width: 156px;
18+
width: 384px;
19+
height: 240px;
2120
position: relative;
21+
text-decoration: none;
22+
}
23+
24+
.wrapper img {
25+
position: absolute;
26+
bottom: 0;
27+
right: -15px;
28+
width: 384px;
29+
height: 240px;
30+
}
31+
32+
.wrapper .info{
33+
position: absolute;
34+
top:0;
35+
left: 0;
36+
width: 120px;
37+
padding: 5px 15px;
38+
}
39+
40+
.wrapper .info h3{
41+
font-size: 20px;
42+
font-weight: 700;
43+
color: #ffffff;
44+
}
45+
46+
.wrapper .info p{
47+
font-size: 15px;
48+
color: #ffffff;
49+
line-height: 22px;
50+
}
51+
52+
.wrapper .line{
53+
position: absolute;
54+
right:0;
55+
width:0;
56+
height: 240px;
57+
border: 1px dashed #cacaca;
58+
}
59+
60+
.wrapper .mask{
61+
position: absolute;
62+
top:0;
63+
left:0;
64+
width: 384px;
65+
height: 240px;
66+
opacity: 0.15;
67+
background: #444;
68+
}
69+
70+
.wrapper li.big, li.big a{
71+
width: 424px;
72+
}
73+
74+
.wrapper li.big img{
75+
width: 424px;
76+
height: 264px;
2277
}

‎Accordions/html.html‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,61 +9,61 @@
99
<body>
1010
<div id="subject" class="wrapper">
1111
<ul>
12-
<li>
12+
<li class="big">
1313
<a href="">
14-
<img src="" alt="">
14+
<img src="img/小暑.jpg"/>
1515
<div class="info">
16-
<h3></h3>
17-
<p></p>
18-
<p class="price"><strong></strong><i></i></p>
16+
<h3>小暑</h3>
17+
<p>2017年</p>
18+
<p class="price"><strong>07月07日</strong><i>星期五</i></p>
1919
</div>
2020
<i class="line"></i>
2121
<i class="mask"></i>
2222
</a>
2323
</li>
2424
<li>
2525
<a href="">
26-
<img src="" alt="">
26+
<img src="img/小雪.jpg"/>
2727
<div class="info">
28-
<h3></h3>
29-
<p></p>
30-
<p class="price"><strong></strong><i></i></p>
28+
<h3>小雪</h3>
29+
<p>1</p>
30+
<p class="price"><strong>1</strong><i>1</i></p>
3131
</div>
3232
<i class="line"></i>
3333
<i class="mask"></i>
3434
</a>
3535
</li>
3636
<li>
3737
<a href="">
38-
<img src="" alt="">
38+
<img src="img/清明.jpg"/>
3939
<div class="info">
40-
<h3></h3>
41-
<p></p>
42-
<p class="price"><strong></strong><i></i></p>
40+
<h3>清明</h3>
41+
<p>1</p>
42+
<p class="price"><strong>1</strong><i>1</i></p>
4343
</div>
4444
<i class="line"></i>
4545
<i class="mask"></i>
4646
</a>
4747
</li>
4848
<li>
4949
<a href="">
50-
<img src="" alt="">
50+
<img src="img/芒种.jpg"/>
5151
<div class="info">
52-
<h3></h3>
53-
<p></p>
54-
<p class="price"><strong></strong><i></i></p>
52+
<h3>芒种</h3>
53+
<p>1</p>
54+
<p class="price"><strong>1</strong><i>1</i></p>
5555
</div>
5656
<i class="line"></i>
5757
<i class="mask"></i>
5858
</a>
5959
</li>
6060
<li>
6161
<a href="">
62-
<img src="" alt="">
62+
<img src="img/雨水.jpg"/>
6363
<div class="info">
64-
<h3></h3>
64+
<h3>雨水</h3>
6565
<p></p>
66-
<p class="price"><strong></strong><i></i></p>
66+
<p class="price"><strong>1</strong><i>1</i></p>
6767
</div>
6868
<i class="line"></i>
6969
<i class="mask"></i>

‎Accordions/img/小暑.jpg‎

1.79 MB
Loading

‎Accordions/img/小雪.jpg‎

444 KB
Loading

‎Accordions/img/清明.jpg‎

565 KB
Loading

‎Accordions/img/芒种.jpg‎

1.75 MB
Loading

‎Accordions/img/雨水.jpg‎

469 KB
Loading

0 commit comments

Comments
 (0)