diff --git a/src/ui/colors.rs b/src/ui/colors.rs index 064ea14..a6f3be2 100644 --- a/src/ui/colors.rs +++ b/src/ui/colors.rs @@ -12,15 +12,15 @@ pub fn parse_color(src: &str) -> Result, error::ParseError "magenta" => Ok(Box::new(color::Magenta)), "cyan" => Ok(Box::new(color::Cyan)), "white" => Ok(Box::new(color::White)), - "bright-black" => Ok(Box::new(color::LightBlack)), - "bright-red" => Ok(Box::new(color::LightRed)), - "bright-green" => Ok(Box::new(color::LightGreen)), - "bright-yellow" => Ok(Box::new(color::LightYellow)), - "bright-blue" => Ok(Box::new(color::LightBlue)), - "bright-magenta" => Ok(Box::new(color::LightMagenta)), - "bright-cyan" => Ok(Box::new(color::LightCyan)), - "bright-white" => Ok(Box::new(color::LightWhite)), - // "default" => Ok(Box::new(color::Reset)), + "bright-black" | "brightblack" => Ok(Box::new(color::LightBlack)), + "bright-red" | "brightred" => Ok(Box::new(color::LightRed)), + "bright-green" | "brightgreen" => Ok(Box::new(color::LightGreen)), + "bright-yellow" | "brightyellow" => Ok(Box::new(color::LightYellow)), + "bright-blue" | "brightblue" => Ok(Box::new(color::LightBlue)), + "bright-magenta" | "brightmagenta" => Ok(Box::new(color::LightMagenta)), + "bright-cyan" | "brightcyan" => Ok(Box::new(color::LightCyan)), + "bright-white" | "brightwhite" => Ok(Box::new(color::LightWhite)), + "none" => Ok(Box::new(color::Reset)), _ => Err(error::ParseError::UnknownColor), } } @@ -56,20 +56,20 @@ mod tests { #[clap(about)] // Needed to avoid this doc comment to be used as overall `about`. pub struct UiColors { /// Foreground color for base text. - #[clap(long, default_value = "bright-blue", parse(try_from_str = parse_color))] + #[clap(long, default_value = "bright-cyan", parse(try_from_str = parse_color))] pub text_fg: Box, /// Background color for base text. - #[clap(long, default_value = "white", parse(try_from_str = parse_color))] + #[clap(long, default_value = "none", parse(try_from_str = parse_color))] pub text_bg: Box, /// Foreground color for spans. - #[clap(long, default_value = "yellow", + #[clap(long, default_value = "blue", parse(try_from_str = parse_color))] pub span_fg: Box, /// Background color for spans. - #[clap(long, default_value = "white", + #[clap(long, default_value = "none", parse(try_from_str = parse_color))] pub span_bg: Box, @@ -79,17 +79,17 @@ pub struct UiColors { pub focused_fg: Box, /// Background color for the focused span. - #[clap(long, default_value = "white", + #[clap(long, default_value = "none", parse(try_from_str = parse_color))] pub focused_bg: Box, /// Foreground color for hints. - #[clap(long, default_value = "white", + #[clap(long, default_value = "yellow", parse(try_from_str = parse_color))] pub hint_fg: Box, /// Background color for hints. - #[clap(long, default_value = "magenta", + #[clap(long, default_value = "none", parse(try_from_str = parse_color))] pub hint_bg: Box, } diff --git a/src/ui/vc.rs b/src/ui/vc.rs index e49f753..ec85a27 100644 --- a/src/ui/vc.rs +++ b/src/ui/vc.rs @@ -265,7 +265,7 @@ impl<'a> ViewController<'a> { fg_reset = fg_reset, bg_reset = bg_reset, sty = style::Bold, - sty_reset = style::NoBold, + sty_reset = style::Reset, // NoBold is not sufficient hint = hint_text, ) .unwrap();