Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make default theme use named colors only

Browse source 
This gives us the biggest chance that these are *visible* in the
terminal, which allows people to choose something nicer.

It changes two colors - the autosuggestion and the pager
description (i.e. the completion descriptions in the pager).

In a bunch of terminals I've tested these are pretty similar - for the
most part brblack for the suggestions is a bit brighter than 555, and
yellow for the descriptions is less blue
than the original.

We could also make the descriptions brblack, but that's for later.

Technically we are a bit naughty in having a few foreground and
background pairs that might not be visible,
but there's nothing we can do if someone makes white invisible on brblack.

Fixes #9913
Fixes #3443

(cherry picked from commit ed881bcdd8)
This commit is contained in:
Fabian Boehm 2023-07-25 16:42:24 +02:00 committed by David Adam
parent ef43069a06
commit f116a81250
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
share/functions/__fish_config_interactive.fish
View file

@ -31,6 +31,10 @@ if status is-interactive
end" >$__fish_config_dir/config.fish
# Regular syntax highlighting colors
# NOTE: These should only use named colors
# to give us the maximum chance they are
# visible in whatever terminal setup.
#
__init_uvar fish_color_normal normal
__init_uvar fish_color_command blue
__init_uvar fish_color_param cyan
@ -41,7 +45,7 @@ end" >$__fish_config_dir/config.fish
__init_uvar fish_color_operator brcyan
__init_uvar fish_color_end green
__init_uvar fish_color_quote yellow
__init_uvar fish_color_autosuggestion 555 brblack
__init_uvar fish_color_autosuggestion brblack
__init_uvar fish_color_user brgreen
__init_uvar fish_color_host normal
__init_uvar fish_color_host_remote yellow
@ -57,14 +61,12 @@ end" >$__fish_config_dir/config.fish
# Background color for selections
__init_uvar fish_color_selection white --bold --background=brblack
# XXX fish_color_cancel was added in 2.6, but this was added to post-2.3 initialization
# when 2.4 and 2.5 were already released
__init_uvar fish_color_cancel -r
# Pager colors
__init_uvar fish_pager_color_prefix normal --bold --underline
__init_uvar fish_pager_color_completion normal
__init_uvar fish_pager_color_description B3A06D yellow -i
__init_uvar fish_pager_color_description yellow -i
__init_uvar fish_pager_color_progress brwhite --background=cyan
__init_uvar fish_pager_color_selected_background -r

7
share/tools/web_config/themes/fish default.theme
View file

@ -1,4 +1,7 @@
# name: fish default
# NOTE: These should only use named colors
# to give us the maximum chance they are
# visible in whatever terminal setup.
fish_color_normal normal
fish_color_command blue
@ -18,10 +21,10 @@ fish_color_cwd green
fish_color_valid_path --underline
fish_color_cwd_root red
fish_color_user brgreen
fish_color_autosuggestion 555 brblack
fish_color_autosuggestion brblack
fish_pager_color_completion normal
fish_color_host normal
fish_pager_color_description B3A06D yellow -i
fish_pager_color_description yellow -i
fish_color_cancel -r
fish_pager_color_prefix normal --bold --underline
fish_pager_color_progress brwhite --background=cyan