css: always use defaultColor as the initial color

This way, we do not end up with ugly contrast-corrected white on
terminals with arbitrary backgrounds by default. (Now we get the native
-cha-ansi(default) instead).

(We leave background-color as transparent; this should have the same
effect, since defaultColor as bgcolor is ignored, but makes more sense
(and will allow us to un-ignore defaultColor as bgcolor in the future.))

1 files changed, 4 insertions, 7 deletions

diff --git a/src/css/values.nim b/src/css/values.nim
index a7296b8e..c53825ee 100644
--- a/src/css/values.nim
+++ b/src/css/values.nim
@@ -1254,13 +1254,9 @@ proc getValueFromDecl(val: CSSComputedValue, d: CSSDeclaration,
   return ok()
 
 func getInitialColor(t: CSSPropertyType): CellColor =
-  case t
-  of PROPERTY_COLOR:
-    return Colors["white"].cellColor()
-  of PROPERTY_BACKGROUND_COLOR:
+  if t == PROPERTY_BACKGROUND_COLOR:
     return Colors["transparent"].cellColor()
-  else:
-    return Colors["black"].cellColor()
+  return defaultColor
 
 func getInitialLength(t: CSSPropertyType): CSSLength =
   case t
@@ -1278,7 +1274,8 @@ func getInitialInteger(t: CSSPropertyType): int =
     return 1
   of PROPERTY_FONT_WEIGHT:
     return 400 # normal
-  else: discard
+  else:
+    return 0
 
 func calcInitial(t: CSSPropertyType): CSSComputedValue =
   let v = valueType(t)