diff --git a/basis/help/html/html.factor b/basis/help/html/html.factor index d04a241ff3..73fe06d16f 100644 --- a/basis/help/html/html.factor +++ b/basis/help/html/html.factor @@ -1,11 +1,10 @@ ! Copyright (C) 2008, 2011 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors arrays assocs colors.constants debugger fry -help help.crossref help.home help.markup help.stylesheet -help.topics help.vocabs html html.streams io io.directories +USING: accessors arrays assocs debugger fry help help.home +help.topics help.vocabs html html.streams io.directories io.encodings.binary io.encodings.utf8 io.files io.files.temp -io.pathnames io.styles kernel make math.parser memoize -namespaces sequences serialize splitting tools.completion vocabs +io.pathnames kernel make math.parser memoize namespaces +sequences serialize splitting tools.completion vocabs vocabs.hierarchy words xml.syntax xml.writer ; FROM: io.encodings.ascii => ascii ; FROM: ascii => ascii? ; @@ -90,12 +89,7 @@ M: pathname url-of [ drop help-stylesheet ] [ [ help-navbar ] - [ - [ - title-style get - { { page-color COLOR: FactorLightTan } } assoc-union - title-style [ print-topic ] with-variable - ] with-html-writer ] + [ [ print-topic ] with-html-writer ] bi* append ] tri simple-page ; diff --git a/basis/help/stylesheet/stylesheet.factor b/basis/help/stylesheet/stylesheet.factor index 8b29c74ad6..5992266cc4 100644 --- a/basis/help/stylesheet/stylesheet.factor +++ b/basis/help/stylesheet/stylesheet.factor @@ -35,6 +35,7 @@ H{ { font-style bold } { wrap-margin 500 } { foreground COLOR: gray20 } + { page-color COLOR: FactorLightTan } { inset { 5 5 } } } title-style set-global diff --git a/basis/ui/tools/browser/browser.factor b/basis/ui/tools/browser/browser.factor index 3b524bcdc1..13cdd8e61f 100644 --- a/basis/ui/tools/browser/browser.factor +++ b/basis/ui/tools/browser/browser.factor @@ -1,16 +1,16 @@ ! Copyright (C) 2006, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors arrays classes combinators -combinators.short-circuit compiler.units debugger fry help -help.apropos help.crossref help.home help.markup help.stylesheet -help.topics io.styles kernel locals make models namespaces -sequences sets ui ui.commands ui.gadgets ui.gadgets.borders -ui.gadgets.editors ui.gadgets.glass ui.gadgets.labels -ui.gadgets.panes ui.gadgets.scrollers ui.gadgets.status-bar -ui.gadgets.theme ui.gadgets.toolbar ui.gadgets.tracks -ui.gadgets.viewports ui.gadgets.worlds ui.gestures ui.pens.solid -ui.tools.browser.history ui.tools.browser.popups ui.tools.common -vocabs ; +USING: accessors arrays assocs classes combinators +combinators.short-circuit compiler.units debugger fry hashtables +help help.apropos help.crossref help.home help.markup +help.stylesheet help.topics io.styles kernel locals make models +namespaces sequences sets ui ui.commands ui.gadgets +ui.gadgets.borders ui.gadgets.editors ui.gadgets.glass +ui.gadgets.labels ui.gadgets.panes ui.gadgets.scrollers +ui.gadgets.status-bar ui.gadgets.theme ui.gadgets.toolbar +ui.gadgets.tracks ui.gadgets.viewports ui.gadgets.worlds +ui.gestures ui.pens.solid ui.tools.browser.history +ui.tools.browser.popups ui.tools.common vocabs ; IN: ui.tools.browser TUPLE: browser-gadget < tool history scroller search-field popup ; @@ -58,8 +58,11 @@ CONSTANT: next 1 ] with-style ; : $title ( topic -- ) - title-style get [ - title-style get [ + title-style get + help-header-background page-color associate + assoc-union dup + [ + [ [ ($title) ] [ ($navigation-path) ] bi ] with-nesting