mirrors/caddy-website
1
0
Fork 0
mirror of https://github.com/caddyserver/website.git synced 2025-04-23 21:46:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

docs: Better support for module name collisions

Browse source 
In /docs/modules/, show both modules if module IDs are not globally unique.
Show both modules' docs on same page in expandable containers.

In /docs/json/, both modules appear in lists in the doc, but disambiguating them isn't implemented yet.
This commit is contained in:
Matthew Holt 2021-06-02 15:16:15 -06:00
parent 5c3a67692e
commit e132c5c454
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
13 changed files with 265 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/resources/css/docs-json.css
View file

@ -6,7 +6,7 @@ article h1 {
padding-top: 8%;
}
#renderbox {
.renderbox {
border-radius: 0;
font-size: 20px;
line-height: 1.6em;

49
src/resources/css/docs.css
View file

@ -224,6 +224,10 @@ main nav li li a {
max-width: 1100px;
}
.pad {
padding-top: 8%;
}
article {
padding-top: 8%;
padding-bottom: 8%;
@ -238,7 +242,8 @@ width, a few elements should be allowed to
extend to the borders of the page
*/
article > :not(.fullwidth),
article > .fullwidth > * {
article > .fullwidth > *,
.pad {
padding-left: 8%;
padding-right: 8%;
}
@ -448,13 +453,13 @@ iframe {
padding: 10px;
color: #886c00;
line-height: 1.4em;
display: none;
}
.nonstandard {
color: rgb(214, 145, 16);
}
.standard-flag,
.nonstandard-flag {
cursor: help;
font-size: 8px;
@ -462,10 +467,25 @@ iframe {
padding: 4px 8px;
text-transform: uppercase;
font-weight: bold;
background-color: rgb(238, 167, 34);
color: white;
border-radius: 4px;
white-space: nowrap;
vertical-align: middle;
}
.standard-flag {
background-color: rgb(34, 163, 23);
}
.nonstandard-flag {
background-color: rgb(238, 167, 34);
}
.module-repo-differentiator {
font-size: 11px;
font-weight: bold;
color: #555;
line-height: 1em;
}
@ -706,7 +726,8 @@ td code {
#module-docs-container,
#module-list-container {
#module-list-container,
#module-template {
display: none;
}
@ -729,7 +750,27 @@ td code {
}
#module-multiple-repos {
display: none;
margin: 25px;
}
.module-repo-selector {
font-size: 26px;
padding: 25px;
font-weight: bold;
border-bottom: 1px solid #888;
cursor: pointer;
}
.module-repo-selector:hover {
color: #009cda;
background: rgb(246, 250, 252);
}
.module-repo-selector-arrow {
margin: 10px;
}