Skip to content

Commit 1a7d579

Browse files
committed
improve "language family" placement
1 parent a053f34 commit 1a7d579

File tree

2 files changed

+29
-25
lines changed

2 files changed

+29
-25
lines changed

scribble-lib/scribble/html-render.rkt

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -929,6 +929,7 @@
929929
(div ([class "main"])
930930
,@(parameterize ([current-version (extract-version d)])
931931
(render-version d ri))
932+
,@(render-language-family d ri)
932933
,@(navigation d ri #t)
933934
,@(render-part d ri)
934935
,@(navigation d ri #f)))
@@ -1122,21 +1123,9 @@
11221123
(define navbar
11231124
`(div ([class ,(if top? "navsettop" "navsetbottom")])
11241125
,navleft ,navright nbsp)) ; need nbsp to make the navset bg visible
1125-
(append
1126-
(if (include-navigation?)
1127-
(list navbar)
1128-
null)
1129-
(if (and top? show-fam?)
1130-
(let ([fam (or fam '("Racket"))])
1131-
(list `(div ([class "navfamily"]
1132-
[data-fam ,(string-join fam ",")]
1133-
[data-fam-path ,(if search-up-path "../" "")]
1134-
[data-version ,(get-installation-name)])
1135-
,@(if (null? fam)
1136-
null
1137-
`((span ([class "docfamily"])
1138-
,(car fam)))))))
1139-
null)))
1126+
(if (include-navigation?)
1127+
(list navbar)
1128+
null))
11401129

11411130
(define/override (render-one d ri fn)
11421131
(render-one-part d ri fn null))
@@ -1156,6 +1145,23 @@
11561145
d
11571146
ri))))))
11581147

1148+
(define/private (render-language-family d ri)
1149+
(define show-fam? (extract-show-language-family d ri))
1150+
(define fam (and show-fam?
1151+
(or (search-extras (hash-ref (extend-part-context d) 'index-extras #hasheq()) 'language-family)
1152+
'("Racket"))))
1153+
(if show-fam?
1154+
(let ([fam (or fam '("Racket"))])
1155+
(list `(div ([class "navfamily"]
1156+
[data-fam ,(string-join fam ",")]
1157+
[data-fam-path ,(if search-up-path "../" "")]
1158+
[data-version ,(get-installation-name)])
1159+
,@(if (null? fam)
1160+
null
1161+
`((span ([class "docfamily"])
1162+
,(car fam)))))))
1163+
null))
1164+
11591165
(define/public (extract-render-convertible-as d)
11601166
(for/or ([v (in-list (style-properties (part-style d)))])
11611167
(and (render-convertible-as? v)

scribble-lib/scribble/manual-style.css

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -315,18 +315,13 @@ a:hover {
315315
/* Language Family */
316316

317317
.navfamily {
318-
position: absolute;
319-
float: none;
320-
top: 0.25rem;
321-
left: auto;
322-
right: 0rem;
323-
margin: 0em;
324-
margin-right: 1rem;
325-
height: auto;
326-
width: auto;
318+
float: right;
319+
margin: -4.25em 0em 0em 0em;
327320
font-size: 70%;
328321
font-weight: lighter;
329-
}
322+
height: auto;
323+
width: auto;
324+
}
330325

331326
/* ---------------------------------------- */
332327
/* Margin notes */
@@ -784,6 +779,9 @@ blockquote > blockquote.SVInsetFlow {
784779
font-weight: lighter;
785780
}
786781

782+
.navfamily {
783+
margin: -3.25em 0em 0em 0em;
784+
}
787785

788786
.maincolumn {
789787
margin-left: 1em;

0 commit comments

Comments
 (0)