diff --git a/nimdoc/test_out_index_dot_html/expected/index.html b/nimdoc/test_out_index_dot_html/expected/index.html index ab63535685..4646732f1f 100644 --- a/nimdoc/test_out_index_dot_html/expected/index.html +++ b/nimdoc/test_out_index_dot_html/expected/index.html @@ -56,10 +56,12 @@ function main() { } } } + +window.addEventListener('DOMContentLoaded', main); - +

foo

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

Index

diff --git a/nimdoc/testproject/expected/nimdoc.out.css b/nimdoc/testproject/expected/nimdoc.out.css index 2d9533cebb..7d4a399e11 100644 --- a/nimdoc/testproject/expected/nimdoc.out.css +++ b/nimdoc/testproject/expected/nimdoc.out.css @@ -14,6 +14,9 @@ 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; @@ -39,6 +42,9 @@ 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; @@ -609,6 +615,34 @@ 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 b47475dcf9..53088dfda6 100644 --- a/nimdoc/testproject/expected/subdir/subdir_b/utils.html +++ b/nimdoc/testproject/expected/subdir/subdir_b/utils.html @@ -56,10 +56,12 @@ function main() { } } } + +window.addEventListener('DOMContentLoaded', main); - +

subdir/subdir_b/utils

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

testproject

@@ -146,165 +148,159 @@ function main() {
      z10
    • z10
      • + title="z10()">z10()
      tripleStrLitTest
    • tripleStrLitTest
      • + title="tripleStrLitTest()">tripleStrLitTest()
      z17
    • z17
      • + title="z17()">z17()
      asyncFun3
    • asyncFun3
      • + title="asyncFun3(): owned(Future[void])">asyncFun3(): owned(Future[void])
      z2
    • z2
      • + title="z2()">z2()
      bar
    • bar,T,T
      • + title="bar[T](a, b: T): T">bar[T](a, b: T): T
      fromUtils3
    • fromUtils3
      • + title="fromUtils3()">fromUtils3()
      isValid
    • isValid,T
      • + title="isValid[T](x: T): bool">isValid[T](x: T): bool
      z6
    • z6
      • + title="z6(): int">z6(): int
      anything
    • anything
      • + title="anything()">anything()
      low
    • low,T
      • + title="low[T: Ordinal | enum | range](x: T): T">low[T: Ordinal | enum | range](x: T): T
      p1
    • p1
      • + title="p1()">p1()
      z11
    • z11
      • + title="z11()">z11()
      buzz
    • buzz,T,T
      • + title="buzz[T](a, b: T): T">buzz[T](a, b: T): T
      low2
    • low2,T
      • + title="low2[T: Ordinal | enum | range](x: T): T">low2[T: Ordinal | enum | range](x: T): T
      z7
    • z7
      • + title="z7(): int">z7(): int
      z13
    • z13
      • + title="z13()">z13()
      baz
    • baz,T,T
      • + title="baz[T](a, b: T): T">baz[T](a, b: T): T
    • baz
      • + title="baz()">baz()
      addfBug14485
    • addfBug14485
      • + title="addfBug14485()">addfBug14485()
      c_printf
    • c_printf,cstring
      • + title="c_printf(frmt: cstring): cint">c_printf(frmt: cstring): cint
      z12
    • z12
      • + title="z12(): int">z12(): int
      z3
    • z3
      • + title="z3()">z3()
      z9
    • z9
      • + title="z9()">z9()
      z4
    • z4
      • + title="z4()">z4() + +
    +
      z8
    • z8
      • + title="z8(): int">z8(): int
      z1
    • z1
      • + title="z1(): Foo">z1(): Foo
      z5
    • z5
      • + title="z5(): int">z5(): int
      asyncFun2
    • asyncFun2
      • + title="asyncFun2(): owned(Future[void])">asyncFun2(): owned(Future[void])
      c_nonexistant
    • c_nonexistant,cstring
      • + title="c_nonexistant(frmt: cstring): cint">c_nonexistant(frmt: cstring): cint
    - -
- -
  • - Funcs -
      -
        someFunc -
      • someFunc
        • + title="asyncFun1(): Future[int]">asyncFun1(): Future[int]
      @@ -370,6 +366,7 @@ function main() {
    • +
    @@ -511,6 +508,13 @@ 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: [].}
    @@ -800,20 +804,7 @@ ok1 
    proc anything() {...}{.raises: [], tags: [].}
    -

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

    - - -
    - -
    -
    -

    Funcs

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

    Index