We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
2 parents cb42d40 + 4a8722a commit 68eeda5Copy full SHA for 68eeda5
normalize.css
@@ -28,14 +28,30 @@ h1 {
28
margin: 0.67em 0;
29
}
30
31
+<<<<<<< HEAD
32
/* Grouping content */
33
/* ========================================================================== */
34
+=======
35
+/* Grouping content
36
+ ========================================================================== */
37
+
38
+/**
39
+ * 1. Add the correct box sizing in Firefox.
40
+ * 2. Hide the overflow in Edge and IE.
41
+ */
42
+>>>>>>> 4a8722a6a0e36d76bf3e7340d33619905b35b6cb
43
44
/* Improve appearance of horizontal rules */
45
hr {
46
47
box-sizing: content-box;
48
height: 0;
49
overflow: visible;
50
51
+ box-sizing: content-box; /* 1 */
52
+ height: 0; /* 1 */
53
+ overflow: hidden; /* 2 */
54
55
56
57
/* Enhance preformatted text display */
0 commit comments