Update normalize.css and demo.html from master branch

necolas · necolas · commit 849ededd87b8 · 2012-01-31T16:07:49.000Z
diff --git a/demo.html b/demo.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
     <head>
         <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta name="viewport" content="width=device-width">
         <title>Normalize CSS</title>
         <link rel="stylesheet" href="normalize.css">
         <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
@@ -291,10 +291,13 @@ <h1>Forms</h1>
                 <p><input type="reset" value="Reset (input)"></p>
                 <p><input type="button" value="Button (input)"></p>
                 <p><input type="submit" value="Submit (input)"></p>
+                <p><input type="submit" value="Disabled (input)" disabled></p>
+
 
                 <p><button type="reset">Reset (button)</button></p>
                 <p><button type="button">Button (button)</button></p>
                 <p><button type="submit">Submit (button)</button></p>
+                <p><button type="submit" disabled>Disabled (button)</button></p>
             </fieldset>
 
             <fieldset id="boxsize">
@@ -318,7 +321,7 @@ <h1>Forms</h1>
                 <div><input type="checkbox"></div>
 
                 <div><select><option>Option 01</option><option>Option 02</option></select></div>
-                <div><textarea cols="30" rows="5" >Textarea text</textarea></div>
+                <div><textarea cols="30" rows="5">Textarea text</textarea></div>
 
                 <div><input type="image" src="http://placekitten.com/90/24" alt="Image (input)"></div>
                 <div><input type="reset" value="Reset (input)"></div>
diff --git a/normalize.css b/normalize.css
@@ -1,4 +1,4 @@
-/*! normalize.css 2012-01-22T23:00 UTC - http://github.com/necolas/normalize.css */
+/*! normalize.css 2012-01-31T16:06 UTC - http://github.com/necolas/normalize.css */
 
 /* =============================================================================
    HTML5 display definitions
@@ -118,10 +118,37 @@ a:active {
 
 /*
  * Neutralise smaller font-size in 'section' and 'article' in FF4+, Chrome, S5
+ * Fix IE6/7 heading font-size not being relative to the root font-size
  */
 
 h1 {
     font-size: 2em;
+    margin: 0.67em 0;
+}
+
+h2 {
+    font-size: 1.5em;
+    margin: 0.83em 0;
+}
+
+h3 {
+    font-size: 1.17em;
+    margin: 1em 0;
+}
+
+h4 {
+    font-size: 1em;
+    margin: 1.33em 0;
+}
+
+h5 {
+    font-size: 0.83em;
+    margin: 1.67em 0;
+}
+
+h6 {
+    font-size: 0.75em;
+    margin: 2.33em 0;
 }
 
 /*
@@ -365,6 +392,15 @@ input[type="submit"] {
     *overflow: visible;  /* 3 */
 }
 
+/*
+ * Re-set default cursor for disabled elements
+ */
+
+button[disabled],
+input[disabled] {
+    cursor: default;
+}
+
 /*
  * 1. Addresses box sizing set to content-box in IE8/9
  * 2. Removes excess padding in IE8/9
@@ -393,17 +429,10 @@ input[type="search"] {
 }
 
 /*
- * Removes inner padding that is displayed in S5, Chrome on OS X
- */
-
-input[type="search"]::-webkit-search-decoration {
-    -webkit-appearance: none;
-}
-
-/*
- * Removes search cancel button in S5, Chrome on OS X
+ * Removes inner padding and search cancel button in S5, Chrome on OS X
  */
 
+input[type="search"]::-webkit-search-decoration,
 input[type="search"]::-webkit-search-cancel-button {
     -webkit-appearance: none;
 }
