jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes #10857 invisible span had width (#10860)

Browse source
This commit is contained in:
Anthon van der Neut 2019-03-19 10:38:48 +01:00 • committed by Miran
commit 5c1c5902e2
4 changed files with 29 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
config/nimdoc.cfg
View file

@ -50,7 +50,7 @@ $seeSrc
# See doc.item for available substitution variables. # See doc.item for available substitution variables.
doc.item.toc = """ doc.item.toc = """
<li><a class="reference" href="#$itemSymOrIDEnc" <li><a class="reference" href="#$itemSymOrIDEnc"
title="$header_plain">$name<span class="attachedType" style="visibility:hidden">$attype</span></a></li> title="$header_plain">$name<span class="attachedType">$attype</span></a></li>
""" """
# HTML rendered for doc.item's seeSrc variable. Note that this will render to # HTML rendered for doc.item's seeSrc variable. Note that this will render to
@ -949,6 +949,10 @@ span.pragmawrap {
display: none; display: none;
} }
span.attachedType {
display: none;
visibility: hidden;
}
</style> </style>
<script type="text/javascript" src="dochack.js"></script> <script type="text/javascript" src="dochack.js"></script>

12
nimdoc/testproject/expected/subdir/subdir_b/utils.html
View file

@ -761,6 +761,10 @@ span.pragmawrap {
display: none; display: none;
} }
span.attachedType {
display: none;
visibility: hidden;
}
</style> </style>
<script type="text/javascript" src="dochack.js"></script> <script type="text/javascript" src="dochack.js"></script>
@ -812,7 +816,7 @@ function main() {
<ul class="simple simple-toc-section"> <ul class="simple simple-toc-section">
<li><a class="reference" href="#SomeType" <li><a class="reference" href="#SomeType"
title="SomeType = enum title="SomeType = enum
enumValueA, enumValueB, enumValueC"><wbr />Some<wbr />Type<span class="attachedType" style="visibility:hidden"></span></a></li> enumValueA, enumValueB, enumValueC"><wbr />Some<wbr />Type<span class="attachedType"></span></a></li>
</ul> </ul>
</li> </li>
@ -820,7 +824,7 @@ function main() {
<a class="reference reference-toplevel" href="#12" id="62">Procs</a> <a class="reference reference-toplevel" href="#12" id="62">Procs</a>
<ul class="simple simple-toc-section"> <ul class="simple simple-toc-section">
<li><a class="reference" href="#someType_2" <li><a class="reference" href="#someType_2"
title="someType(): SomeType"><wbr />some<wbr />Type<span class="attachedType" style="visibility:hidden">SomeType</span></a></li> title="someType(): SomeType"><wbr />some<wbr />Type<span class="attachedType">SomeType</span></a></li>
</ul> </ul>
</li> </li>
@ -828,9 +832,9 @@ function main() {
<a class="reference reference-toplevel" href="#18" id="68">Templates</a> <a class="reference reference-toplevel" href="#18" id="68">Templates</a>
<ul class="simple simple-toc-section"> <ul class="simple simple-toc-section">
<li><a class="reference" href="#aEnum.t" <li><a class="reference" href="#aEnum.t"
title="aEnum(): untyped"><wbr />a<wbr />Enum<span class="attachedType" style="visibility:hidden"></span></a></li> title="aEnum(): untyped"><wbr />a<wbr />Enum<span class="attachedType"></span></a></li>
<li><a class="reference" href="#bEnum.t" <li><a class="reference" href="#bEnum.t"
title="bEnum(): untyped"><wbr />b<wbr />Enum<span class="attachedType" style="visibility:hidden"></span></a></li> title="bEnum(): untyped"><wbr />b<wbr />Enum<span class="attachedType"></span></a></li>
</ul> </ul>
</li> </li>

20
nimdoc/testproject/expected/testproject.html
View file

@ -761,6 +761,10 @@ span.pragmawrap {
display: none; display: none;
} }
span.attachedType {
display: none;
visibility: hidden;
}
</style> </style>
<script type="text/javascript" src="dochack.js"></script> <script type="text/javascript" src="dochack.js"></script>
@ -813,10 +817,10 @@ function main() {
<ul class="simple simple-toc-section"> <ul class="simple simple-toc-section">
<li><a class="reference" href="#A" <li><a class="reference" href="#A"
title="A {.inject.} = enum title="A {.inject.} = enum
aA"><wbr />A<span class="attachedType" style="visibility:hidden"></span></a></li> aA"><wbr />A<span class="attachedType"></span></a></li>
<li><a class="reference" href="#B" <li><a class="reference" href="#B"
title="B {.inject.} = enum title="B {.inject.} = enum
bB"><wbr />B<span class="attachedType" style="visibility:hidden"></span></a></li> bB"><wbr />B<span class="attachedType"></span></a></li>
</ul> </ul>
</li> </li>
@ -824,7 +828,7 @@ function main() {
<a class="reference reference-toplevel" href="#8" id="58">Vars</a> <a class="reference reference-toplevel" href="#8" id="58">Vars</a>
<ul class="simple simple-toc-section"> <ul class="simple simple-toc-section">
<li><a class="reference" href="#aVariable" <li><a class="reference" href="#aVariable"
title="aVariable: array[1, int]"><wbr />a<wbr />Variable<span class="attachedType" style="visibility:hidden"></span></a></li> title="aVariable: array[1, int]"><wbr />a<wbr />Variable<span class="attachedType"></span></a></li>
</ul> </ul>
</li> </li>
@ -832,9 +836,9 @@ function main() {
<a class="reference reference-toplevel" href="#12" id="62">Procs</a> <a class="reference reference-toplevel" href="#12" id="62">Procs</a>
<ul class="simple simple-toc-section"> <ul class="simple simple-toc-section">
<li><a class="reference" href="#bar%2CT%2CT" <li><a class="reference" href="#bar%2CT%2CT"
title="bar[T](a, b: T): T"><wbr />bar<span class="attachedType" style="visibility:hidden"></span></a></li> title="bar[T](a, b: T): T"><wbr />bar<span class="attachedType"></span></a></li>
<li><a class="reference" href="#isValid%2CT" <li><a class="reference" href="#isValid%2CT"
title="isValid[T](x: T): bool"><wbr />is<wbr />Valid<span class="attachedType" style="visibility:hidden"></span></a></li> title="isValid[T](x: T): bool"><wbr />is<wbr />Valid<span class="attachedType"></span></a></li>
</ul> </ul>
</li> </li>
@ -842,7 +846,7 @@ function main() {
<a class="reference reference-toplevel" href="#13" id="63">Funcs</a> <a class="reference reference-toplevel" href="#13" id="63">Funcs</a>
<ul class="simple simple-toc-section"> <ul class="simple simple-toc-section">
<li><a class="reference" href="#someFunc" <li><a class="reference" href="#someFunc"
title="someFunc()"><wbr />some<wbr />Func<span class="attachedType" style="visibility:hidden"></span></a></li> title="someFunc()"><wbr />some<wbr />Func<span class="attachedType"></span></a></li>
</ul> </ul>
</li> </li>
@ -850,7 +854,7 @@ function main() {
<a class="reference reference-toplevel" href="#17" id="67">Macros</a> <a class="reference reference-toplevel" href="#17" id="67">Macros</a>
<ul class="simple simple-toc-section"> <ul class="simple simple-toc-section">
<li><a class="reference" href="#bar.m" <li><a class="reference" href="#bar.m"
title="bar(): untyped"><wbr />bar<span class="attachedType" style="visibility:hidden"></span></a></li> title="bar(): untyped"><wbr />bar<span class="attachedType"></span></a></li>
</ul> </ul>
</li> </li>
@ -858,7 +862,7 @@ function main() {
<a class="reference reference-toplevel" href="#18" id="68">Templates</a> <a class="reference reference-toplevel" href="#18" id="68">Templates</a>
<ul class="simple simple-toc-section"> <ul class="simple simple-toc-section">
<li><a class="reference" href="#foo.t%2CSomeType%2CSomeType" <li><a class="reference" href="#foo.t%2CSomeType%2CSomeType"
title="foo(a, b: SomeType)"><wbr />foo<span class="attachedType" style="visibility:hidden"></span></a></li> title="foo(a, b: SomeType)"><wbr />foo<span class="attachedType"></span></a></li>
</ul> </ul>
</li> </li>

4
nimdoc/testproject/expected/theindex.html
View file

@ -761,6 +761,10 @@ span.pragmawrap {
display: none; display: none;
} }
span.attachedType {
display: none;
visibility: hidden;
}
</style> </style>
<script type="text/javascript" src="dochack.js"></script> <script type="text/javascript" src="dochack.js"></script>