Merge normalize.css 3.0.2 into master

JohnAlbin · Nov 6, 2014 · 2379d96 · 2379d96
2 parents cba7325 + d831328
commit 2379d96
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,13 @@
 
 == normalize.css change log
 
+=== HEAD
+
+=== normalize.css 3.0.2 (October 4, 2014)
+
+* Only alter `background-color` of links in IE 10.
+* Add `menu` element to HTML5 display definitions.
+
 === normalize.css 3.0.1 (March 27, 2014)
 
 * Add package.json for npm support.

diff --git a/_normalize.scss b/_normalize.scss
@@ -1,4 +1,4 @@
-/* normalize-scss 3.0.1+normalize.3.0.1 | MIT/GPLv2 License | bit.ly/normalize-scss */
+/* normalize-scss 3.0.1+normalize.3.0.2 | MIT/GPLv2 License | bit.ly/normalize-scss */
 
 
 // Variables and Imports
@@ -57,9 +57,6 @@ $indent-amount: 40px !default;
 @import "compass/typography/vertical_rhythm";
 
 
-/* Base
-   ========================================================================== */
-
 @if not $strict-normalize or support-legacy-browser(ie, "7") {
   /**
    * Establish a vertical rhythm unit using $base-font-size, $base-line-height,
@@ -97,7 +94,8 @@ body {
 
 /**
  * Correct `block` display not defined for any HTML5 element in IE 8/9.
- * Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox.
+ * Correct `block` display not defined for `details` or `summary` in IE 10/11
+ * and Firefox.
  * Correct `block` display not defined for `main` in IE 11.
  */
 
@@ -110,6 +108,7 @@ footer,
 header,
 hgroup,
 main,
+menu,
 nav,
 section,
 summary {
@@ -172,7 +171,7 @@ template {
    */
 
   a {
-    background: transparent;
+    background-color: transparent;
   }
 }
 

diff --git a/package.json b/package.json
@@ -5,7 +5,6 @@
   "style": "_normalize.scss",
   "files": [
     "_normalize.scss",
-    "component.json"
   ],
   "homepage": "https://github.com/JohnAlbin/normalize-scss",
   "repository": {

diff --git a/test.html b/test.html
@@ -97,34 +97,32 @@ <h3 class="Test-it">should have no margin (opinionated)</h3>
     (there should be no red background visible on this page)
   </div>
 
-  <h2 class="Test-describe"><code>article</code>, <code>aside</code>, <code>details</code>, <code>figure</code>, <code>figcaption</code>, <code>footer</code>, <code>header</code>, <code>hgroup</code>, <code>main</code>, <code>nav</code>, <code>section</code>, <code>summary</code></h2>
+  <h2 class="Test-describe">
+    <code>article</code>, <code>aside</code>, <code>details</code>,
+    <code>figure</code>, <code>figcaption</code>, <code>footer</code>,
+    <code>header</code>, <code>hgroup</code>, <code>main</code>,
+    <code>menu</code>, <code>nav</code>, <code>section</code>,
+    <code>summary</code>
+  </h2>
   <h3 class="Test-it">should render as block</h3>
-  <div class="Test-run Test-run--highlightEl" id="html5-block">
-    <style>
-      #html5-block span {
-        content: "";
-        background: #ADD8E6;
-        display: inline-block;
-        height: 10px;
-        width: 10px;
-      }
-    </style>
-    <article>article</article> <span></span>
-    <aside>aside</aside> <span></span>
+  <div class="Test-run Test-run--highlightEl">
+    <article>article</article>
+    <aside>aside</aside>
     <details>
       <summary>summary</summary>
       details
-    </details> <span></span>
+    </details>
     <figure>
       figure
-      <figcaption>figcaption</figcaption> <span></span>
-    </figure> <span></span>
-    <footer>footer</footer> <span></span>
-    <header>header</header> <span></span>
-    <hgroup>hgroup</hgroup> <span></span>
-    <main>main</main> <span></span>
-    <nav>nav</nav> <span></span>
-    <section>section</section> <span></span>
+      <figcaption>figcaption</figcaption>
+    </figure>
+    <footer>footer</footer>
+    <header>header</header>
+    <hgroup>hgroup</hgroup>
+    <main>main</main>
+    <menu><li>menu</li></menu>
+    <nav>nav</nav>
+    <section>section</section>
   </div>
 
   <h2 class="Test-describe"><code>audio</code>, <code>canvas</code>, <code>progress</code>, <code>video</code></h2>

diff --git a/tests/controls/safari6.css b/tests/controls/safari6.css
@@ -26,7 +26,8 @@ body {
    ========================================================================== */
 /**
  * Correct `block` display not defined for any HTML5 element in IE 8/9.
- * Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox.
+ * Correct `block` display not defined for `details` or `summary` in IE 10/11
+ * and Firefox.
  * Correct `block` display not defined for `main` in IE 11.
  */
 article,
@@ -38,6 +39,7 @@ footer,
 header,
 hgroup,
 main,
+menu,
 nav,
 section,
 summary {