Skip to content

Commit 68eeda5

Browse files
committed
Changed overflow: visible to overflow: hidden for hr element necolas#861
2 parents cb42d40 + 4a8722a commit 68eeda5

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

normalize.css

+16
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,30 @@ h1 {
2828
margin: 0.67em 0;
2929
}
3030

31+
<<<<<<< HEAD
3132
/* Grouping content */
3233
/* ========================================================================== */
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
3343

3444
/* Improve appearance of horizontal rules */
3545
hr {
46+
<<<<<<< HEAD
3647
box-sizing: content-box;
3748
height: 0;
3849
overflow: visible;
50+
=======
51+
box-sizing: content-box; /* 1 */
52+
height: 0; /* 1 */
53+
overflow: hidden; /* 2 */
54+
>>>>>>> 4a8722a6a0e36d76bf3e7340d33619905b35b6cb
3955
}
4056

4157
/* Enhance preformatted text display */

0 commit comments

Comments
 (0)