Skip to content

Commit 838a4f6

Browse files
张欧文张欧文
张欧文
authored and
张欧文
committed
finish 04 floats flex and css grid
1 parent 76873e9 commit 838a4f6

File tree

2 files changed

+50
-37
lines changed

2 files changed

+50
-37
lines changed

starter/02-HTML-Fundamentals/challenge.html

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -10,45 +10,44 @@
1010
<div class="container clearfix">
1111
<body>
1212
<article>
13-
<h2>Converse Chuck Taylor All Star Low Top</h2>
14-
<div class="row">
15-
<img
16-
class="part0"
17-
src="img/challenges.jpg"
18-
width="240px"
19-
height="240px"
20-
alt="图片炸了"
21-
/>
22-
<div class="part1">
23-
<div class="little-row">
24-
<p class="money"><b>$65.00</b></p>
25-
<p class="fshi">Free shipping</p>
26-
</div>
27-
<div class="clear"></div>
28-
<p>
29-
Ready to dress up or down, these classic canvas Chucks are an
30-
everyday wardrobe staple
31-
</p>
32-
<a class="more" href="#">More information &rarr;</a>
13+
<h2 class="title">Converse Chuck Taylor All Star Low Top</h2>
3314

34-
<div class="color-bars">
35-
<div class="color-bar color-1">&nbsp</div>
36-
<div class="color-bar color-2">&nbsp</div>
37-
<div class="color-bar color-3">&nbsp</div>
38-
<div class="color-bar color-4">&nbsp</div>
39-
<div class="color-bar color-5">&nbsp</div>
40-
<div class="color-bar color-6">&nbsp</div>
41-
</div>
15+
<img
16+
class="part0"
17+
src="img/challenges.jpg"
18+
width="240px"
19+
height="240px"
20+
alt="图片炸了"
21+
/>
22+
<div class="part1">
23+
<div class="little-row">
24+
<p class="money"><b>$65.00</b></p>
25+
<p class="fshi">Free shipping</p>
4226
</div>
43-
<div class="part2">
44-
<h3 class="product-details">Product details</h3>
45-
<ul class="details">
46-
<li>Lightweight, durable canvas sneaker</li>
47-
<li>Lightly padded footbed for added comfort</li>
48-
<li>Iconic Chuck Taylor ankle patch</li>
49-
</ul>
27+
<div class="clear"></div>
28+
<p>
29+
Ready to dress up or down, these classic canvas Chucks are an
30+
everyday wardrobe staple
31+
</p>
32+
<a class="more" href="#">More information &rarr;</a>
33+
34+
<div class="color-bars">
35+
<div class="color-bar color-1">&nbsp</div>
36+
<div class="color-bar color-2">&nbsp</div>
37+
<div class="color-bar color-3">&nbsp</div>
38+
<div class="color-bar color-4">&nbsp</div>
39+
<div class="color-bar color-5">&nbsp</div>
40+
<div class="color-bar color-6">&nbsp</div>
5041
</div>
5142
</div>
43+
<div class="part2">
44+
<h3 class="product-details">Product details</h3>
45+
<ul class="details">
46+
<li>Lightweight, durable canvas sneaker</li>
47+
<li>Lightly padded footbed for added comfort</li>
48+
<li>Iconic Chuck Taylor ankle patch</li>
49+
</ul>
50+
</div>
5251
<button class="add-to-cart">Add to cart</button>
5352
</article>
5453
</body>

starter/02-HTML-Fundamentals/stylec.css

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ li ul {
9191

9292
.add-to-cart {
9393
width: 100%;
94+
grid-column: 1 / -1;
9495
}
9596

9697
.container {
@@ -210,13 +211,26 @@ li ul {
210211

211212
.part1 {
212213
flex: 1;
213-
margin-left: 40px;
214+
/* margin-left: 40px;
215+
margin-top: 20px;
216+
margin-right: 40px; */
214217
margin-top: 20px;
215-
margin-right: 40px;
216218
}
217219

218220
.part2 {
219221
flex: 1;
220222
/* margin-top: 20px; */
221223
/* margin-right: 40px; */
224+
margin-top: 20px;
225+
}
226+
227+
article {
228+
display: grid;
229+
grid-template-columns: 250px 1fr 1fr;
230+
column-gap: 40px;
231+
align-items: start;
232+
}
233+
234+
.title {
235+
grid-column: 1 / -1;
222236
}

0 commit comments

Comments
 (0)