Skip to content

Commit 22ccd00

Browse files
authored
Merge branch 'main' into fix-26970
2 parents e65d3f5 + 284370d commit 22ccd00

File tree

10 files changed

+305
-34
lines changed

10 files changed

+305
-34
lines changed

flexbox/use-cases/split-navigation.html

+6-13
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,12 @@
7979
</style>
8080
<style class="editable">
8181
nav ul {
82-
display: flex;
83-
margin: 0 -10px;
84-
}
85-
nav li {
86-
margin: 0 10px;
82+
display: flex;
83+
gap: 20px;
84+
}
85+
.push-right {
86+
margin-left: auto;
8787
}
88-
.push-right {
89-
margin-left: auto;
90-
}
9188
</style>
9289
</head>
9390

@@ -107,11 +104,7 @@
107104
<textarea class="playable-css">
108105
nav ul {
109106
display: flex;
110-
margin: 0 -10px;
111-
}
112-
113-
nav li {
114-
margin: 0 10px;
107+
gap: 20px;
115108
}
116109

117110
.push-right {

grid/docs/autoplacement.html

+4-9
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<style class="editable">
3131
.wrapper {
3232
display: grid;
33-
grid-template-columns: repeat(auto-fill, minmax(120px, 1fr));
33+
grid-template-columns: repeat(3, minmax(120px, 1fr));
3434
gap: 10px;
3535
grid-auto-flow: dense;
3636
}
@@ -48,19 +48,17 @@
4848
<li class="landscape"><img src="landscape.jpg" alt="placeholder"></li>
4949
<li class="landscape"><img src="landscape.jpg" alt="placeholder"></li>
5050
<li class="landscape"><img src="landscape.jpg" alt="placeholder"></li>
51-
<li><img src="portrait.jpg" alt="placeholder"></li>
52-
<li><img src="portrait.jpg" alt="placeholder"></li>
5351
<li class="landscape"><img src="landscape.jpg" alt="placeholder"></li>
5452
<li><img src="portrait.jpg" alt="placeholder"></li>
5553
<li><img src="portrait.jpg" alt="placeholder"></li>
5654
<li><img src="portrait.jpg" alt="placeholder"></li>
57-
</ul>>
55+
</ul>
5856
</section>
5957

6058
<textarea class="playable playable-css" style="height: 200px;">
6159
.wrapper {
6260
display: grid;
63-
grid-template-columns: repeat(auto-fill, minmax(120px, 1fr));
61+
grid-template-columns: repeat(3, minmax(120px, 1fr));
6462
gap: 10px;
6563
grid-auto-flow: dense;
6664
}
@@ -72,13 +70,10 @@
7270

7371
<textarea class="playable playable-html" style="height: 300px;">
7472
<ul class="wrapper">
75-
<li><img src="./portrait.jpg" alt="placeholder"></li>
76-
<li class="landscape"><img src="landscape.jpg" alt="placeholder"></li>
7773
<li><img src="portrait.jpg" alt="placeholder"></li>
7874
<li class="landscape"><img src="landscape.jpg" alt="placeholder"></li>
7975
<li class="landscape"><img src="landscape.jpg" alt="placeholder"></li>
80-
<li><img src="portrait.jpg" alt="placeholder"></li>
81-
<li><img src="portrait.jpg" alt="placeholder"></li>
76+
<li class="landscape"><img src="landscape.jpg" alt="placeholder"></li>
8277
<li class="landscape"><img src="landscape.jpg" alt="placeholder"></li>
8378
<li><img src="portrait.jpg" alt="placeholder"></li>
8479
<li><img src="portrait.jpg" alt="placeholder"></li>

learn/overflow/auto.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<style class="editable">
1212
.box {
1313
border: 1px solid #333333;
14-
width: 200px;
14+
width: 350px;
1515
height: 100px;
1616
overflow: auto;
1717
}
@@ -26,7 +26,7 @@
2626
<textarea class="playable playable-css" style="height: 120px;">
2727
.box {
2828
border: 1px solid #333333;
29-
width: 200px;
29+
width: 350px;
3030
height: 100px;
3131
overflow: auto;
3232
}

learn/overflow/block-overflow.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<style class="editable">
1212
.box {
1313
border: 1px solid #333333;
14-
width: 200px;
14+
width: 350px;
1515
height: 100px;
1616
}
1717
</style>
@@ -25,7 +25,7 @@
2525
<textarea class="playable playable-css" style="height: 120px;">
2626
.box {
2727
border: 1px solid #333333;
28-
width: 200px;
28+
width: 350px;
2929
height: 100px;
3030
}
3131
</textarea>

learn/overflow/hidden.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<style class="editable">
1212
.box {
1313
border: 1px solid #333333;
14-
width: 200px;
14+
width: 350px;
1515
height: 100px;
1616
overflow: hidden;
1717
}
@@ -26,7 +26,7 @@
2626
<textarea class="playable playable-css" style="height: 120px;">
2727
.box {
2828
border: 1px solid #333333;
29-
width: 200px;
29+
width: 350px;
3030
height: 100px;
3131
overflow: hidden;
3232
}

learn/overflow/scroll-y.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<style class="editable">
1212
.box {
1313
border: 1px solid #333333;
14-
width: 200px;
14+
width: 350px;
1515
height: 100px;
1616
overflow-y: scroll;
1717
}
@@ -26,7 +26,7 @@
2626
<textarea class="playable playable-css" style="height: 120px;">
2727
.box {
2828
border: 1px solid #333333;
29-
width: 200px;
29+
width: 350px;
3030
height: 100px;
3131
overflow-y: scroll;
3232
}

learn/overflow/scroll.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<style class="editable">
1212
.box {
1313
border: 1px solid #333333;
14-
width: 200px;
14+
width: 350px;
1515
height: 100px;
1616
overflow: scroll;
1717
}
@@ -26,7 +26,7 @@
2626
<textarea class="playable playable-css" style="height: 120px;">
2727
.box {
2828
border: 1px solid #333333;
29-
width: 200px;
29+
width: 350px;
3030
height: 100px;
3131
overflow: scroll;
3232
}

learn/tasks/values/marking.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ They have a link to [a color conversion tool](https://convertingcolors.com/hex-c
2020
}
2121
2222
.transparency {
23-
background-color: rgba(134, 222, 250, .2);
23+
background-color: rgba(134, 222, 250, .6);
2424
}
2525
```
2626

0 commit comments

Comments
 (0)