Skip to content

Commit

Permalink
Nest icons in own div; always show src link
Browse files Browse the repository at this point in the history
  • Loading branch information
brianrourkeboll committed Jun 3, 2024
1 parent 56b856b commit ddeea69
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 17 deletions.
43 changes: 34 additions & 9 deletions docs/content/fsdocs-default.css
Original file line number Diff line number Diff line change
Expand Up @@ -1046,15 +1046,10 @@ span[onmouseout] {
.fsdocs-entity-xmldoc {
> div {
display: flex;
flex-direction: row-reverse;
justify-content: flex-start;
flex-direction: row;
justify-content: space-between;
align-items: flex-start;

& p.fsdocs-summary {
margin: 0;
flex-grow: 1;
}

& pre {
margin-bottom: var(--spacing-200);
padding: var(--spacing-50);
Expand All @@ -1064,18 +1059,41 @@ span[onmouseout] {
}
}

.fsdocs-summary-contents {
display: flex;
flex-direction: column;
justify-content: flex-start;
align-items: flex-start;
}

.fsdocs-member-xmldoc-column {
width: 100%;
display: flex;
flex-direction: column;
justify-content: flex-start;
}

.icon-button-row {
display: flex;
flex-direction: row;
justify-content: flex-end;
align-items: flex-start;
height: calc(-1 * var(--spacing-200));
}

.fsdocs-member-xmldoc {
& summary {
display: list-item;
counter-increment: list-item 0;
list-style: disclosure-closed outside;
cursor: pointer;
width: calc(100% - var(--spacing-300));
margin-left: var(--spacing-300);

> .fsdocs-summary {
display: flex;
flex-direction: row-reverse;
justify-content: flex-start;
flex-direction: row;
justify-content: space-between;
align-items: flex-start;

& p.fsdocs-summary {
Expand Down Expand Up @@ -1112,6 +1130,13 @@ span[onmouseout] {
.fsdocs-return-name, .fsdocs-param-name {
font-weight: 500;
}

> div.fsdocs-summary {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: flex-start;
}
}
}

Expand Down
23 changes: 15 additions & 8 deletions src/FSharp.Formatting.ApiDocs/GenerateHtml.fs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ let fsdocsSummary (x: ApiDocHtml) =
if x.HtmlText.StartsWith("<pre>", StringComparison.Ordinal) then
embed x
else
p [ Class "fsdocs-summary" ] [ embed x ]
div [ Class "fsdocs-summary-contents" ] [ p [ Class "fsdocs-summary" ] [ embed x ] ]

type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
let root = model.Root
Expand Down Expand Up @@ -182,10 +182,12 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =

let smry =
div [ Class "fsdocs-summary" ] [
yield! copyXmlSigIconForSymbolMarkdown m.Symbol
yield! copyXmlSigIconForSymbol m.Symbol
yield! sourceLink m.SourceLocation
fsdocsSummary m.Comment.Summary
div [ Class "icon-button-row" ] [
yield! sourceLink m.SourceLocation
yield! copyXmlSigIconForSymbol m.Symbol
yield! copyXmlSigIconForSymbolMarkdown m.Symbol
]
]

let dtls =
Expand Down Expand Up @@ -272,7 +274,10 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
if List.isEmpty dtls then
smry
elif String.IsNullOrWhiteSpace(m.Comment.Summary.HtmlText) then
yield! dtls
div [ Class "fsdocs-member-xmldoc-column" ] [
div [ Class "icon-button-row" ] (sourceLink m.SourceLocation)
yield! dtls
]
else
details [] ((summary [] [ smry ]) :: dtls)
]
Expand Down Expand Up @@ -325,10 +330,12 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
]
td [ Class "fsdocs-entity-xmldoc" ] [
div [] [
yield! copyXmlSigIconForSymbolMarkdown e.Symbol
yield! copyXmlSigIconForSymbol e.Symbol
yield! sourceLink e.SourceLocation
fsdocsSummary e.Comment.Summary
div [ Class "icon-button-row" ] [
yield! sourceLink e.SourceLocation
yield! copyXmlSigIconForSymbol e.Symbol
yield! copyXmlSigIconForSymbolMarkdown e.Symbol
]
]
]
]
Expand Down

0 comments on commit ddeea69

Please sign in to comment.