Convert old "html5" section into the new "sections" section. #88

JohnAlbin · Oct 24, 2016 · ec9f453 · ec9f453
1 parent 76b5921
commit ec9f453
Show file tree

Hide file tree

Showing 28 changed files with 1,503 additions and 1,035 deletions.
diff --git a/fork-versions/default/_normalize.scss b/fork-versions/default/_normalize.scss
@@ -44,7 +44,7 @@ html {
   -webkit-text-size-adjust: 100%; /* 3 */
 }
 
-/* HTML5 display definitions
+/* Sections
    ========================================================================== */
 
 /**
@@ -56,62 +56,63 @@ body {
 }
 
 /**
- * Add the correct display in IE <10.
- * Add the correct display in Edge, IE, and Firefox for `details` or `summary`.
- * Add the correct display in IE for `main`.
+ * Add the correct display in IE 9-.
  */
 
 article,
 aside,
-details,
-figcaption,
-figure,
 footer,
 header,
-main,
-menu,
 nav,
-section,
-summary {
+section {
   display: block;
 }
 
 /**
- * Add the correct display in IE <10.
+ * Correct the font size and margin on `h1` elements within `section` and
+ * `article` contexts in Chrome, Firefox, and Safari.
  */
 
-audio,
-canvas,
-progress,
-video {
-  display: inline-block;
-}
-
-/**
- * Add the correct display and remove excess height in iOS 4-7.
- */
+h1 {
+  @include normalize-font-size($h1-font-size);
+  @if $normalize-vertical-rhythm {
+    @include normalize-line-height($h1-font-size);
+  }
 
-audio:not([controls]) {
-  display: none;
-  height: 0;
+  /* Set 1 unit of vertical rhythm on the top and bottom margins. */
+  @include normalize-margin(1 0, $h1-font-size);
 }
 
-/**
- * Add the correct vertical alignment in Chrome, Firefox, and Opera.
- */
+@if $normalize-vertical-rhythm {
+  h2 {
+    @include normalize-font-size($h2-font-size);
+    @include normalize-line-height($h2-font-size);
+    @include normalize-margin(1 0, $h2-font-size);
+  }
 
-progress {
-  vertical-align: baseline;
-}
+  h3 {
+    @include normalize-font-size($h3-font-size);
+    @include normalize-line-height($h3-font-size);
+    @include normalize-margin(1 0, $h3-font-size);
+  }
 
-/**
- * Add the correct display in IE <11, Safari <8, and Firefox <22.
- * 1. Add the correct display in IE.
- */
+  h4 {
+    @include normalize-font-size($h4-font-size);
+    @include normalize-line-height($h4-font-size);
+    @include normalize-margin(1 0, $h4-font-size);
+  }
 
-template, /* 1 */
-[hidden] {
-  display: none;
+  h5 {
+    @include normalize-font-size($h5-font-size);
+    @include normalize-line-height($h5-font-size);
+    @include normalize-margin(1 0, $h5-font-size);
+  }
+
+  h6 {
+    @include normalize-font-size($h6-font-size);
+    @include normalize-line-height($h6-font-size);
+    @include normalize-margin(1 0, $h6-font-size);
+  }
 }
 
 /* Links
@@ -190,53 +191,6 @@ dfn {
   font-style: italic;
 }
 
-/**
- * Correct the font size and margin on `h1` elements within `section` and
- * `article` contexts in Chrome, Firefox, and Safari.
- */
-
-h1 {
-  @include normalize-font-size($h1-font-size);
-  @if $normalize-vertical-rhythm {
-    @include normalize-line-height($h1-font-size);
-  }
-
-  /* Set 1 unit of vertical rhythm on the top and bottom margins. */
-  @include normalize-margin(1 0, $h1-font-size);
-}
-
-@if $normalize-vertical-rhythm {
-  h2 {
-    @include normalize-font-size($h2-font-size);
-    @include normalize-line-height($h2-font-size);
-    @include normalize-margin(1 0, $h2-font-size);
-  }
-
-  h3 {
-    @include normalize-font-size($h3-font-size);
-    @include normalize-line-height($h3-font-size);
-    @include normalize-margin(1 0, $h3-font-size);
-  }
-
-  h4 {
-    @include normalize-font-size($h4-font-size);
-    @include normalize-line-height($h4-font-size);
-    @include normalize-margin(1 0, $h4-font-size);
-  }
-
-  h5 {
-    @include normalize-font-size($h5-font-size);
-    @include normalize-line-height($h5-font-size);
-    @include normalize-margin(1 0, $h5-font-size);
-  }
-
-  h6 {
-    @include normalize-font-size($h6-font-size);
-    @include normalize-line-height($h6-font-size);
-    @include normalize-margin(1 0, $h6-font-size);
-  }
-}
-
 /**
  * Add the correct background and color in IE <10.
  */
@@ -278,6 +232,24 @@ sup {
 /* Embedded content
    ========================================================================== */
 
+/**
+ * Add the correct display in IE 9-.
+ */
+
+audio,
+video {
+  display: inline-block;
+}
+
+/**
+ * Add the correct display in iOS 4-7.
+ */
+
+audio:not([controls]) {
+  display: none;
+  height: 0;
+}
+
 /**
  * Remove the border on images inside links in IE <11.
  */
@@ -336,6 +308,15 @@ svg:not(:root) {
   }
 }
 
+/**
+ * Add the correct display in IE 9-.
+ */
+
+figcaption,
+figure {
+  display: block;
+}
+
 /**
  * Add the correct margin in IE 8.
  */
@@ -355,6 +336,14 @@ hr {
   overflow: visible; /* 2 */
 }
 
+/**
+ * Add the correct display in IE.
+ */
+
+main {
+  display: block;
+}
+
 @if $normalize-vertical-rhythm {
   /**
    * Set 1 unit of vertical rhythm on the top and bottom margin.
@@ -561,10 +550,71 @@ optgroup {
   font-weight: bold;
 }
 
+/**
+ * 1. Add the correct display in IE 9-.
+ * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera.
+ */
+
+progress {
+  display: inline-block; /* 1 */
+  vertical-align: baseline; /* 2 */
+}
+
 /**
  * Remove the default vertical scrollbar in IE.
  */
 
 textarea {
   overflow: auto;
 }
+
+/* Interactive
+   ========================================================================== */
+
+/*
+ * Add the correct display in IE 9-.
+ * 1. Add the correct display in Edge, IE, and Firefox.
+ */
+
+details, /* 1 */
+menu {
+  display: block;
+}
+
+/*
+ * Add the correct display in all browsers.
+ */
+
+summary {
+  display: list-item;
+}
+
+/* Scripting
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 9-.
+ */
+
+canvas {
+  display: inline-block;
+}
+
+/**
+ * Add the correct display in IE.
+ */
+
+template {
+  display: none;
+}
+
+/* Hidden
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 10-.
+ */
+
+[hidden] {
+  display: none;
+}