diff options
| author | Tim Oram <dev@mitmaro.ca> | 2021-01-28 20:27:42 -0330 |
|---|---|---|
| committer | Tim Oram <dev@mitmaro.ca> | 2021-01-28 20:55:48 -0330 |
| commit | 39b28d6f6e636b5d335568e1d79965003ab263ce (patch) | |
| tree | d161ae068bcce9b73a73eb5ca2bbacb90cd92d97 | |
| parent | ad4020c4b8f2e7d9ca48ab650beb26fad18bfcb5 (diff) | |
Fix light black color
The light black color was incorrectly mapped to grey, which was too
bright. This changes light black to map to dark grey.
| -rw-r--r-- | src/display/mod.rs | 4 | ||||
| -rw-r--r-- | src/display/utils.rs | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/display/mod.rs b/src/display/mod.rs index 96b1e8c..17ec935 100644 --- a/src/display/mod.rs +++ b/src/display/mod.rs @@ -434,13 +434,13 @@ mod tests { case::diff_whitespace( DisplayColor::DiffWhitespaceColor, false, - CrosstermColor::Grey, + CrosstermColor::DarkGrey, CrosstermColor::Reset ), case::diff_whitespace_selected( DisplayColor::DiffWhitespaceColor, true, - CrosstermColor::Grey, + CrosstermColor::DarkGrey, CrosstermColor::AnsiValue(237) ) )] diff --git a/src/display/utils.rs b/src/display/utils.rs index a8c65f3..4115be7 100644 --- a/src/display/utils.rs +++ b/src/display/utils.rs @@ -80,7 +80,7 @@ pub fn register_selectable_color_pairs( fn find_color(color_mode: ColorMode, color: Color) -> CrosstermColor { match color { Color::Default => CrosstermColor::Reset, - Color::LightBlack => CrosstermColor::Grey, + Color::LightBlack => CrosstermColor::DarkGrey, Color::LightWhite | Color::LightGrey => CrosstermColor::White, Color::LightBlue => CrosstermColor::Blue, Color::LightCyan => CrosstermColor::Cyan, @@ -192,9 +192,10 @@ mod tests { fn clear_env() { remove_var("COLORTERM"); - remove_var("VTE_VERSION"); - remove_var("TERM_PROGRAM"); remove_var("TERM"); + remove_var("TERM_PROGRAM"); + remove_var("VTE_VERSION"); + remove_var("WT_SESSION"); } #[test] @@ -420,7 +421,7 @@ mod tests { case::dark_white(Color::DarkWhite, CrosstermColor::White), case::dark_white(Color::DarkGrey, CrosstermColor::Grey), case::dark_yellow(Color::DarkYellow, CrosstermColor::Yellow), - case::light_black(Color::LightBlack, CrosstermColor::Grey), + case::light_black(Color::LightBlack, CrosstermColor::DarkGrey), case::light_grey(Color::LightGrey, CrosstermColor::White), case::light_blue(Color::LightBlue, CrosstermColor::Blue), case::light_cyan(Color::LightCyan, CrosstermColor::Cyan), @@ -486,7 +487,7 @@ mod tests { case::dark_white(Color::DarkWhite, CrosstermColor::Grey), case::dark_white(Color::DarkGrey, CrosstermColor::DarkGrey), case::dark_yellow(Color::DarkYellow, CrosstermColor::DarkYellow), - case::light_black(Color::LightBlack, CrosstermColor::Grey), + case::light_black(Color::LightBlack, CrosstermColor::DarkGrey), case::light_grey(Color::LightGrey, CrosstermColor::White), case::light_blue(Color::LightBlue, CrosstermColor::Blue), case::light_cyan(Color::LightCyan, CrosstermColor::Cyan), |