Merge branch 'gh-pages' into car/issue190

Author: scottaohara

html-aria/index.html

@@ -118,11 +118,11 @@ 
 
       <table class="simple">
         <caption>
-          Rules of ARIA attributes usage by HTML language feature
+          Rules of ARIA attribute usage by HTML feature
         caption>
         <tr>
           <th>
-            HTML language feature
+            HTML feature
           th>
           <th>
             <p id="implicit">
@@ -139,7 +139,7 @@ 
         <tbody>
           <tr id="el-a" tabindex="-1">
             <td>
-              [^a^] element with a <a data-cite="html/links.html#attr-hyperlink-href">`href`a>
+              [^a^] with <a data-cite="html/links.html#attr-hyperlink-href">`href`a>
             td>
             <td>
               <code>role=<a href="#index-aria-link">linka>code>
@@ -174,7 +174,7 @@ 
           tr>
           <tr id="el-a-no-href" tabindex="-1">
             <td>
-              [^a^] element without a <a data-cite="html/links.html#attr-hyperlink-href">`href`a>
+              [^a^] without <a data-cite="html/links.html#attr-hyperlink-href">`href`a>
             td>
             <td>
               <a href="#dfn-no-corresponding-role" class="internalDFN" data-link-type="dfn">No corresponding rolea>
@@ -228,7 +228,7 @@ 
           tr>
           <tr id="el-area" tabindex="-1">
             <td>
-              [^area^] with a <a data-cite="html/links.html#attr-hyperlink-href">`href`a>
+              [^area^] with <a data-cite="html/links.html#attr-hyperlink-href">`href`a>
             td>
             <td>
               <code>role=<a href="#index-aria-link">linka>code>
@@ -246,7 +246,7 @@ 
           tr>
           <tr id="el-area-no-href" tabindex="-1">
             <td>
-              [^area^] without a <a data-cite="html/links.html#attr-hyperlink-href">`href`a>
+              [^area^] without <a data-cite="html/links.html#attr-hyperlink-href">`href`a>
             td>
             <td><a>No corresponding rolea>td>
             <td>
@@ -1890,6 +1890,7 @@ 
                 <a data-cite="dpub-aria-1.0#doc-credits">`doc-credits`a>,
                 <a data-cite="dpub-aria-1.0#doc-dedication">`doc-dedication`a>,
                 <a data-cite="dpub-aria-1.0#doc-endnotes">`doc-endnotes`a>,
+                <a data-cite="dpub-aria-1.0#doc-epigraph">`doc-epigraph`a>,
                 <a data-cite="dpub-aria-1.0#doc-epilogue">`doc-epilogue`a>,
                 <a data-cite="dpub-aria-1.0#doc-errata">`doc-errata`a>,
                 <a data-cite="dpub-aria-1.0#doc-example">`doc-example`a>,
@@ -2021,9 +2022,10 @@ 
             td>
             <td>
               <p>
-                Role: <a href="#index-aria-application">`application`a>,
-                <a href="#index-aria-document">`document`a>, or <a href=
-                "#index-aria-img">`img`a>
+                Roles:
+                <a href="#index-aria-application">`application`a>,
+                <a href="#index-aria-document">`document`a>
+                or <a href="#index-aria-img">`img`a>
               p>
               <p>
                 <a href="#index-aria-global">Global `aria-*` attributesa> and
@@ -2059,10 +2061,10 @@ 
             td>
             <td>
               <p>
-                Role: `button` with `aria-expanded="true"` if the
+                Role: `button` with `aria-expanded=true` if the
                 parent (`details`) element's <a data-cite=
                 "html/interactive-elements.html#attr-details-open">`open`a>
-                attribute is present, `aria-expanded="false"` otherwise.
+                attribute is present, `aria-expanded=false` otherwise.
               p>
               <p>
                 <a href="#index-aria-global">Global `aria-*` attributesa> and
@@ -2328,18 +2330,18 @@ 
                 Authors can use `role=list` to reinstate the role, if necessary.
               p>
               <p>
-                Role:
+                Roles:
                 <a href="#index-aria-directory">`directory`a>,
                 <a href="#index-aria-group">`group`a>,
                 <a href="#index-aria-listbox">`listbox`a>,
                 <a href="#index-aria-menu">`menu`a>,
                 <a href="#index-aria-menubar">`menubar`a>,
+                <a href="#index-aria-none">`none`a>,
+                <a href="#index-aria-presentation">`presentation`a>,
                 <a href="#index-aria-radiogroup">`radiogroup`a>,
                 <a href="#index-aria-tablist">`tablist`a>,
-                <a href="#index-aria-toolbar">`toolbar`a>,
-                <a href="#index-aria-tree">`tree`a>,
-                <a href="#index-aria-presentation">`presentation`a>
-                or <a href="#index-aria-none">`none`a>.
+                <a href="#index-aria-toolbar">`toolbar`a>
+                or <a href="#index-aria-tree">`tree`a>.
               p>
               <p>
                 <a href="#index-aria-global">Global `aria-*` attributesa> and
@@ -4883,9 +4885,10 @@ 
         SHOULD NOT be used.
       p>
     section>
-    <script src="details-summary/jquery.details.min.js">script>
+
+    
   body>
 html>

html-aria/makeup.css

@@ -1,32 +1,14 @@
-.note-title {
-  padding-left: 1.5em
-}
-
-summary {
-  background: url("rightArrow.png") no-repeat scroll 0.5em center #fff;
-  padding: 0.25em 0.25em 0.25em 2em;
-}
-
-summary:hover,
-summary:focus,
-details[open] summary:hover,
-details[open] summary:focus {
-  background-color: #eee;
-}
-
-details,
-summary {
-  display: block;
+p.note,
+div.note {
+  padding: 1em;
 }
 
-p.note::before {
-  content: "Note: ";
-  font-weight: bolder;
+.example .marker {
+  margin-bottom: 1em;
 }
 
-p.note,
-div.note {
-  padding: 0.5em 2em;
+div.note *:last-child {
+  margin-bottom: 0;
 }
 
 .note {
@@ -46,68 +28,10 @@ div.note {
   padding-left: 1em;
 }
 
-.new-feature {
-  background-color: crimson;
-}
-
-.changed-feature {
-  background-color: slateblue;
-}
-
-.new-feature,
-.changed-feature {
-  border-bottom: none !important;
-  padding-top: 1px;
-  padding-left: 4px;
-  padding-right: 4px;
-  margin-right: 6px;
-  font-size: smaller;
-  font-weight: bold;
-  color: white !important;
-  border-radius: 4px;
-  box-shadow: 3px 3px 3px #888;
-  border-bottom: none;
-  margin-left: 4px;
-  vertical-align: top;
-}
-
-.changed-feature1 {
-  border-bottom: none !important;
-  padding-top: 1px;
-  padding-left: 4px;
-  padding-right: 4px;
-  margin-right: 6px;
-  font-size: smaller;
-  font-weight: bold;
-  color: white !important;
-  border-radius: 4px;
-  box-shadow: 3px 3px 3px #888;
-  border-bottom: none;
-  margin-left: 4px;
-  vertical-align: top;
-}
-
-.new-feature1 {
-  border-bottom: none !important;
-  padding-top: 1px;
-  padding-left: 4px;
-  padding-right: 4px;
-  margin-right: 6px;
-  font-size: smaller;
-  font-weight: bold;
-  color: white !important;
-  border-radius: 4px;
-  box-shadow: 3px 3px 3px #888;
-  border-bottom: none;
-  margin-left: 4px;
-  vertical-align: top;
-}
-
-
-td {
-  padding: .3em
+a code {
+  color: inherit;
 }
 
-a code {
-  color: #034575
+.simple td {
+  padding: 10px;
 }