Skip to content

Commit e6f37ef

Browse files
committed
Merge pull request #21 from jaredhoberock/master
Get latest cxx-html-doc-framework
2 parents 5f1f5d0 + f00c5d5 commit e6f37ef

File tree

4 files changed

+158
-147
lines changed

4 files changed

+158
-147
lines changed

algorithms.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,11 +358,11 @@ <h1><code>ExecutionPolicy</code> algorithm overloads</h1>
358358
</tr>
359359
</table>
360360

361-
<ins2>
361+
<ins>
362362
<cxx-note>
363363
Not all algorithms in the Standard Library have counterparts in <cxx-ref to="tab.parallel.algorithms"></cxx-ref>.
364364
</cxx-note>
365-
</ins2>
365+
</ins>
366366
</cxx-section>
367367
</cxx-section>
368368

bower_components/cxx-html-doc-framework/base.css

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,16 @@ cxx-titlepage { page: title; page-break-after: always; }
3636

3737
@media print {
3838
html { font-size: 10pt; }
39-
* /deep/ pre, * /deep/ code { font-size: 8pt; }
39+
* /deep/ code { font-size: 80%; }
4040
/* Note that only Prince generates clickable links. */
4141
* /deep/ a[href] { text-decoration:none; }
4242
}
4343

44-
/* Needed to make the <cxx-titlepage>'s vertical spacing work. */
45-
html, body {height: 100%}
44+
@media screen {
45+
/* Needed to make the <cxx-titlepage>'s vertical spacing work.
46+
For print see the <cxx-titlepage> definition. */
47+
html, body {height: 100%}
48+
}
4649

4750
cxx-docnum { string-set: docnum content(); }
4851

@@ -90,19 +93,25 @@ pre {
9093
margin-top: .5em;
9194
margin-bottom: .5em;
9295
}
93-
pre > code { display: inline-block; }
94-
9596

96-
/* Use an em-dash for the list bullet. */
97-
ul {
98-
list-style: none;
99-
/* Relative positioning on the 'ul' lets the absolutely-positioned
100-
marker align relative to it.*/
101-
position: relative;
97+
/* Use an em-dash for the list bullet.
98+
'print' is a proxy for supporting ::marker. */
99+
@media screen {
100+
ul {
101+
list-style: none;
102+
/* Relative positioning on the 'ul' lets the absolutely-positioned
103+
marker align relative to it.*/
104+
position: relative;
105+
}
106+
ul li:before {
107+
content: "\2014";
108+
position: absolute; left: 10px;
109+
}
102110
}
103-
ul li:before {
104-
content: "\2014";
105-
position: absolute; left: 10px;
111+
@media print {
112+
ul li::marker {
113+
content: "\2014";
114+
}
106115
}
107116

108117
/* This is here rather than inside elements/toc.html because browsers

0 commit comments

Comments
 (0)