Merge branch 'rastus-vernon-patch-1'

kennethormandy · Nov 11, 2014 · 2fe8172 · 2fe8172
2 parents 932aedf + cf3d78a
commit 2fe8172
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 25 deletions.
diff --git a/normalize-opentype.css b/normalize-opentype.css
@@ -15,7 +15,7 @@
   text-shadow: inherit;
   /* 1. */ }
 
-html, body {
+html, body, table {
   -webkit-font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 1, "lnum" 0, "dlig" 0;
      -moz-font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 1, "lnum" 0, "dlig" 0;
           font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 1, "lnum" 0, "dlig" 0;
@@ -115,20 +115,14 @@ input[type="color"], input[type="date"], input[type="datetime"], input[type="dat
 /* Tables
 ========================================================================== */
 /**
- * 1. Turns on tabular, lining numerals and slashed zero
- *    Turns off kerning, as it could impact tabular numerals
+ * 1. Resets tables to the same settings as the body.
+ * 2. Turns on tabular, lining numerals and slashed zero
  */
 table {
-  -webkit-font-feature-settings: "kern" 0, "liga" 1, "calt" 1, "pnum" 0, "tnum" 1, "onum" 0, "lnum" 1, "zero" 1;
-     -moz-font-feature-settings: "kern" 0, "liga" 1, "calt" 1, "pnum" 0, "tnum" 1, "onum" 0, "lnum" 1, "zero" 1;
-          font-feature-settings: "kern" 0, "liga" 1, "calt" 1, "pnum" 0, "tnum" 1, "onum" 0, "lnum" 1, "zero" 1;
-  /* 1. */ }
+  /* 1.*/ }
 
-/**
- * 1. Revert to defaults for table headings
- */
-table thead, table tfoot {
-  -webkit-font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 1, "lnum" 0, "dlig" 0;
-     -moz-font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 1, "lnum" 0, "dlig" 0;
-          font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 1, "lnum" 0, "dlig" 0;
-  /* 2. */ }
+tbody, caption {
+  -webkit-font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 0, "tnum" 1, "onum" 0, "lnum" 1, "zero" 1;
+     -moz-font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 0, "tnum" 1, "onum" 0, "lnum" 1, "zero" 1;
+          font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 0, "tnum" 1, "onum" 0, "lnum" 1, "zero" 1;
+  /* 1. */ }
diff --git a/normalize-opentype.scss b/normalize-opentype.scss
@@ -214,19 +214,15 @@ input[type="week"] {
 ========================================================================== */
 
 /**
- * 1. Turns on tabular, lining numerals and slashed zero
- *    Turns off kerning, as it could impact tabular numerals
+ * 1. Resets tables to the same settings as the body.
+ * 2. Turns on tabular, lining numerals and slashed zero
  */
 
 table {
-  font-feature-settings: "kern" 0, "liga" 1, "calt" 1, "pnum" 0, "tnum" 1, "onum" 0, "lnum" 1, "zero" 1; /* 1. */
+  @extend body; /* 1.*/
 }
 
-/**
- * 1. Revert to defaults for table headings
- */
-
-table thead,
-table tfoot {
-  font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 1, "lnum" 0, "dlig" 0; /* 2. */
+tbody,
+caption {
+  font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 0, "tnum" 1, "onum" 0, "lnum" 1, "zero" 1; /* 1. */
 }