Update normalize.css and demo.html from master branch

This commit is contained in:
Nicolas Gallagher 2011-11-04 15:41:50 +00:00
parent 34680acb33
commit 738abae647
2 changed files with 48 additions and 35 deletions

View File

@ -18,10 +18,35 @@
</style>
</head>
<body>
<h1>Heading 1</h1>
<h2>Heading 2</h2>
<h3>Heading 3</h3>
<h4>Heading 4</h4>
<h5>Heading 5</h5>
<h6>Heading 6</h6>
<section>
<h1>Heading 1 (in section)</h1>
<h2>Heading 2 (in section)</h2>
<h3>Heading 3 (in section)</h3>
<h4>Heading 4 (in section)</h4>
<h5>Heading 5 (in section)</h5>
<h6>Heading 6 (in section)</h6>
</section>
<article>
<h1>Heading 1 (in article)</h1>
<h2>Heading 2 (in article)</h2>
<h3>Heading 3 (in article)</h3>
<h4>Heading 4 (in article)</h4>
<h5>Heading 5 (in article)</h5>
<h6>Heading 6 (in article)</h6>
</article>
<header>
<hgroup>
<h1>Grouped Heading 1</h1>
<h2>Grouped Heading 2</h2>
<h1>Heading 1 (in hgroup)</h1>
<h2>Heading 2 (in hgroup)</h2>
</hgroup>
<nav>
<ul>
@ -32,26 +57,14 @@
</nav>
</header>
<h1>Heading 1</h1>
<h2>Heading 2</h2>
<h3>Heading 3</h3>
<h4>Heading 4</h4>
<h5>Heading 5</h5>
<h6>Heading 6</h6>
<h1>Text-level semantics</h1>
<p hidden>This should be hidden in all browsers, apart from IE6</p>
<section>
<h1>Section Heading 1</h1>
<article>
<h4>Article Heading 2</h4>
<address>Address: somewhere, world</address>
<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>
<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>
</article>
</section>
<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>
<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>
<h1>Text-level semantics</h1>
<address>Address: somewhere, world</address>
<p>
The <a href="#">a element</a> example<br>

34
normalize.css vendored
View File

@ -1,4 +1,4 @@
/*! normalize.css 2011-09-22T17:42 UTC - http://github.com/necolas/normalize.css */
/*! normalize.css 2011-11-04T15:38 UTC - http://github.com/necolas/normalize.css */
/* =============================================================================
HTML5 display definitions
@ -95,14 +95,6 @@ textarea {
Links
========================================================================== */
a {
color: #00e;
}
a:visited {
color: #551a8b;
}
/*
* Addresses outline displayed oddly in Chrome
*/
@ -126,6 +118,14 @@ a:active {
Typography
========================================================================== */
/*
* Neutralise smaller font-size in 'section' and 'article' in FF4+, Chrome, S5
*/
h1 {
font-size: 2em;
}
/*
* Addresses styling not present in IE7/8/9, S5, Chrome
*/
@ -135,7 +135,7 @@ abbr[title] {
}
/*
* Addresses style set to 'bolder' in FF3/4, S4/5, Chrome
* Addresses style set to 'bolder' in FF3+, S4/5, Chrome
*/
b,
@ -239,7 +239,7 @@ sub {
ul,
ol {
margin: 1em 0;
margin-left: 0;
padding: 0 0 0 40px;
}
@ -325,7 +325,7 @@ legend {
/*
* 1. Corrects font size not being inherited in all browsers
* 2. Addresses margins set differently in IE6/7, FF3/4, S5, Chrome
* 2. Addresses margins set differently in IE6/7, FF3+, S5, Chrome
* 3. Improves appearance and consistency in all browsers
*/
@ -351,7 +351,7 @@ input {
/*
* 1. Improves usability and consistency of cursor style between image-type 'input' and others
* 2. Corrects inability to style clickable 'input' types in iOS
* 3. Corrects inner spacing displayed oddly in IE7 without effecting normal text inputs
* 3. Removes inner spacing in IE7 without affecting normal text inputs
* Known issue: inner spacing remains in IE6
*/
@ -366,7 +366,7 @@ input[type="submit"] {
/*
* 1. Addresses box sizing set to content-box in IE8/9
* 2. Addresses excess padding in IE8/9
* 2. Removes excess padding in IE8/9
*/
input[type="checkbox"],
@ -377,7 +377,7 @@ input[type="radio"] {
/*
* 1. Addresses appearance set to searchfield in S5, Chrome
* 2. Addresses box sizing set to border-box in S5, Chrome (include -moz to future-proof)
* 2. Addresses box-sizing set to border-box in S5, Chrome (include -moz to future-proof)
*/
input[type="search"] {
@ -388,7 +388,7 @@ input[type="search"] {
}
/*
* Corrects inner padding displayed oddly in S5, Chrome on OSX
* Removes inner padding that is displayed in S5, Chrome on OS X
*/
input[type="search"]::-webkit-search-decoration {
@ -396,7 +396,7 @@ input[type="search"]::-webkit-search-decoration {
}
/*
* Corrects inner padding and border displayed oddly in FF3/4
* Removes inner padding and border in FF3+
* www.sitepen.com/blog/2008/05/14/the-devils-in-the-details-fixing-dojos-toolbar-buttons/
*/