From 99ec00a4bd7c448763b2073a7c6f1332bbab924b Mon Sep 17 00:00:00 2001 From: zetashift Date: Mon, 1 Feb 2021 02:12:21 +0100 Subject: [PATCH] Fixup nimdoc for the CSS filter change --- .../expected/index.html | 7 +- .../expected/theindex.html | 4 +- nimdoc/testproject/expected/nimdoc.out.css | 34 ------ .../expected/subdir/subdir_b/utils.html | 7 +- nimdoc/testproject/expected/testproject.html | 105 ++++++++++-------- nimdoc/testproject/expected/theindex.html | 4 +- 6 files changed, 63 insertions(+), 98 deletions(-) diff --git a/nimdoc/test_out_index_dot_html/expected/index.html b/nimdoc/test_out_index_dot_html/expected/index.html index 4646732f1f..ab63535685 100644 --- a/nimdoc/test_out_index_dot_html/expected/index.html +++ b/nimdoc/test_out_index_dot_html/expected/index.html @@ -56,12 +56,10 @@ function main() { } } } - -window.addEventListener('DOMContentLoaded', main); - +

foo

@@ -98,7 +96,7 @@ window.addEventListener('DOMContentLoaded', main);
      foo
    • foo()
      • + title="foo()">foo
    @@ -108,7 +106,6 @@ window.addEventListener('DOMContentLoaded', main);
-
diff --git a/nimdoc/test_out_index_dot_html/expected/theindex.html b/nimdoc/test_out_index_dot_html/expected/theindex.html index aa9ca26458..b2863f99a1 100644 --- a/nimdoc/test_out_index_dot_html/expected/theindex.html +++ b/nimdoc/test_out_index_dot_html/expected/theindex.html @@ -56,12 +56,10 @@ function main() { } } } - -window.addEventListener('DOMContentLoaded', main); - +

Index

diff --git a/nimdoc/testproject/expected/nimdoc.out.css b/nimdoc/testproject/expected/nimdoc.out.css index 7d4a399e11..2d9533cebb 100644 --- a/nimdoc/testproject/expected/nimdoc.out.css +++ b/nimdoc/testproject/expected/nimdoc.out.css @@ -14,9 +14,6 @@ Modified by Boyd Greenfield and narimiran --primary-background: #fff; --secondary-background: ghostwhite; --third-background: #e8e8e8; - --info-background: #50c050; - --warning-background: #c0a000; - --error-background: #e04040; --border: #dde; --text: #222; --anchor: #07b; @@ -42,9 +39,6 @@ Modified by Boyd Greenfield and narimiran --primary-background: #171921; --secondary-background: #1e202a; --third-background: #2b2e3b; - --info-background: #008000; - --warning-background: #807000; - --error-background: #c03000; --border: #0e1014; --text: #fff; --anchor: #8be9fd; @@ -615,34 +609,6 @@ table.borderless td, table.borderless th { The right padding separates the table cells. */ padding: 0 0.5em 0 0 !important; } -.admonition { - padding: 0.3em; - background-color: var(--secondary-background); - border-left: 0.4em solid #7f7f84; - margin-bottom: 0.5em; - -webkit-box-shadow: 0 5px 8px -6px rgba(0,0,0,.2); - -moz-box-shadow: 0 5px 8px -6px rgba(0,0,0,.2); - box-shadow: 0 5px 8px -6px rgba(0,0,0,.2); -} -.admonition-info { - border-color: var(--info-background); -} -.admonition-info-text { - color: var(--info-background); -} -.admonition-warning { - border-color: var(--warning-background); -} -.admonition-warning-text { - color: var(--warning-background); -} -.admonition-error { - border-color: var(--error-background); -} -.admonition-error-text { - color: var(--error-background); -} - .first { /* Override more specific margin styles with "! important". */ margin-top: 0 !important; } diff --git a/nimdoc/testproject/expected/subdir/subdir_b/utils.html b/nimdoc/testproject/expected/subdir/subdir_b/utils.html index 53088dfda6..b47475dcf9 100644 --- a/nimdoc/testproject/expected/subdir/subdir_b/utils.html +++ b/nimdoc/testproject/expected/subdir/subdir_b/utils.html @@ -56,12 +56,10 @@ function main() { } } } - -window.addEventListener('DOMContentLoaded', main); - +

subdir/subdir_b/utils

@@ -112,7 +110,7 @@ window.addEventListener('DOMContentLoaded', main);
    @@ -134,7 +132,6 @@ window.addEventListener('DOMContentLoaded', main);
-
diff --git a/nimdoc/testproject/expected/testproject.html b/nimdoc/testproject/expected/testproject.html index dbdcca79ee..6b14bdc971 100644 --- a/nimdoc/testproject/expected/testproject.html +++ b/nimdoc/testproject/expected/testproject.html @@ -56,12 +56,10 @@ function main() { } } } - -window.addEventListener('DOMContentLoaded', main); - +

testproject

@@ -148,159 +146,165 @@ window.addEventListener('DOMContentLoaded', main); + +
  • + Funcs +
      + @@ -366,7 +370,6 @@ window.addEventListener('DOMContentLoaded', main);
    • -
    @@ -508,13 +511,6 @@ This is deprecated without message. This is deprecated with a message. - - -
    func someFunc() {...}{.raises: [], tags: [].}
    -
    - -My someFunc. Stuff in quotes here. Some link - 
    proc fromUtils3() {...}{.raises: [], tags: [].}
    @@ -804,7 +800,20 @@ ok1 
    proc anything() {...}{.raises: [], tags: [].}
    -There is no block quote after blank lines at the beginning. +

    There is no block quote after blank lines at the beginning.

    + + +
    + +
    +
    +

    Funcs

    +
    + +
    func someFunc() {...}{.raises: [], tags: [].}
    +
    + +My someFunc. Stuff in quotes here. Some link
    diff --git a/nimdoc/testproject/expected/theindex.html b/nimdoc/testproject/expected/theindex.html index 81370d115c..ff4de29fe0 100644 --- a/nimdoc/testproject/expected/theindex.html +++ b/nimdoc/testproject/expected/theindex.html @@ -56,12 +56,10 @@ function main() { } } } - -window.addEventListener('DOMContentLoaded', main); - +

    Index