diff --git a/CHANGELOG.md b/CHANGELOG.md index f18f8adb..8e0b946a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). `colors.draw_bold_text_with_bright_colors` - Deprecated config option `key_bindings`, use `keyboard.bindings` - Deprecated config option `mouse_bindings`, use `mouse.bindings` +- The default colorscheme is now based on base16 classic dark ### Fixed diff --git a/README.md b/README.md index d4067c3c..b14bc99e 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,8 @@

Alacritty - A fast, cross-platform, OpenGL terminal emulator

- Alacritty - A fast, cross-platform, OpenGL terminal emulator + Alacritty - A fast, cross-platform, OpenGL terminal emulator

## About diff --git a/alacritty/src/config/color.rs b/alacritty/src/config/color.rs index 2ded7f04..b6334460 100644 --- a/alacritty/src/config/color.rs +++ b/alacritty/src/config/color.rs @@ -53,8 +53,8 @@ pub struct HintStartColors { impl Default for HintStartColors { fn default() -> Self { Self { - foreground: CellRgb::Rgb(Rgb::new(0x1d, 0x1f, 0x21)), - background: CellRgb::Rgb(Rgb::new(0xe9, 0xff, 0x5e)), + foreground: CellRgb::Rgb(Rgb::new(0x18, 0x18, 0x18)), + background: CellRgb::Rgb(Rgb::new(0xf4, 0xbf, 0x75)), } } } @@ -68,8 +68,8 @@ pub struct HintEndColors { impl Default for HintEndColors { fn default() -> Self { Self { - foreground: CellRgb::Rgb(Rgb::new(0xe9, 0xff, 0x5e)), - background: CellRgb::Rgb(Rgb::new(0x1d, 0x1f, 0x21)), + foreground: CellRgb::Rgb(Rgb::new(0x18, 0x18, 0x18)), + background: CellRgb::Rgb(Rgb::new(0xac, 0x42, 0x42)), } } } @@ -139,8 +139,8 @@ pub struct FocusedMatchColors { impl Default for FocusedMatchColors { fn default() -> Self { Self { - background: CellRgb::Rgb(Rgb::new(0x00, 0x00, 0x00)), - foreground: CellRgb::Rgb(Rgb::new(0xff, 0xff, 0xff)), + background: CellRgb::Rgb(Rgb::new(0xf4, 0xbf, 0x75)), + foreground: CellRgb::Rgb(Rgb::new(0x18, 0x18, 0x18)), } } } @@ -154,8 +154,8 @@ pub struct MatchColors { impl Default for MatchColors { fn default() -> Self { Self { - background: CellRgb::Rgb(Rgb::new(0xff, 0xff, 0xff)), - foreground: CellRgb::Rgb(Rgb::new(0x00, 0x00, 0x00)), + background: CellRgb::Rgb(Rgb::new(0xac, 0x42, 0x42)), + foreground: CellRgb::Rgb(Rgb::new(0x18, 0x18, 0x18)), } } } @@ -177,8 +177,8 @@ pub struct PrimaryColors { impl Default for PrimaryColors { fn default() -> Self { PrimaryColors { - background: Rgb::new(0x1d, 0x1f, 0x21), - foreground: Rgb::new(0xc5, 0xc8, 0xc6), + background: Rgb::new(0x18, 0x18, 0x18), + foreground: Rgb::new(0xd8, 0xd8, 0xd8), bright_foreground: Default::default(), dim_foreground: Default::default(), } @@ -200,14 +200,14 @@ pub struct NormalColors { impl Default for NormalColors { fn default() -> Self { NormalColors { - black: Rgb::new(0x1d, 0x1f, 0x21), - red: Rgb::new(0xcc, 0x66, 0x66), - green: Rgb::new(0xb5, 0xbd, 0x68), - yellow: Rgb::new(0xf0, 0xc6, 0x74), - blue: Rgb::new(0x81, 0xa2, 0xbe), - magenta: Rgb::new(0xb2, 0x94, 0xbb), - cyan: Rgb::new(0x8a, 0xbe, 0xb7), - white: Rgb::new(0xc5, 0xc8, 0xc6), + black: Rgb::new(0x18, 0x18, 0x18), + red: Rgb::new(0xac, 0x42, 0x42), + green: Rgb::new(0x90, 0xa9, 0x59), + yellow: Rgb::new(0xf4, 0xbf, 0x75), + blue: Rgb::new(0x6a, 0x9f, 0xb5), + magenta: Rgb::new(0xaa, 0x75, 0x9f), + cyan: Rgb::new(0x75, 0xb5, 0xaa), + white: Rgb::new(0xd8, 0xd8, 0xd8), } } } @@ -226,15 +226,18 @@ pub struct BrightColors { impl Default for BrightColors { fn default() -> Self { + // Generated with oklab by multiplying brightness by 1.12 and then adjusting numbers + // to make them look "nicer". Yellow color was generated the same way, however the first + // srgb representable color was picked. BrightColors { - black: Rgb::new(0x66, 0x66, 0x66), - red: Rgb::new(0xd5, 0x4e, 0x53), - green: Rgb::new(0xb9, 0xca, 0x4a), - yellow: Rgb::new(0xe7, 0xc5, 0x47), - blue: Rgb::new(0x7a, 0xa6, 0xda), - magenta: Rgb::new(0xc3, 0x97, 0xd8), - cyan: Rgb::new(0x70, 0xc0, 0xb1), - white: Rgb::new(0xea, 0xea, 0xea), + black: Rgb::new(0x6b, 0x6b, 0x6b), + red: Rgb::new(0xc5, 0x55, 0x55), + green: Rgb::new(0xaa, 0xc4, 0x74), + yellow: Rgb::new(0xfe, 0xca, 0x88), + blue: Rgb::new(0x82, 0xb8, 0xc8), + magenta: Rgb::new(0xc2, 0x8c, 0xb8), + cyan: Rgb::new(0x93, 0xd3, 0xc3), + white: Rgb::new(0xf8, 0xf8, 0xf8), } } } @@ -253,15 +256,16 @@ pub struct DimColors { impl Default for DimColors { fn default() -> Self { + // Generated with builtin alacritty's color dimming function. DimColors { - black: Rgb::new(0x13, 0x14, 0x15), - red: Rgb::new(0x86, 0x43, 0x43), - green: Rgb::new(0x77, 0x7c, 0x44), - yellow: Rgb::new(0x9e, 0x82, 0x4c), - blue: Rgb::new(0x55, 0x6a, 0x7d), - magenta: Rgb::new(0x75, 0x61, 0x7b), - cyan: Rgb::new(0x5b, 0x7d, 0x78), - white: Rgb::new(0x82, 0x84, 0x82), + black: Rgb::new(0x0f, 0x0f, 0x0f), + red: Rgb::new(0x71, 0x2b, 0x2b), + green: Rgb::new(0x5f, 0x6f, 0x3a), + yellow: Rgb::new(0xa1, 0x7e, 0x4d), + blue: Rgb::new(0x45, 0x68, 0x77), + magenta: Rgb::new(0x70, 0x4d, 0x68), + cyan: Rgb::new(0x4d, 0x77, 0x70), + white: Rgb::new(0x8e, 0x8e, 0x8e), } } } diff --git a/extra/man/alacritty.5.scd b/extra/man/alacritty.5.scd index 10252611..322d54f4 100644 --- a/extra/man/alacritty.5.scd +++ b/extra/man/alacritty.5.scd @@ -235,11 +235,11 @@ Colors are specified using their hexadecimal values with a _#_ prefix: _#RRGGBB_ *foreground* - Default: _"#1d1f21"_ + Default: _"#d8d8d8"_ *background* - Default: _"#c5c8c6"_ + Default: _"#181818"_ *dim_foreground* @@ -284,11 +284,11 @@ Colors are specified using their hexadecimal values with a _#_ prefix: _#RRGGBB_ *matches* { foreground = , background = } - Default: _{ foreground = "#000000", background: "#ffffff" }_ + Default: _{ foreground = "#181818", background: "#ac4242" }_ *focused_match* { foreground = , background = } - Default: _{ foreground = "#ffffff", background: "#000000" }_ + Default: _{ foreground = "#181818", background: "#f4bf75" }_ *hints* @@ -299,7 +299,7 @@ Colors are specified using their hexadecimal values with a _#_ prefix: _#RRGGBB_ Allowed values are hexadecimal colors like _#ff00ff_, or _CellForeground_/_CellBackground_, which references the affected cell. - Default: _{ foreground = "#1d1f21", background = "#e9ff5e" }_ + Default: _{ foreground = "#181818", background = "#f4bf75" }_ *end* { foreground = , background = } @@ -308,7 +308,7 @@ Colors are specified using their hexadecimal values with a _#_ prefix: _#RRGGBB_ Allowed values are hexadecimal colors like _#ff00ff_, or _CellForeground_/_CellBackground_, which references the affected cell. - Default: _{ foreground = "#e9ff5e", background = "#1d1f21" }_ + Default: _{ foreground = "#181818", background = "#ac4242" }_ *line_indicator* { foreground = , background = } @@ -324,7 +324,7 @@ Colors are specified using their hexadecimal values with a _#_ prefix: _#RRGGBB_ Color used for the footer bar on the bottom, used by search regex input, hyperlink URI preview, etc. - Default: _{ foreground = "#c5c8c6", background = "#1d1f21" }_ + Default: _{ foreground = "#181818", background = "#d8d8d8" }_ *selection* { text = , background = } @@ -338,40 +338,40 @@ Colors are specified using their hexadecimal values with a _#_ prefix: _#RRGGBB_ *normal* *black* - Default: _"#1d1f21"_ + Default: _"#181818"_ *red* - Default: _"#cc6666"_ + Default: _"#ac4242"_ *green* - Default: _"#b5bd68"_ + Default: _"#90a959"_ *yellow* - Default: _"#f0c674"_ + Default: _"#f4bf75"_ *blue* - Default: _"#81a2be"_ + Default: _"#6a9fb5"_ *magenta* - Default: _"#b294bb"_ + Default: _"#aa759f"_ *cyan* - Default: _"#8abeb7"_ + Default: _"#75b5aa"_ *white* - Default: _"#c5c8c6"_ + Default: _"#d8d8d8"_ *bright* *black* - Default: _"#666666"_ + Default: _"#6b6b6b"_ *red* - Default: _"#d54e53"_ + Default: _"#c55555"_ *green* - Default: _"#b9ca4a"_ + Default: _"#aac474"_ *yellow* - Default: _"#e7c547"_ + Default: _"#feca88"_ *blue* - Default: _"#7aa6da"_ + Default: _"#82b8c8"_ *magenta* - Default: _"#c397d8"_ + Default: _"#c28cb8"_ *cyan* - Default: _"#70c0b1"_ + Default: _"#93d3c3"_ *white* - Default: _"#eaeaea"_ + Default: _"#f8f8f8"_ *dim* @@ -379,21 +379,21 @@ Colors are specified using their hexadecimal values with a _#_ prefix: _#RRGGBB_ on the _normal_ colors. *black* - Default: _"#131415"_ + Default: _"#0f0f0f"_ *red* - Default: _"#864343"_ + Default: _"#712b2b"_ *green* - Default: _"#777c44"_ + Default: _"#5f6f3a"_ *yellow* - Default: _"#9e824c"_ + Default: _"#a17e4d"_ *blue* - Default: _"#556a7d"_ + Default: _"#456877"_ *magenta* - Default: _"#75617b"_ + Default: _"#704d68"_ *cyan* - Default: _"#5b7d78"_ + Default: _"#4d7770"_ *white* - Default: _"#828482"_ + Default: _"#8e8e8e"_ *indexed_colors* [{ index = , color = },] diff --git a/extra/promo/alacritty-readme.png b/extra/promo/alacritty-readme.png new file mode 100644 index 00000000..346401a6 Binary files /dev/null and b/extra/promo/alacritty-readme.png differ