update default stylesheets

- clean up abstract block styles
- darken lead paragraph color
- increase line-height on block title, decrease margin
- update & shrink CodeRay styles
- drop generic font-family names
- style quote blocks like quote blocks
- style verse blocks like verse blocks
- lighten table header background color
- make toc title responsive
- properly align floating section anchor
- add background color on listing blocks when not added by highlighter theme
- reduce size, reposition of floating language text in listingblock
- increase size of conum
- tweak letter and word spacings
- don't use color on qanda question text
- add background color to exampleblock
- darken listingblock color in sidebarblock
- fix appearance of listingblock in print styles

2 files changed, 149 insertions, 134 deletions

diff --git a/data/stylesheets/asciidoctor-default.css b/data/stylesheets/asciidoctor-default.css
index 1b7b5dcb..405d7f6d 100644
--- a/data/stylesheets/asciidoctor-default.css
+++ b/data/stylesheets/asciidoctor-default.css
@@ -57,15 +57,15 @@ img{-ms-interpolation-mode:bicubic}
 img{display:inline-block;vertical-align:middle}
 textarea{height:auto;min-height:50px}
 select{width:100%}
-p.lead,.paragraph.lead>p,#preamble>.sectionbody>.paragraph:first-of-type p,.quoteblock.abstract>blockquote{font-size:1.21875em;line-height:1.6}
-.subheader,#content #toctitle,.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{line-height:1.2;color:#7a2518;font-weight:400;margin-top:.2em;margin-bottom:.5em}
+p.lead,.paragraph.lead>p,#preamble>.sectionbody>.paragraph:first-of-type p{font-size:1.21875em;line-height:1.6}
+.subheader,.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{line-height:1.45;color:#7a2518;font-weight:400;margin-top:0;margin-bottom:.25em}
 div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0;direction:ltr}
 a{color:#2156a5;text-decoration:underline;line-height:inherit}
 a:hover,a:focus{color:#1d4b8f}
 a img{border:none}
 p{font-family:inherit;font-weight:400;font-size:1em;line-height:1.6;margin-bottom:1.25em;text-rendering:optimizeLegibility}
 p aside{font-size:.875em;line-height:1.35;font-style:italic}
-h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{font-family:'Open Sans','DejaVu Sans',Sans,sans-serif;font-weight:300;font-style:normal;color:#ba3925;text-rendering:optimizeLegibility;margin-top:1em;margin-bottom:.5em;line-height:1.0125em}
+h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{font-family:'Open Sans','DejaVu Sans',sans-serif;font-weight:300;font-style:normal;color:#ba3925;text-rendering:optimizeLegibility;margin-top:1em;margin-bottom:.5em;line-height:1.0125em}
 h1 small,h2 small,h3 small,#toctitle small,.sidebarblock>.content>.title small,h4 small,h5 small,h6 small{font-size:60%;color:#e99b8f;line-height:0}
 h1{font-size:2.125em}
 h2{font-size:1.6875em}
@@ -90,17 +90,17 @@ dl dt{margin-bottom:.3125em;font-weight:700}
 dl dd{margin-bottom:1.25em}
 abbr,acronym{text-transform:uppercase;font-size:90%;color:rgba(0,0,0,.8);border-bottom:1px dotted #ddd;cursor:help}
 abbr{text-transform:none}
-blockquote{margin:0 0 1.25em;padding:.5625em 1.25em 0 1.1875em;border-left:3px solid #487c58}
-blockquote cite{display:block;font-size:inherit;color:rgba(0,0,0,.5)}
+blockquote{margin:0 0 1.25em;padding:.5625em 1.25em 0 1.1875em;border-left:1px solid #ddd}
+blockquote cite{display:block;font-size:.9375em;color:rgba(0,0,0,.6)}
 blockquote cite:before{content:"\2014 \0020"}
-blockquote cite a,blockquote cite a:visited{color:rgba(0,0,0,.5)}
-blockquote,blockquote p{line-height:1.6;color:rgba(0,0,0,.65)}
+blockquote cite a,blockquote cite a:visited{color:rgba(0,0,0,.6)}
+blockquote,blockquote p{line-height:1.6;color:rgba(0,0,0,.85)}
 @media only screen and (min-width:768px){h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2}
 h1{font-size:2.75em}
 h2{font-size:2.3125em}
 h3,#toctitle,.sidebarblock>.content>.title{font-size:1.6875em}
 h4{font-size:1.4375em}}table{background:#fff;margin-bottom:1.25em;border:solid 1px #dedede}
-table thead,table tfoot{background:#f3f3f1;font-weight:700}
+table thead,table tfoot{background:#f7f8f7;font-weight:700}
 table thead tr th,table thead tr td,table tfoot tr th,table tfoot tr td{padding:.5em .625em .625em;font-size:inherit;color:rgba(0,0,0,.8);text-align:left}
 table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)}
 table tr.even,table tr.alt,table tr:nth-of-type(even){background:#f8f8f7}
@@ -127,25 +127,26 @@ p a>code:hover{color:rgba(0,0,0,.9)}
 #header>h1:first-child{color:rgba(0,0,0,.85);font-weight:300;margin-bottom:0}
 #header>h1:first-child+#toc{margin-top:8px;border-top:1px solid #ddddd8}
 #header>h1:only-child,body.toc2 #header>h1:nth-last-child(2){border-bottom:1px solid #ddddd8;padding-bottom:8px}
-#header .details{border-bottom:1px solid #ddddd8;line-height:1.45;padding-top:.25em;padding-bottom:.25em;padding-left:.25em;color:rgba(0,0,0,.5);display:-ms-flexbox;display:-webkit-flex;display:flex;-ms-flex-flow:row wrap;-webkit-flex-flow:row wrap;flex-flow:row wrap}
+#header .details{border-bottom:1px solid #ddddd8;line-height:1.45;padding-top:.25em;padding-bottom:.25em;padding-left:.25em;color:rgba(0,0,0,.6);display:-ms-flexbox;display:-webkit-flex;display:flex;-ms-flex-flow:row wrap;-webkit-flex-flow:row wrap;flex-flow:row wrap}
 #header .details span:first-child{margin-left:-.25em}
-#header .details span.email a{color:rgba(0,0,0,.65)}
+#header .details span.email a{color:rgba(0,0,0,.85)}
 #header .details br{display:none}
 #header .details br+span:before{content:"\00a0\2013\00a0"}
-#header .details br+span.author:before{content:"\00a0\22c5\00a0";color:rgba(0,0,0,.65)}
-#header .details br+span#revremark:before{content:"\00a0:\00a0";color:rgba(0,0,0,.65)}
+#header .details br+span.author:before{content:"\00a0\22c5\00a0";color:rgba(0,0,0,.85)}
+#header .details br+span#revremark:before{content:"\00a0:\00a0";color:rgba(0,0,0,.85)}
 #header #revnumber{text-transform:capitalize}
 #header #revnumber:after{content:"\00a0"}
 #content>h1:first-child{color:rgba(0,0,0,.85);font-weight:300;border-bottom:1px solid #ddddd8;padding-bottom:.1em}
 #toc{border-bottom:1px solid #efefed;padding-bottom:.5em}
 #toc>ul{margin-left:.125em}
 #toc ul.sectlevel0>li>a{font-style:italic}
-#toc ul.sectlevel0 ul.sectlevel1{margin-left:0;margin-top:.5em;margin-bottom:.5em}
-#toc ul{font-family:'Open Sans','DejaVu Sans',Sans,sans-serif;list-style-type:none}
+#toc ul.sectlevel0 ul.sectlevel1{margin:.5em 0}
+#toc ul{font-family:'Open Sans','DejaVu Sans',sans-serif;list-style-type:none}
 #toc a{text-decoration:none}
 #toc a:active{text-decoration:underline}
-#toctitle{color:#7a2518}
-@media only screen and (min-width:768px){body.toc2{padding-left:15em;padding-right:0}
+#toctitle{color:#7a2518;font-size:1.2em}
+@media only screen and (min-width:768px){#toctitle{font-size:1.375em}
+body.toc2{padding-left:15em;padding-right:0}
 #toc.toc2{margin-top:0 !important;background-color:#f8f8f7;position:fixed;width:15em;left:0;top:0;border-right:1px solid #efefed;border-top-width:0 !important;border-bottom-width:0 !important;z-index:1000;padding:1.25em 1em;height:100%;overflow:auto}
 #toc.toc2 #toctitle{margin-top:0;font-size:1.2em}
 #toc.toc2>ul{font-size:.9em;margin-bottom:0}
@@ -160,25 +161,25 @@ body.toc2.toc-right #toc.toc2{border-right-width:0;border-left:1px solid #efefed
 body.toc2.toc-right{padding-left:0;padding-right:20em}}#content #toc{border-style:solid;border-width:1px;border-color:#e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;-webkit-border-radius:4px;border-radius:4px}
 #content #toc>:first-child{margin-top:0}
 #content #toc>:last-child{margin-bottom:0}
-#content #toctitle{font-size:1.375em}
 #footer{max-width:100%;background-color:rgba(0,0,0,.8);padding:1.25em}
 #footer-text{color:rgba(255,255,255,.8);line-height:1.44}
 .sect1{padding-bottom:.625em}
 @media only screen and (min-width:768px){.sect1{padding-bottom:1.25em}}.sect1+.sect1{border-top:1px solid #efefed}
-#content h1>a.anchor,h2>a.anchor,h3>a.anchor,#toctitle>a.anchor,.sidebarblock>.content>.title>a.anchor,h4>a.anchor,h5>a.anchor,h6>a.anchor{position:absolute;z-index:1001;width:1.5ex;margin-left:-1.5ex;display:block;text-decoration:none;visibility:hidden;text-align:center;font-weight:400}
+#content h1>a.anchor,h2>a.anchor,h3>a.anchor,#toctitle>a.anchor,.sidebarblock>.content>.title>a.anchor,h4>a.anchor,h5>a.anchor,h6>a.anchor{position:absolute;z-index:1001;width:1.5ex;margin-left:-1.5ex;display:block;text-decoration:none !important;visibility:hidden;text-align:center;font-weight:400}
 #content h1>a.anchor:before,h2>a.anchor:before,h3>a.anchor:before,#toctitle>a.anchor:before,.sidebarblock>.content>.title>a.anchor:before,h4>a.anchor:before,h5>a.anchor:before,h6>a.anchor:before{content:"\00A7";font-size:.85em;display:block;padding-top:.1em}
 #content h1:hover>a.anchor,#content h1>a.anchor:hover,h2:hover>a.anchor,h2>a.anchor:hover,h3:hover>a.anchor,#toctitle:hover>a.anchor,.sidebarblock>.content>.title:hover>a.anchor,h3>a.anchor:hover,#toctitle>a.anchor:hover,.sidebarblock>.content>.title>a.anchor:hover,h4:hover>a.anchor,h4>a.anchor:hover,h5:hover>a.anchor,h5>a.anchor:hover,h6:hover>a.anchor,h6>a.anchor:hover{visibility:visible}
 #content h1>a.link,h2>a.link,h3>a.link,#toctitle>a.link,.sidebarblock>.content>.title>a.link,h4>a.link,h5>a.link,h6>a.link{color:#ba3925;text-decoration:none}
 #content h1>a.link:hover,h2>a.link:hover,h3>a.link:hover,#toctitle>a.link:hover,.sidebarblock>.content>.title>a.link:hover,h4>a.link:hover,h5>a.link:hover,h6>a.link:hover{color:#a53221}
-.audioblock,.imageblock,.literalblock,.listingblock,.stemblock,.verseblock,.videoblock{margin-bottom:1.25em}
+.audioblock,.imageblock,.literalblock,.listingblock,.stemblock,.videoblock{margin-bottom:1.25em}
 .admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{text-rendering:optimizeLegibility;text-align:left;font-family:'Noto Serif','DejaVu Serif',serif;font-size:1rem;font-style:italic}
 table.tableblock>caption.title{white-space:nowrap;overflow:visible;max-width:0}
+.paragraph.lead>p,#preamble>.sectionbody>.paragraph:first-of-type p{color:rgba(0,0,0,.85)}
 table.tableblock #preamble>.sectionbody>.paragraph:first-of-type p{font-size:inherit}
 .admonitionblock>table{border:0;background:none;width:100%}
 .admonitionblock>table td.icon{text-align:center;width:80px}
 .admonitionblock>table td.icon img{max-width:none}
 .admonitionblock>table td.icon .title{font-weight:300;text-transform:uppercase}
-.admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #ddddd8;color:rgba(0,0,0,.5);text-rendering:optimizeLegibility}
+.admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #ddddd8;color:rgba(0,0,0,.6);text-rendering:optimizeLegibility}
 .admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0}
 .exampleblock>.content{border-style:solid;border-width:1px;border-color:#e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;-webkit-border-radius:4px;border-radius:4px}
 .exampleblock>.content>:first-child{margin-top:0}
@@ -188,15 +189,16 @@ table.tableblock #preamble>.sectionbody>.paragraph:first-of-type p{font-size:inh
 .sidebarblock>:last-child{margin-bottom:0}
 .sidebarblock>.content>.title{color:#7a2518;line-height:1.4;margin-top:0}
 .exampleblock>.content>:last-child>:last-child,.exampleblock>.content .olist>ol>li:last-child>:last-child,.exampleblock>.content .ulist>ul>li:last-child>:last-child,.exampleblock>.content .qlist>ol>li:last-child>:last-child,.sidebarblock>.content>:last-child>:last-child,.sidebarblock>.content .olist>ol>li:last-child>:last-child,.sidebarblock>.content .ulist>ul>li:last-child>:last-child,.sidebarblock>.content .qlist>ol>li:last-child>:last-child{margin-bottom:0}
-.literalblock pre:not([class]),.literalblock pre.CodeRay,.literalblock pre.prettyprint,.listingblock pre:not([class]),.listingblock pre.CodeRay,.listingblock pre.prettyprint{background:#f7f7f8}
-.literalblock pre,.literalblock pre[class],.listingblock pre,.listingblock pre[class]{-webkit-border-radius:4px;border-radius:4px;padding:1em;word-wrap:break-word}
+.literalblock pre,.listingblock pre:not([class]),.listingblock pre[class="highlight"],.listingblock pre[class^="highlight "],.listingblock pre[class="nowrap"],.listingblock .CodeRay,.listingblock .prettyprint{background:#f7f7f8}
+.sidebarblock .literalblock pre,.sidebarblock .listingblock pre:not([class]),.sidebarblock .listingblock pre[class="highlight"],.sidebarblock .listingblock pre[class^="highlight "],.sidebarblock .listingblock pre[class="nowrap"],.sidebarblock .listingblock .CodeRay,.sidebarblock .listingblock .prettyprint{background:#f2f1f1}
+.literalblock pre,.literalblock pre[class],.listingblock pre,.listingblock pre[class]{-webkit-border-radius:4px;border-radius:4px;padding:1em;word-wrap:break-word;font-size:.8125em}
 .literalblock pre.nowrap,.literalblock pre[class].nowrap,.listingblock pre.nowrap,.listingblock pre[class].nowrap{overflow-x:auto;white-space:pre;word-wrap:normal}
-@media only screen{.literalblock pre,.literalblock pre[class],.listingblock pre,.listingblock pre[class]{font-size:.8em}}@media only screen and (min-width:768px){.literalblock pre,.literalblock pre[class],.listingblock pre,.listingblock pre[class]{font-size:.9em}}@media only screen and (min-width:1280px){.literalblock pre,.literalblock pre[class],.listingblock pre,.listingblock pre[class]{font-size:1em}}.literalblock.output pre{color:#f7f7f8;background-color:rgba(0,0,0,.9)}
-.listingblock pre[class="highlight"]{padding:0}
-.listingblock pre[class="highlight"]>code{display:block;padding:1em;-webkit-border-radius:4px;border-radius:4px}
+@media only screen and (min-width:768px){.literalblock pre,.literalblock pre[class],.listingblock pre,.listingblock pre[class]{font-size:.9375em}}@media only screen and (min-width:1280px){.literalblock pre,.literalblock pre[class],.listingblock pre,.listingblock pre[class]{font-size:1em}}.literalblock.output pre{color:#f7f7f8;background-color:rgba(0,0,0,.9)}
+.listingblock pre.highlightjs{padding:0}
+.listingblock pre.highlightjs>code{display:block;padding:1em;-webkit-border-radius:4px;border-radius:4px}
 .listingblock pre.prettyprint{border-width:0}
 .listingblock>.content{position:relative}
-.listingblock:hover code[class*=" language-"]:before{text-transform:uppercase;font-size:.9em;color:#999;position:absolute;top:1em;right:1em;line-height:1}
+.listingblock:hover code[class*=" language-"]:before{position:absolute;font-size:.75em;top:.5rem;right:.5rem;line-height:1;text-transform:uppercase;color:#999}
 .listingblock:hover code.asciidoc:before{content:"asciidoc"}
 .listingblock:hover code.clojure:before{content:"clojure"}
 .listingblock:hover code.css:before{content:"css"}
@@ -216,22 +218,30 @@ table.tableblock #preamble>.sectionbody>.paragraph:first-of-type p{font-size:inh
 table.pyhltable{border:0;margin-bottom:0;background:transparent}
 table.pyhltable td{vertical-align:top;padding-top:0;padding-bottom:0}
 table.pyhltable td.code{padding-left:.75em;padding-right:0}
-.highlight.pygments .lineno,table.pyhltable td:not(.code){color:#999;padding-left:0;padding-right:.5em;border-right:1px solid #ddddd8}
-.highlight.pygments .lineno{display:inline-block;margin-right:.25em}
+.pygments.highlight .lineno,table.pyhltable td:not(.code){color:#999;padding-left:0;padding-right:.5em;border-right:1px solid #ddddd8}
+.pygments.highlight .lineno{display:inline-block;margin-right:.25em}
 table.pyhltable .linenodiv{background-color:transparent !important;padding-right:0 !important}
-.quoteblock .attribution,.verseblock .attribution{margin-top:.25em;font-size:inherit;color:rgba(0,0,0,.5);line-height:1.45}
-.quoteblock .attribution br,.verseblock .attribution br{display:none}
-.quoteblock .attribution cite,.verseblock .attribution cite{display:block}
-.quoteblock{margin:0 0 1.25em 0;padding:.5625em 1.25em 0 1.1875em;border-left:3px solid #487c58}
-.quoteblock blockquote{margin:0 0 1.25em 0;padding:0 0 .625em 0;border:0}
+.quoteblock{margin:0 1em 1.25em 1.5em;display:table}
+.quoteblock>.title{margin-left:-1.5em;margin-bottom:.75em}
+.quoteblock blockquote,.quoteblock blockquote p{color:rgba(0,0,0,.85);font-size:1.15rem;line-height:1.75;word-spacing:.1em;letter-spacing:0;font-style:italic;text-align:justify}
+.quoteblock blockquote{margin:0;padding:0;border:none}
+.quoteblock blockquote:before{content:"\201c";float:left;font-size:2.75em;font-weight:700;line-height:.6em;margin-left:-.6em;color:#7a2518;text-shadow:0 1px 2px rgba(0,0,0,.1)}
 .quoteblock blockquote>.paragraph:last-child p{margin-bottom:0}
-.quoteblock .attribution{margin-top:-.625em;padding-bottom:.625em}
-.quoteblock.abstract{padding:0;border-width:0}
-.quoteblock.abstract>blockquote{font-style:italic}
-.quoteblock.abstract>blockquote:first-line {font-weight:700}
-.quoteblock.abstract>blockquote p{line-height:1.75}
+.quoteblock .attribution{margin-top:.5em;margin-right:.5ex;text-align:right}
+.quoteblock .quoteblock{margin-left:0;margin-right:0;padding:.5em 0;border-left:3px solid rgba(0,0,0,.6)}
+.quoteblock .quoteblock blockquote{padding:0 0 0 .75em}
+.quoteblock .quoteblock blockquote:before{display:none}
+.verseblock{margin:0 1em 1.25em 1em}
+.verseblock pre{font-family:'Open Sans',Sans,sans;font-size:1.15rem;color:rgba(0,0,0,.85);font-weight:300;text-rendering:optimizeLegibility}
+.verseblock .attribution{margin-top:1.25rem;margin-left:.5ex}
+.quoteblock .attribution,.verseblock .attribution{font-size:.9375em;line-height:1.45;font-style:italic}
+.quoteblock .attribution br,.verseblock .attribution br{display:none}
+.quoteblock .attribution cite,.verseblock .attribution cite{display:block;letter-spacing:-.05em;color:rgba(0,0,0,.6)}
+.quoteblock.abstract{margin:0 0 1.25em 0;display:block}
+.quoteblock.abstract blockquote,.quoteblock.abstract blockquote p{text-align:left;word-spacing:0}
+.quoteblock.abstract blockquote:before,.quoteblock.abstract blockquote p:first-of-type:before{display:none}
 table.tableblock{max-width:100%;border-collapse:separate}
-table.tableblock td .paragraph:last-child p>p:last-child,table.tableblock th>p:last-child,table.tableblock td>p:last-child{margin-bottom:0}
+table.tableblock td>.paragraph:last-child p>p:last-child,table.tableblock th>p:last-child,table.tableblock td>p:last-child{margin-bottom:0}
 table.spread{width:100%}
 table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede}
 table.grid-all th.tableblock,table.grid-all td.tableblock{border-width:0 1px 1px 0}
@@ -251,9 +261,10 @@ th.valign-top,td.valign-top{vertical-align:top}
 th.valign-bottom,td.valign-bottom{vertical-align:bottom}
 th.valign-middle,td.valign-middle{vertical-align:middle}
 table thead th,table tfoot th{font-weight:700}
-tbody tr th{display:table-cell;line-height:1.6;background:#f3f3f1}
+tbody tr th{display:table-cell;line-height:1.6;background:#f7f8f7}
 tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:700}
 p.tableblock>code:only-child{background:none;padding:0}
+p.tableblock{font-size:1em}
 td>div.verse{white-space:pre}
 ol{margin-left:1.75em}
 ul li ol{margin-left:1.5em}
@@ -282,7 +293,6 @@ td.hdlist1,td.hdlist2{vertical-align:top}
 .literalblock+.colist,.listingblock+.colist{margin-top:-.5em}
 .colist>table tr>td:first-of-type{padding:0 .75em;line-height:1}
 .colist>table tr>td:last-of-type{padding:.25em 0}
-.qanda>ol>li>p>em:only-child{color:#1d4b8f}
 .thumb,.th{line-height:0;display:inline-block;border:solid 4px #fff;-webkit-box-shadow:0 0 0 1px #ddd;box-shadow:0 0 0 1px #ddd}
 .imageblock.left,.imageblock[style*="float: left"]{margin:.25em .625em 1.25em 0}
 .imageblock.right,.imageblock[style*="float: right"]{margin:.25em 0 1.25em .625em}
@@ -349,7 +359,7 @@ span.icon>.fa{cursor:default}
 .admonitionblock td.icon .icon-warning:before{content:"\f071";color:#bf6900}
 .admonitionblock td.icon .icon-caution:before{content:"\f06d";color:#bf3400}
 .admonitionblock td.icon .icon-important:before{content:"\f06a";color:#bf0000}
-.conum[data-value]{display:inline-block;color:#fff !important;background-color:rgba(0,0,0,.8);-webkit-border-radius:100px;border-radius:100px;text-align:center;width:1.5em;height:1.5em;font-size:.75em;line-height:1.5em;font-family:'Open Sans',Sans,sans-serif;font-style:normal;font-weight:700}
+.conum[data-value]{display:inline-block;color:#fff !important;background-color:rgba(0,0,0,.8);-webkit-border-radius:100px;border-radius:100px;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:'Open Sans','DejaVu Sans',sans-serif;font-style:normal;font-weight:700}
 .conum[data-value] *{color:#fff !important}
 .conum[data-value]+b{display:none}
 .conum[data-value]:after{content:attr(data-value)}
@@ -357,9 +367,13 @@ pre .conum[data-value]{position:relative;top:-.125em}
 b.conum *{color:inherit !important}
 .conum:not([data-value]):empty{display:none}
 h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{word-spacing:-.05em}
-#content p,#content dt,#content td.content{letter-spacing:-.01em;font-size:1.0625rem}
-#content p.tableblock{font-size:1em}
-.exampleblock>.content{background-color:#e2e8e0;border-color:#c7d2c3;-webkit-box-shadow:0 1px 4px #e0e0dc;box-shadow:0 1px 4px #e0e0dc}
+h1,h2{letter-spacing:-.01em}
+dt,th.tableblock,td.content{text-rendering:optimizeLegibility}
+p,td.content{letter-spacing:-.01em}
+p b,p strong,td.content b,td.content strong{letter-spacing:-.005em}
+p,blockquote,dt,td.content{font-size:1.0625rem}
+.sidebarblock p,.sidebarblock dt,.sidebarblock td.content,p.tableblock{font-size:1em}
+.exampleblock>.content{background-color:#fffef7;border-color:#e0e0dc;-webkit-box-shadow:0 1px 4px #e0e0dc;box-shadow:0 1px 4px #e0e0dc}
 .print-only{display:none !important}
 @media print{@page{margin:1.25cm .75cm}
 *{-webkit-box-shadow:none !important;box-shadow:none !important;text-shadow:none !important}
@@ -387,11 +401,10 @@ body.book #header .details br{display:block}
 body.book #header .details br+span:before{content:none !important}
 body.book #toc{border:none !important;text-align:left !important;padding:0 !important;margin:0 !important}
 body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-break-before:always}
-.literalblock pre,.literalblock pre[class],.listingblock pre,.listingblock pre[class]{border:none !important;background:#f5f5f5 !important;padding:.75em !important}
-.listingblock pre.highlight{padding:0 !important}
-.listingblock pre.highlight>code{background:#f5f5f5 !important;padding:.75em !important}
-#footer{background:none !important}
-#footer-text{color:rgba(0,0,0,.65) !important;font-size:.9em}
+.literalblock pre,.literalblock pre[class],.listingblock pre,.listingblock pre[class]{background:#f7f7f7 !important;padding:1em !important}
+.listingblock pre.highlightjs>code{padding:0 !important;background:none !important}
+#footer{background:none !important;padding:0 .9375em}
+#footer-text{color:rgba(0,0,0,.6) !important;font-size:.9em}
 .hide-on-print{display:none !important}
 .print-only{display:block !important}
 .hide-for-print{display:none !important}
diff --git a/data/stylesheets/coderay-asciidoctor.css b/data/stylesheets/coderay-asciidoctor.css
index 63b6cf69..ce7c72e5 100644
--- a/data/stylesheets/coderay-asciidoctor.css
+++ b/data/stylesheets/coderay-asciidoctor.css
@@ -1,87 +1,89 @@
-/* Foundation stylesheet for CodeRay (to match GitHub theme) | MIT License | http://foundation.zurb.com */
-table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:transparent}
+/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
+/*pre.CodeRay {background-color:#f7f7f8;}*/
+.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
+.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
+.CodeRay .line-numbers strong{font-weight: normal}
+table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none}
 table.CodeRay td{vertical-align: top}
-table.CodeRay td.line-numbers{text-align:right;border-right:1px solid #d8d8d8;padding: 0 .5em 0 .25em}
-table.CodeRay td.code{padding: 0 0 0 .5em}
+table.CodeRay td.line-numbers{text-align:right}
 table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)}
+table.CodeRay td.code{padding:0 0 0 .5em}
 table.CodeRay td.code>pre{padding:0}
-span.line-numbers{border-right: 1px solid #d8d8d8;color:rgba(0,0,0,.3);display:inline-block;margin-right:.5em;padding: 0 .5em 0 .25em}
-.CodeRay td.line-numbers strong,.CodeRay span.line-numbers strong{font-weight: normal}
-.CodeRay .debug{color: #fff !important; background: #000080 !important}
-.CodeRay .annotation{color: #007}
-.CodeRay .attribute-name{color: #000080}
-.CodeRay .attribute-value{color: #700}
-.CodeRay .binary{color: #509}
-.CodeRay .comment{color: #998; font-style: italic}
-.CodeRay .char{color: #04d}
-.CodeRay .char .content{color: #04d}
-.CodeRay .char .delimiter{color: #039}
-.CodeRay .class{color: #458; font-weight: bold}
-.CodeRay .complex{color: #a08}
-.CodeRay .constant,.CodeRay .predefined-constant{color: #008080}
-.CodeRay .color{color: #099}
-.CodeRay .class-variable{color: #369}
-.CodeRay .decorator{color: #b0b}
-.CodeRay .definition{color: #099}
-.CodeRay .delimiter{color: black}
-.CodeRay .doc{color: #970}
-.CodeRay .doctype{color: #34b}
-.CodeRay .doc-string{color: #d42}
-.CodeRay .escape{color: #666}
-.CodeRay .entity{color: #800}
-.CodeRay .error{color: #808}
-.CodeRay .exception{color: inherit}
-.CodeRay .filename{color: #099}
-.CodeRay .function{color: #900; font-weight: bold}
-.CodeRay .global-variable{color: teal}
-.CodeRay .hex{color: #058}
-.CodeRay .integer,.CodeRay .float{color: #099}
-.CodeRay .include{color: #555}
-.CodeRay .inline{color: black}
-.CodeRay .inline .inline{background: #ccc}
-.CodeRay .inline .inline .inline{background: #bbb}
-.CodeRay .inline .inline-delimiter{color: #d14}
-.CodeRay .inline-delimiter{color: #d14}
-.CodeRay .important{color: #555; font-weight: bold}
-.CodeRay .interpreted{color: #b2b}
-.CodeRay .instance-variable{color: teal}
-.CodeRay .label{color: #970}
-.CodeRay .local-variable{color: #963}
-.CodeRay .octal{color: #40e}
-.CodeRay .predefined{color: #369}
-.CodeRay .preprocessor{color: #579}
-.CodeRay .pseudo-class{color: #555}
-.CodeRay .directive{font-weight: bold}
-.CodeRay .type{font-weight: bold}
-.CodeRay .predefined-type{color: inherit}
-.CodeRay .reserved,.CodeRay .keyword {color: #000; font-weight: bold}
-.CodeRay .key{color: #808}
-.CodeRay .key .delimiter{color: #606}
-.CodeRay .key .char{color: #80f}
-.CodeRay .value{color: #088}
-.CodeRay .regexp .delimiter{color: #808}
-.CodeRay .regexp .content{color: #808}
-.CodeRay .regexp .modifier{color: #808}
-.CodeRay .regexp .char{color: #d14}
-.CodeRay .regexp .function{color: #404; font-weight: bold}
-.CodeRay .string{color: #d20}
-.CodeRay .string .string .string{background: #ffd0d0}
-.CodeRay .string .content{color: #d14}
-.CodeRay .string .char{color: #d14}
-.CodeRay .string .delimiter{color: #d14}
-.CodeRay .shell{color: #d14}
-.CodeRay .shell .delimiter{color: #d14}
-.CodeRay .symbol{color: #990073}
-.CodeRay .symbol .content{color: #a60}
-.CodeRay .symbol .delimiter{color: #630}
-.CodeRay .tag{color: #008080}
-.CodeRay .tag-special{color: #d70}
-.CodeRay .variable{color: #036}
-.CodeRay .insert{background: #afa}
-.CodeRay .delete{background: #faa}
-.CodeRay .change{color: #aaf; background: #007}
-.CodeRay .head{color: #f8f; background: #505}
-.CodeRay .insert .insert{color: #080}
-.CodeRay .delete .delete{color: #800}
-.CodeRay .change .change{color: #66f}
-.CodeRay .head .head{color: #f4f}
+.CodeRay .debug{color:#fff !important;background:#000080 !important}
+.CodeRay .annotation{color:#007}
+.CodeRay .attribute-name{color:#000080}
+.CodeRay .attribute-value{color:#700}
+.CodeRay .binary{color:#509}
+.CodeRay .comment{color:#998;font-style:italic}
+.CodeRay .char{color:#04d}
+.CodeRay .char .content{color:#04d}
+.CodeRay .char .delimiter{color:#039}
+.CodeRay .class{color:#458;font-weight:bold}
+.CodeRay .complex{color:#a08}
+.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
+.CodeRay .color{color:#099}
+.CodeRay .class-variable{color:#369}
+.CodeRay .decorator{color:#b0b}
+.CodeRay .definition{color:#099}
+.CodeRay .delimiter{color:#000}
+.CodeRay .doc{color:#970}
+.CodeRay .doctype{color:#34b}
+.CodeRay .doc-string{color:#d42}
+.CodeRay .escape{color:#666}
+.CodeRay .entity{color:#800}
+.CodeRay .error{color:#808}
+.CodeRay .exception{color:inherit}
+.CodeRay .filename{color:#099}
+.CodeRay .function{color:#900;font-weight:bold}
+.CodeRay .global-variable{color:#008080}
+.CodeRay .hex{color:#058}
+.CodeRay .integer,.CodeRay .float{color:#099}
+.CodeRay .include{color:#555}
+.CodeRay .inline{color:#00}
+.CodeRay .inline .inline{background:#ccc}
+.CodeRay .inline .inline .inline{background:#bbb}
+.CodeRay .inline .inline-delimiter{color:#d14}
+.CodeRay .inline-delimiter{color:#d14}
+.CodeRay .important{color:#555;font-weight:bold}
+.CodeRay .interpreted{color:#b2b}
+.CodeRay .instance-variable{color:#008080}
+.CodeRay .label{color:#970}
+.CodeRay .local-variable{color:#963}
+.CodeRay .octal{color:#40e}
+.CodeRay .predefined{color:#369}
+.CodeRay .preprocessor{color:#579}
+.CodeRay .pseudo-class{color:#555}
+.CodeRay .directive{font-weight:bold}
+.CodeRay .type{font-weight:bold}
+.CodeRay .predefined-type{color:inherit}
+.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
+.CodeRay .key{color:#808}
+.CodeRay .key .delimiter{color:#606}
+.CodeRay .key .char{color:#80f}
+.CodeRay .value{color:#088}
+.CodeRay .regexp .delimiter{color:#808}
+.CodeRay .regexp .content{color:#808}
+.CodeRay .regexp .modifier{color:#808}
+.CodeRay .regexp .char{color:#d14}
+.CodeRay .regexp .function{color:#404;font-weight:bold}
+.CodeRay .string{color:#d20}
+.CodeRay .string .string .string{background:#ffd0d0}
+.CodeRay .string .content{color:#d14}
+.CodeRay .string .char{color:#d14}
+.CodeRay .string .delimiter{color:#d14}
+.CodeRay .shell{color:#d14}
+.CodeRay .shell .delimiter{color:#d14}
+.CodeRay .symbol{color:#990073}
+.CodeRay .symbol .content{color:#a60}
+.CodeRay .symbol .delimiter{color:#630}
+.CodeRay .tag{color:#008080}
+.CodeRay .tag-special{color:#d70}
+.CodeRay .variable{color:#036}
+.CodeRay .insert{background:#afa}
+.CodeRay .delete{background:#faa}
+.CodeRay .change{color:#aaf;background:#007}
+.CodeRay .head{color:#f8f;background:#505}
+.CodeRay .insert .insert{color:#080}
+.CodeRay .delete .delete{color:#800}
+.CodeRay .change .change{color:#66f}
+.CodeRay .head .head{color:#f4f}