ui.theme: remove vocab-background-color and vocab-border-color

use code-background-color and code-border-color

diff --git a/basis/ui/theme/base16/base16.factor b/basis/ui/theme/base16/base16.factor
index ab3d424e2fa960f92e1451b3a219129d8420f769..3bf6b1a97bb3c14562775707a491ee11aa734f0c 100644 (file)
--- a/basis/ui/theme/base16/base16.factor
+++ b/basis/ui/theme/base16/base16.factor
@@ -89,9 +89,6 @@ M: base16-theme highlighted-word-color "base04" named-base16 ;
 M: base16-theme string-color "base0A" named-base16 ;
 M: base16-theme stack-effect-color "base04" named-base16 ;
 
-M: base16-theme vocab-background-color "base00" named-base16 ;
-M: base16-theme vocab-border-color "base00" named-base16 ;
-
 M: base16-theme field-border-color "base00" named-base16 ;
 
 M: base16-theme editor-caret-color "base06" named-base16 ;

diff --git a/basis/ui/theme/switching/tools/tools.factor b/basis/ui/theme/switching/tools/tools.factor
index f10a07fd11a4ea4d37cdb3463224b87ce3db1fcf..7f59f1c27f5eb78120dce94a38e0cffa63fa4514 100644 (file)
--- a/basis/ui/theme/switching/tools/tools.factor
+++ b/basis/ui/theme/switching/tools/tools.factor
@@ -42,8 +42,8 @@ IN: ui.theme.switching.tools
     base-effect-style stack-effect-color foreground update-style
 
     ! vocabs.prettyprint
-    manifest-style vocab-background-color page-color update-style
-    manifest-style vocab-border-color border-color update-style
+    manifest-style code-background-color page-color update-style
+    manifest-style code-border-color border-color update-style
 
     ! ui.gadgets.panes
     \ specified-font reset-memoized

diff --git a/basis/ui/theme/theme.factor b/basis/ui/theme/theme.factor
index 54d501e8680e6187de7b670085ffd3ee4af8e9e0..771db147db7f2fa8d1fa415bb2d81d6255086056 100644 (file)
--- a/basis/ui/theme/theme.factor
+++ b/basis/ui/theme/theme.factor
@@ -170,9 +170,6 @@ M: light-theme highlighted-word-color COLOR: DarkSlateGray ;
 M: light-theme string-color COLOR: LightSalmon4 ;
 M: light-theme stack-effect-color COLOR: FactorDarkSlateBlue ;
 
-M: light-theme vocab-background-color COLOR: FactorLightTan ;
-M: light-theme vocab-border-color COLOR: FactorDarkTan ;
-
 M: light-theme field-border-color COLOR: gray ;
 
 M: light-theme editor-caret-color COLOR: red ;
@@ -260,9 +257,6 @@ M: dark-theme highlighted-word-color COLOR: solarized-green ;
 M: dark-theme string-color COLOR: solarized-magenta ;
 M: dark-theme stack-effect-color COLOR: solarized-orange ;
 
-M: dark-theme vocab-background-color COLOR: solarized-base01 ;
-M: dark-theme vocab-border-color COLOR: solarized-base01 ;
-
 M: dark-theme field-border-color COLOR: solarized-base01 ;
 
 M: dark-theme editor-caret-color COLOR: DeepPink2 ;

diff --git a/basis/vocabs/prettyprint/prettyprint.factor b/basis/vocabs/prettyprint/prettyprint.factor
index 986e07ae57b0e6cd9733b7563e4d60bf5447d041..cfc1b01cfe6a9ba34354b918e64e832b3ca25744 100644 (file)
--- a/basis/vocabs/prettyprint/prettyprint.factor
+++ b/basis/vocabs/prettyprint/prettyprint.factor
@@ -84,7 +84,7 @@ PRIVATE>
 
 CONSTANT: manifest-style H{
     { page-color COLOR: FactorLightTan }
-    { border-color COLOR: FactorDarkTan }
+    { border-color COLOR: FactorTan }
     { inset { 5 5 } }
 }