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

help.stylesheet: add back page-color and override in ui.tools.browser.

db4
John Benediktsson 2015-08-16 12:54:56 -07:00
parent c957ab876c
commit 7dd0acbf0f
3 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
basis/help/html/html.factor
View File

@ -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 ;

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

@ -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

29
basis/ui/tools/browser/browser.factor
View File

@ -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