Merge branch 'master' into debug

1 files changed, 3 insertions, 3 deletions

diff --git a/helix-view/src/graphics.rs b/helix-view/src/graphics.rs
index 66013ee5..0bfca04a 100644
--- a/helix-view/src/graphics.rs
+++ b/helix-view/src/graphics.rs
@@ -224,13 +224,13 @@ pub enum Color {
     Magenta,

     Cyan,

     Gray,

-    DarkGray,

     LightRed,

     LightGreen,

     LightYellow,

     LightBlue,

     LightMagenta,

     LightCyan,

+    LightGray,

     White,

     Rgb(u8, u8, u8),

     Indexed(u8),

@@ -250,14 +250,14 @@ impl From<Color> for crossterm::style::Color {
             Color::Blue => CColor::DarkBlue,

             Color::Magenta => CColor::DarkMagenta,

             Color::Cyan => CColor::DarkCyan,

-            Color::Gray => CColor::Grey,

-            Color::DarkGray => CColor::DarkGrey,

+            Color::Gray => CColor::DarkGrey,

             Color::LightRed => CColor::Red,

             Color::LightGreen => CColor::Green,

             Color::LightBlue => CColor::Blue,

             Color::LightYellow => CColor::Yellow,

             Color::LightMagenta => CColor::Magenta,

             Color::LightCyan => CColor::Cyan,

+            Color::LightGray => CColor::Grey,

             Color::White => CColor::White,

             Color::Indexed(i) => CColor::AnsiValue(i),

             Color::Rgb(r, g, b) => CColor::Rgb { r, g, b },