steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

help.markup: change default-style to use with-nesting.

master
John Benediktsson 2020-02-14 22:18:38 -08:00
parent 1da20adc63
commit 75db2b0d4a
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
basis/help/markup/markup.factor
View File

@ -49,9 +49,7 @@ M: f print-element drop ;
[ print-element ] with-style ; [ print-element ] with-style ;
: with-default-style ( quot -- ) : with-default-style ( quot -- )
default-span-style get [ default-style get swap with-nesting ; inline
default-block-style get swap with-nesting
] with-style ; inline
: print-content ( element -- ) : print-content ( element -- )
[ print-element ] with-default-style ; [ print-element ] with-default-style ;

10
basis/help/stylesheet/stylesheet.factor
View File

@ -22,18 +22,14 @@ IN: help.stylesheet
: font-size-span ( -- n ) : font-size-span ( -- n )
13/12 default-font-size * >integer ; 13/12 default-font-size * >integer ;
SYMBOL: default-span-style SYMBOL: default-style
H{ H{
{ font-name $ default-sans-serif-font-name } { font-name $ default-sans-serif-font-name }
{ font-size $ font-size-span } { font-size $ font-size-span }
{ foreground $ text-color } { foreground $ text-color }
{ font-style plain } { font-style plain }
} default-span-style set-global
SYMBOL: default-block-style
H{
{ wrap-margin $ wrap-margin-full } { wrap-margin $ wrap-margin-full }
} default-block-style set-global } default-style set-global
SYMBOL: link-style SYMBOL: link-style
H{ H{
@ -148,7 +144,7 @@ SYMBOL: bullet
[ [
font-size font-size
{ {
default-span-style title-style default-style title-style
help-path-style heading-style help-path-style heading-style
subsection-style snippet-style subsection-style snippet-style
code-char-style code-char-style

2
basis/ui/theme/switching/switching.factor
View File

@ -16,7 +16,7 @@ IN: ui.theme.switching
content-background default-font-background-color set-global content-background default-font-background-color set-global
! help.stylesheet ! help.stylesheet
default-span-style text-color foreground update-style default-style text-color foreground update-style
link-style link-color foreground update-style link-style link-color foreground update-style
title-style title-color foreground update-style title-style title-color foreground update-style
help-path-style help-path-border-color table-border update-style help-path-style help-path-border-color table-border update-style