Skip to content

Commit 64f0647

Browse files
committed
merge
2 parents de47172 + 2f6ea03 commit 64f0647

File tree

7 files changed

+90
-148
lines changed

7 files changed

+90
-148
lines changed

learn/media-queries/grid.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@
4141
background-color: rgba(207, 232, 220, 0.7);
4242
}
4343

44+
.content {
45+
margin-bottom: 1em;
46+
}
47+
4448
.related {
4549
background-color: rgba(79, 185, 227, 0.3);
4650
border: 1px solid rgb(79, 185, 227);

learn/selectors/after-icon.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<style class="editable">
1313
.box::after {
14-
content: " ➥"
14+
content: " ➥";
1515
}
1616

1717
</style>
@@ -24,7 +24,7 @@
2424

2525
<textarea class="playable playable-css" style="height: 80px;">
2626
.box::after {
27-
content: " ➥"
27+
content: " ➥";
2828
}
2929
</textarea>
3030

@@ -38,4 +38,4 @@
3838
</body>
3939
<script src="../playable.js"></script>
4040

41-
</html>
41+
</html>

learn/selectors/before.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<style class="editable">
1313
.box::before {
14-
content: "This should show before the other content."
14+
content: "This should show before the other content. ";
1515
}
1616

1717
</style>
@@ -24,7 +24,7 @@
2424

2525
<textarea class="playable playable-css" style="height: 80px;">
2626
.box::before {
27-
content: "This should show before the other content."
27+
content: "This should show before the other content. ";
2828
}
2929
</textarea>
3030

@@ -38,4 +38,4 @@
3838
</body>
3939
<script src="../playable.js"></script>
4040

41-
</html>
41+
</html>

tools/color-picker/index.html

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
11
<!DOCTYPE html>
2-
3-
<html lang="en">
2+
<html lang="en-US">
43
<head>
5-
<meta charset="utf-8">
4+
<meta charset="utf-8"/>
65
<title>Color picker</title>
7-
<link rel="stylesheet" href="styles.css">
6+
<link rel="stylesheet" href="styles.css"/>
87
</head>
9-
108
<body>
11-
129
<div id="container">
1310
<div id="palette" class="block">
1411
<div id="color-palette"></div>
1512
<div id="color-info">
1613
<div class="title"> CSS Color </div>
1714
</div>
1815
</div>
19-
2016
<div id="picker" class="block">
2117
<div class="ui-color-picker" data-topic="picker" data-mode="HSL"></div>
2218
<div id="picker-samples" sample-id="master"></div>
@@ -27,14 +23,11 @@
2723
<div id="void-sample" class="icon"></div>
2824
</div>
2925
</div>
30-
3126
<div id="canvas" data-tutorial="drop">
3227
<div id="zindex" class="ui-input-slider" data-topic="z-index" data-info="z-index"
3328
data-max="20" data-sensitivity="10"></div>
3429
</div>
3530
</div>
36-
3731
<script src="script.js"></script>
3832
</body>
39-
4033
</html>

0 commit comments

Comments
 (0)