Merge branch 'ui' of git://github.com/klazuka/factor

basis/colors/constants/factor-colors.txt

@@ -1,6 +1,6 @@
 ! Factor UI theme colors
-243 242 234		FactorLightLightTan
-227 226 219		FactorLightTan
+243 242 234		FactorLightTan
+227 226 219		FactorTan
 172 167 147		FactorDarkTan
  81  91 105		FactorLightSlateBlue
  55  62  72		FactorDarkSlateBlue

basis/help/stylesheet/stylesheet.factor

@@ -1,6 +1,6 @@
 ! Copyright (C) 2005, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: colors colors.constants io.styles literals namespaces ;
+USING: colors colors.constants io.styles namespaces ;
 IN: help.stylesheet
 
 SYMBOL: default-span-style
@@ -34,7 +34,7 @@ H{
     { font-style bold }
     { wrap-margin 500 }
     { foreground COLOR: gray20 }
-    { page-color COLOR: FactorLightLightTan }
+    { page-color COLOR: FactorLightTan }
     { inset { 5 5 } }
 } title-style set-global
 
@@ -42,7 +42,7 @@ SYMBOL: help-path-style
 H{
     { font-size 10 }
     { table-gap { 5 5 } }
-    { table-border $ transparent }
+    { table-border COLOR: FactorLightTan }
 } help-path-style set-global
 
 SYMBOL: heading-style
@@ -75,7 +75,7 @@ H{
 
 SYMBOL: code-style
 H{
-    { page-color COLOR: FactorLightLightTan }
+    { page-color COLOR: FactorLightTan }
     { inset { 5 5 } }
     { wrap-margin f }
 } code-style set-global
@@ -113,7 +113,7 @@ H{
 SYMBOL: table-style
 H{
     { table-gap { 5 5 } }
-    { table-border COLOR: FactorLightTan }
+    { table-border COLOR: FactorTan }
 } table-style set-global
 
 SYMBOL: list-style

basis/help/vocabs/vocabs.factor

@@ -227,6 +227,14 @@ C: <vocab-author> vocab-author
         ] bi
     ] unless-empty ;
 
+: vocab-is-not-loaded ( vocab -- )
+    "Words" $heading
+    "You must first load (USE:) this vocab to browse its documentation/words."
+    print-element vocab-name "USE: " prepend 1array $code ;
+
+: describe-words ( vocab -- )
+    dup vocab [ words $words ] [ vocab-is-not-loaded ] if ;
+
 : words. ( vocab -- )
     last-element off
     [ require ] [ words $words ] bi nl ;
@@ -243,7 +251,7 @@ C: <vocab-author> vocab-author
     first {
         [ describe-help ]
         [ describe-metadata ]
-        [ words $words ]
+        [ describe-words ]
         [ describe-files ]
         [ describe-children ]
     } cleave ;