Skip to content

Commit 738abae

Browse files
committed
Update normalize.css and demo.html from master branch
1 parent 34680ac commit 738abae

File tree

2 files changed

+48
-35
lines changed

2 files changed

+48
-35
lines changed

demo.html

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,35 @@
1818
</style>
1919
</head>
2020
<body>
21+
<h1>Heading 1</h1>
22+
<h2>Heading 2</h2>
23+
<h3>Heading 3</h3>
24+
<h4>Heading 4</h4>
25+
<h5>Heading 5</h5>
26+
<h6>Heading 6</h6>
27+
28+
<section>
29+
<h1>Heading 1 (in section)</h1>
30+
<h2>Heading 2 (in section)</h2>
31+
<h3>Heading 3 (in section)</h3>
32+
<h4>Heading 4 (in section)</h4>
33+
<h5>Heading 5 (in section)</h5>
34+
<h6>Heading 6 (in section)</h6>
35+
</section>
36+
37+
<article>
38+
<h1>Heading 1 (in article)</h1>
39+
<h2>Heading 2 (in article)</h2>
40+
<h3>Heading 3 (in article)</h3>
41+
<h4>Heading 4 (in article)</h4>
42+
<h5>Heading 5 (in article)</h5>
43+
<h6>Heading 6 (in article)</h6>
44+
</article>
45+
2146
<header>
2247
<hgroup>
23-
<h1>Grouped Heading 1</h1>
24-
<h2>Grouped Heading 2</h2>
48+
<h1>Heading 1 (in hgroup)</h1>
49+
<h2>Heading 2 (in hgroup)</h2>
2550
</hgroup>
2651
<nav>
2752
<ul>
@@ -32,26 +57,14 @@ <h2>Grouped Heading 2</h2>
3257
</nav>
3358
</header>
3459

35-
<h1>Heading 1</h1>
36-
<h2>Heading 2</h2>
37-
<h3>Heading 3</h3>
38-
<h4>Heading 4</h4>
39-
<h5>Heading 5</h5>
40-
<h6>Heading 6</h6>
60+
<h1>Text-level semantics</h1>
4161

4262
<p hidden>This should be hidden in all browsers, apart from IE6</p>
4363

44-
<section>
45-
<h1>Section Heading 1</h1>
46-
<article>
47-
<h4>Article Heading 2</h4>
48-
<address>Address: somewhere, world</address>
49-
<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m.</p>
50-
<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m.</p>
51-
</article>
52-
</section>
64+
<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m.</p>
65+
<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m.</p>
5366

54-
<h1>Text-level semantics</h1>
67+
<address>Address: somewhere, world</address>
5568

5669
<p>
5770
The <a href="#">a element</a> example<br>

normalize.css

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! normalize.css 2011-09-22T17:42 UTC - http://github.com/necolas/normalize.css */
1+
/*! normalize.css 2011-11-04T15:38 UTC - http://github.com/necolas/normalize.css */
22

33
/* =============================================================================
44
HTML5 display definitions
@@ -95,14 +95,6 @@ textarea {
9595
Links
9696
========================================================================== */
9797

98-
a {
99-
color: #00e;
100-
}
101-
102-
a:visited {
103-
color: #551a8b;
104-
}
105-
10698
/*
10799
* Addresses outline displayed oddly in Chrome
108100
*/
@@ -126,6 +118,14 @@ a:active {
126118
Typography
127119
========================================================================== */
128120

121+
/*
122+
* Neutralise smaller font-size in 'section' and 'article' in FF4+, Chrome, S5
123+
*/
124+
125+
h1 {
126+
font-size: 2em;
127+
}
128+
129129
/*
130130
* Addresses styling not present in IE7/8/9, S5, Chrome
131131
*/
@@ -135,7 +135,7 @@ abbr[title] {
135135
}
136136

137137
/*
138-
* Addresses style set to 'bolder' in FF3/4, S4/5, Chrome
138+
* Addresses style set to 'bolder' in FF3+, S4/5, Chrome
139139
*/
140140

141141
b,
@@ -239,7 +239,7 @@ sub {
239239

240240
ul,
241241
ol {
242-
margin: 1em 0;
242+
margin-left: 0;
243243
padding: 0 0 0 40px;
244244
}
245245

@@ -325,7 +325,7 @@ legend {
325325

326326
/*
327327
* 1. Corrects font size not being inherited in all browsers
328-
* 2. Addresses margins set differently in IE6/7, FF3/4, S5, Chrome
328+
* 2. Addresses margins set differently in IE6/7, FF3+, S5, Chrome
329329
* 3. Improves appearance and consistency in all browsers
330330
*/
331331

@@ -351,7 +351,7 @@ input {
351351
/*
352352
* 1. Improves usability and consistency of cursor style between image-type 'input' and others
353353
* 2. Corrects inability to style clickable 'input' types in iOS
354-
* 3. Corrects inner spacing displayed oddly in IE7 without effecting normal text inputs
354+
* 3. Removes inner spacing in IE7 without affecting normal text inputs
355355
* Known issue: inner spacing remains in IE6
356356
*/
357357

@@ -366,7 +366,7 @@ input[type="submit"] {
366366

367367
/*
368368
* 1. Addresses box sizing set to content-box in IE8/9
369-
* 2. Addresses excess padding in IE8/9
369+
* 2. Removes excess padding in IE8/9
370370
*/
371371

372372
input[type="checkbox"],
@@ -377,7 +377,7 @@ input[type="radio"] {
377377

378378
/*
379379
* 1. Addresses appearance set to searchfield in S5, Chrome
380-
* 2. Addresses box sizing set to border-box in S5, Chrome (include -moz to future-proof)
380+
* 2. Addresses box-sizing set to border-box in S5, Chrome (include -moz to future-proof)
381381
*/
382382

383383
input[type="search"] {
@@ -388,15 +388,15 @@ input[type="search"] {
388388
}
389389

390390
/*
391-
* Corrects inner padding displayed oddly in S5, Chrome on OSX
391+
* Removes inner padding that is displayed in S5, Chrome on OS X
392392
*/
393393

394394
input[type="search"]::-webkit-search-decoration {
395395
-webkit-appearance: none;
396396
}
397397

398398
/*
399-
* Corrects inner padding and border displayed oddly in FF3/4
399+
* Removes inner padding and border in FF3+
400400
* www.sitepen.com/blog/2008/05/14/the-devils-in-the-details-fixing-dojos-toolbar-buttons/
401401
*/
402402

0 commit comments

Comments
 (0)