Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ Add new theme called "pill" (fancygit --theme-pill) #129

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

> Any trouble, please visit the [troubleshooting page](https://github.com/diogocavilha/fancy-git/blob/master/TROUBLESHOOTING.md)

## v7.2.0
- Add pill theme. It can be applied by running `fancygit --theme-pill`.

## v7.1.9
- Add --nofontconfig option to install.sh to skip creation of ~/.fonts and requirement for fontconfig to be installed (useful option for those only accessing a headless server via SSH where the font needs to be set on their local terminal application)

Expand Down
33 changes: 33 additions & 0 deletions color_schemes/pill_batman
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Use color values in the range [0-255] for 256 bit colors.
# Themes will handle the color values properly.
# You can check how that works here: https://misc.flogisoft.com/bash/tip_colors_and_formatting

# TIME
FANCYGIT_COLOR_SCHEME_TIME_BACKGROUND="233"
FANCYGIT_COLOR_SCHEME_TIME_FOREGROUND="231"

# USER AT HOST
FANCYGIT_COLOR_SCHEME_USER_AT_HOST_BACKGROUND="233"
FANCYGIT_COLOR_SCHEME_USER_FOREGROUND="231"
FANCYGIT_COLOR_SCHEME_AT_FOREGROUND="231"
FANCYGIT_COLOR_SCHEME_HOST_FOREGROUND="231"

# USER SYMBOL
FANCYGIT_COLOR_SCHEME_USER_SYMBOL_BACKGROUND="238"
FANCYGIT_COLOR_SCHEME_USER_SYMBOL_FOREGROUND="231"

# PATH
FANCYGIT_COLOR_SCHEME_WORKDIR_BACKGROUND="233"
FANCYGIT_COLOR_SCHEME_WORKDIR_FOREGROUND="231"

# BRANCH
FANCYGIT_COLOR_SCHEME_BRANCH_BACKGROUND="231"
FANCYGIT_COLOR_SCHEME_BRANCH_FOREROUND="0"

# BRANCH WITH STAGED FILES
FANCYGIT_COLOR_SCHEME_BRANCH_STAGED_FILES_BACKGROUND="10"
FANCYGIT_COLOR_SCHEME_BRANCH_STAGED_FILES_FOREGROUND="0"

# BRANCH WITH CHANGED FILES
FANCYGIT_COLOR_SCHEME_BRANCH_CHANGED_FILES_BACKGROUND="11"
FANCYGIT_COLOR_SCHEME_BRANCH_CHANGED_FILES_FOREGROUND="0"
33 changes: 33 additions & 0 deletions color_schemes/pill_cga
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Use color values in the range [0-255] for 256 bit colors.
# Themes will handle the color values properly.
# You can check how that works here: https://misc.flogisoft.com/bash/tip_colors_and_formatting

# TIME
FANCYGIT_COLOR_SCHEME_TIME_BACKGROUND="0"
FANCYGIT_COLOR_SCHEME_TIME_FOREGROUND="14"

# USER AT HOST
FANCYGIT_COLOR_SCHEME_USER_AT_HOST_BACKGROUND="13"
FANCYGIT_COLOR_SCHEME_USER_FOREGROUND="15"
FANCYGIT_COLOR_SCHEME_AT_FOREGROUND="14"
FANCYGIT_COLOR_SCHEME_HOST_FOREGROUND="0"

# USER SYMBOL
FANCYGIT_COLOR_SCHEME_USER_SYMBOL_BACKGROUND="14"
FANCYGIT_COLOR_SCHEME_USER_SYMBOL_FOREGROUND="0"

# PATH
FANCYGIT_COLOR_SCHEME_WORKDIR_BACKGROUND="13"
FANCYGIT_COLOR_SCHEME_WORKDIR_FOREGROUND="15"

# BRANCH
FANCYGIT_COLOR_SCHEME_BRANCH_BACKGROUND="15"
FANCYGIT_COLOR_SCHEME_BRANCH_FOREROUND="0"

# BRANCH WITH STAGED FILES
FANCYGIT_COLOR_SCHEME_BRANCH_STAGED_FILES_BACKGROUND="14"
FANCYGIT_COLOR_SCHEME_BRANCH_STAGED_FILES_FOREGROUND="13"

# BRANCH WITH CHANGED FILES
FANCYGIT_COLOR_SCHEME_BRANCH_CHANGED_FILES_BACKGROUND="14"
FANCYGIT_COLOR_SCHEME_BRANCH_CHANGED_FILES_FOREGROUND="0"
33 changes: 33 additions & 0 deletions color_schemes/pill_dracula
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Use color values in the range [0-255] for 256 bit colors.
# Themes will handle the color values properly.
# You can check how that works here: https://misc.flogisoft.com/bash/tip_colors_and_formatting

# TIME
FANCYGIT_COLOR_SCHEME_TIME_BACKGROUND="59"
FANCYGIT_COLOR_SCHEME_TIME_FOREGROUND="231"

# USER AT HOST
FANCYGIT_COLOR_SCHEME_USER_AT_HOST_BACKGROUND="59"
FANCYGIT_COLOR_SCHEME_USER_FOREGROUND="231"
FANCYGIT_COLOR_SCHEME_AT_FOREGROUND="231"
FANCYGIT_COLOR_SCHEME_HOST_FOREGROUND="231"

# USER SYMBOL
FANCYGIT_COLOR_SCHEME_USER_SYMBOL_BACKGROUND="207"
FANCYGIT_COLOR_SCHEME_USER_SYMBOL_FOREGROUND="231"

# PATH
FANCYGIT_COLOR_SCHEME_WORKDIR_BACKGROUND="99"
FANCYGIT_COLOR_SCHEME_WORKDIR_FOREGROUND="231"

# BRANCH
FANCYGIT_COLOR_SCHEME_BRANCH_BACKGROUND="231"
FANCYGIT_COLOR_SCHEME_BRANCH_FOREROUND="0"

# BRANCH WITH STAGED FILES
FANCYGIT_COLOR_SCHEME_BRANCH_STAGED_FILES_BACKGROUND="120"
FANCYGIT_COLOR_SCHEME_BRANCH_STAGED_FILES_FOREGROUND="0"

# BRANCH WITH CHANGED FILES
FANCYGIT_COLOR_SCHEME_BRANCH_CHANGED_FILES_BACKGROUND="222"
FANCYGIT_COLOR_SCHEME_BRANCH_CHANGED_FILES_FOREGROUND="0"
33 changes: 33 additions & 0 deletions color_schemes/pill_light
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Use color values in the range [0-255] for 256 bit colors.
# Themes will handle the color values properly.
# You can check how that works here: https://misc.flogisoft.com/bash/tip_colors_and_formatting

# TIME
FANCYGIT_COLOR_SCHEME_TIME_BACKGROUND="7"
FANCYGIT_COLOR_SCHEME_TIME_FOREGROUND="0"

# USER AT HOST
FANCYGIT_COLOR_SCHEME_USER_AT_HOST_BACKGROUND="7"
FANCYGIT_COLOR_SCHEME_USER_FOREGROUND="0"
FANCYGIT_COLOR_SCHEME_AT_FOREGROUND="0"
FANCYGIT_COLOR_SCHEME_HOST_FOREGROUND="0"

# USER SYMBOL
FANCYGIT_COLOR_SCHEME_USER_SYMBOL_BACKGROUND="15"
FANCYGIT_COLOR_SCHEME_USER_SYMBOL_FOREGROUND="0"

# PATH
FANCYGIT_COLOR_SCHEME_WORKDIR_BACKGROUND="7"
FANCYGIT_COLOR_SCHEME_WORKDIR_FOREGROUND="0"

# BRANCH
FANCYGIT_COLOR_SCHEME_BRANCH_BACKGROUND="231"
FANCYGIT_COLOR_SCHEME_BRANCH_FOREROUND="0"

# BRANCH WITH STAGED FILES
FANCYGIT_COLOR_SCHEME_BRANCH_STAGED_FILES_BACKGROUND="10"
FANCYGIT_COLOR_SCHEME_BRANCH_STAGED_FILES_FOREGROUND="0"

# BRANCH WITH CHANGED FILES
FANCYGIT_COLOR_SCHEME_BRANCH_CHANGED_FILES_BACKGROUND="11"
FANCYGIT_COLOR_SCHEME_BRANCH_CHANGED_FILES_FOREGROUND="0"
33 changes: 33 additions & 0 deletions color_schemes/pill_neon
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Use color values in the range [0-255] for 256 bit colors.
# Themes will handle the color values properly.
# You can check how that works here: https://misc.flogisoft.com/bash/tip_colors_and_formatting

# TIME
FANCYGIT_COLOR_SCHEME_TIME_BACKGROUND="199"
FANCYGIT_COLOR_SCHEME_TIME_FOREGROUND="231"

# USER AT HOST
FANCYGIT_COLOR_SCHEME_USER_AT_HOST_BACKGROUND="199"
FANCYGIT_COLOR_SCHEME_USER_FOREGROUND="231"
FANCYGIT_COLOR_SCHEME_AT_FOREGROUND="231"
FANCYGIT_COLOR_SCHEME_HOST_FOREGROUND="231"

# USER SYMBOL
FANCYGIT_COLOR_SCHEME_USER_SYMBOL_BACKGROUND="129"
FANCYGIT_COLOR_SCHEME_USER_SYMBOL_FOREGROUND="231"

# PATH
FANCYGIT_COLOR_SCHEME_WORKDIR_BACKGROUND="57"
FANCYGIT_COLOR_SCHEME_WORKDIR_FOREGROUND="231"

# BRANCH
FANCYGIT_COLOR_SCHEME_BRANCH_BACKGROUND="231"
FANCYGIT_COLOR_SCHEME_BRANCH_FOREROUND="0"

# BRANCH WITH STAGED FILES
FANCYGIT_COLOR_SCHEME_BRANCH_STAGED_FILES_BACKGROUND="49"
FANCYGIT_COLOR_SCHEME_BRANCH_STAGED_FILES_FOREGROUND="0"

# BRANCH WITH CHANGED FILES
FANCYGIT_COLOR_SCHEME_BRANCH_CHANGED_FILES_BACKGROUND="226"
FANCYGIT_COLOR_SCHEME_BRANCH_CHANGED_FILES_FOREGROUND="0"
33 changes: 33 additions & 0 deletions color_schemes/pill_pill
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Use color values in the range [0-255] for 256 bit colors.
# Themes will handle the color values properly.
# You can check how that works here: https://misc.flogisoft.com/bash/tip_colors_and_formatting

# TIME
FANCYGIT_COLOR_SCHEME_TIME_BACKGROUND="59"
FANCYGIT_COLOR_SCHEME_TIME_FOREGROUND="231"

# USER AT HOST
FANCYGIT_COLOR_SCHEME_USER_AT_HOST_BACKGROUND="59"
FANCYGIT_COLOR_SCHEME_USER_FOREGROUND="231"
FANCYGIT_COLOR_SCHEME_AT_FOREGROUND="231"
FANCYGIT_COLOR_SCHEME_HOST_FOREGROUND="231"

# USER SYMBOL
FANCYGIT_COLOR_SCHEME_USER_SYMBOL_BACKGROUND="139"
FANCYGIT_COLOR_SCHEME_USER_SYMBOL_FOREGROUND="231"

# PATH
FANCYGIT_COLOR_SCHEME_WORKDIR_BACKGROUND="25"
FANCYGIT_COLOR_SCHEME_WORKDIR_FOREGROUND="231"

# BRANCH
FANCYGIT_COLOR_SCHEME_BRANCH_BACKGROUND="231"
FANCYGIT_COLOR_SCHEME_BRANCH_FOREROUND="0"

# BRANCH WITH STAGED FILES
FANCYGIT_COLOR_SCHEME_BRANCH_STAGED_FILES_BACKGROUND="10"
FANCYGIT_COLOR_SCHEME_BRANCH_STAGED_FILES_FOREGROUND="0"

# BRANCH WITH CHANGED FILES
FANCYGIT_COLOR_SCHEME_BRANCH_CHANGED_FILES_BACKGROUND="11"
FANCYGIT_COLOR_SCHEME_BRANCH_CHANGED_FILES_FOREGROUND="0"
33 changes: 33 additions & 0 deletions color_schemes/pill_robin
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Use color values in the range [0-255] for 256 bit colors.
# Themes will handle the color values properly.
# You can check how that works here: https://misc.flogisoft.com/bash/tip_colors_and_formatting

# TIME
FANCYGIT_COLOR_SCHEME_TIME_BACKGROUND="233"
FANCYGIT_COLOR_SCHEME_TIME_FOREGROUND="226"

# USER AT HOST
FANCYGIT_COLOR_SCHEME_USER_AT_HOST_BACKGROUND="233"
FANCYGIT_COLOR_SCHEME_USER_FOREGROUND="208"
FANCYGIT_COLOR_SCHEME_AT_FOREGROUND="231"
FANCYGIT_COLOR_SCHEME_HOST_FOREGROUND="11"

# USER SYMBOL
FANCYGIT_COLOR_SCHEME_USER_SYMBOL_BACKGROUND="238"
FANCYGIT_COLOR_SCHEME_USER_SYMBOL_FOREGROUND="231"

# PATH
FANCYGIT_COLOR_SCHEME_WORKDIR_BACKGROUND="15"
FANCYGIT_COLOR_SCHEME_WORKDIR_FOREGROUND="202"

# BRANCH
FANCYGIT_COLOR_SCHEME_BRANCH_BACKGROUND="231"
FANCYGIT_COLOR_SCHEME_BRANCH_FOREROUND="0"

# BRANCH WITH STAGED FILES
FANCYGIT_COLOR_SCHEME_BRANCH_STAGED_FILES_BACKGROUND="10"
FANCYGIT_COLOR_SCHEME_BRANCH_STAGED_FILES_FOREGROUND="0"

# BRANCH WITH CHANGED FILES
FANCYGIT_COLOR_SCHEME_BRANCH_CHANGED_FILES_BACKGROUND="11"
FANCYGIT_COLOR_SCHEME_BRANCH_CHANGED_FILES_FOREGROUND="0"
33 changes: 33 additions & 0 deletions color_schemes/pill_superman
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Use color values in the range [0-255] for 256 bit colors.
# Themes will handle the color values properly.
# You can check how that works here: https://misc.flogisoft.com/bash/tip_colors_and_formatting

# TIME
FANCYGIT_COLOR_SCHEME_TIME_BACKGROUND="9"
FANCYGIT_COLOR_SCHEME_TIME_FOREGROUND="231"

# USER AT HOST
FANCYGIT_COLOR_SCHEME_USER_AT_HOST_BACKGROUND="9"
FANCYGIT_COLOR_SCHEME_USER_FOREGROUND="231"
FANCYGIT_COLOR_SCHEME_AT_FOREGROUND="231"
FANCYGIT_COLOR_SCHEME_HOST_FOREGROUND="231"

# USER SYMBOL
FANCYGIT_COLOR_SCHEME_USER_SYMBOL_BACKGROUND="220"
FANCYGIT_COLOR_SCHEME_USER_SYMBOL_FOREGROUND="0"

# PATH
FANCYGIT_COLOR_SCHEME_WORKDIR_BACKGROUND="27"
FANCYGIT_COLOR_SCHEME_WORKDIR_FOREGROUND="231"

# BRANCH
FANCYGIT_COLOR_SCHEME_BRANCH_BACKGROUND="231"
FANCYGIT_COLOR_SCHEME_BRANCH_FOREROUND="0"

# BRANCH WITH STAGED FILES
FANCYGIT_COLOR_SCHEME_BRANCH_STAGED_FILES_BACKGROUND="10"
FANCYGIT_COLOR_SCHEME_BRANCH_STAGED_FILES_FOREGROUND="0"

# BRANCH WITH CHANGED FILES
FANCYGIT_COLOR_SCHEME_BRANCH_CHANGED_FILES_BACKGROUND="220"
FANCYGIT_COLOR_SCHEME_BRANCH_CHANGED_FILES_FOREGROUND="0"
9 changes: 9 additions & 0 deletions commands-handler.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ case "$1" in
"--theme-default") fancygit_theme_set "default" "true";;
"--theme-human") fancygit_theme_set "human" "false";;
"--theme-simple") fancygit_theme_set "simple" "false";;
"--theme-pill") fancygit_theme_set "pill" "true";;

# Color schemes.
"--color-scheme-simple") fancygit_theme_color_scheme_set "simple_simple";;
Expand All @@ -70,6 +71,14 @@ case "$1" in
"--color-scheme-superman") fancygit_theme_color_scheme_set "default_superman";;
"--color-scheme-neon") fancygit_theme_color_scheme_set "default_neon";;
"--color-scheme-cga") fancygit_theme_color_scheme_set "default_cga";;
"--color-scheme-pill") fancygit_theme_color_scheme_set "pill_pill";;
"--color-scheme-pill-dracula") fancygit_theme_color_scheme_set "pill_dracula";;
"--color-scheme-pill-batman") fancygit_theme_color_scheme_set "pill_batman";;
"--color-scheme-pill-robin") fancygit_theme_color_scheme_set "pill_robin";;
"--color-scheme-pill-light") fancygit_theme_color_scheme_set "pill_light";;
"--color-scheme-pill-superman") fancygit_theme_color_scheme_set "pill_superman";;
"--color-scheme-pill-neon") fancygit_theme_color_scheme_set "pill_neon";;
"--color-scheme-pill-cga") fancygit_theme_color_scheme_set "pill_cga";;

# Deprecated commands.
"--separator-blocs") fancygit_app_command_deprecation_warning "--separator-blocks";;
Expand Down
11 changes: 10 additions & 1 deletion fancygit-completion
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ _fancygit() {
--theme-default \
--theme-human \
--theme-simple \
--theme-pill \
--color-scheme-simple \
--color-scheme-human \
--color-scheme-default \
Expand All @@ -50,7 +51,15 @@ _fancygit() {
--color-scheme-neon \
--color-scheme-cga \
--color-scheme-superman \
--reset
--color-scheme-pill \
--color-scheme-pill-dracula \
--color-scheme-pill-batman \
--color-scheme-pill-robin \
--color-scheme-pill-light \
--color-scheme-pill-superman \
--color-scheme-pill-neon \
--color-scheme-pill-cga \
--reset \
'

if [[ ${cur} == * ]] ; then
Expand Down
9 changes: 9 additions & 0 deletions help.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ THEME COMMANDS:
fancygit --theme-default Change prompt to the default theme.
fancygit --theme-human Change prompt to the human theme readable theme.
fancygit --theme-simple Change prompt to the simple theme.
fancygit --theme-pill Change prompt to the pill theme.

COLOR SCHEME COMMANDS:
fancygit --color-scheme-simple Available for theme-simple.
Expand All @@ -49,6 +50,14 @@ COLOR SCHEME COMMANDS:
fancygit --color-scheme-superman Available for theme-default.
fancygit --color-scheme-light Available for theme-default.
fancygit --color-scheme-neon Available for theme-default.
fancygit --color-scheme-pill Available for theme-pill.
fancygit --color-scheme-pill-dracula Available for theme-pill.
fancygit --color-scheme-pill-batman Available for theme-pill.
fancygit --color-scheme-pill-robin Available for theme-pill.
fancygit --color-scheme-pill-light Available for theme-pill.
fancygit --color-scheme-pill-superman Available for theme-pill.
fancygit --color-scheme-pill-neon Available for theme-pill.
fancygit --color-scheme-pill-cga Available for theme-pill.

SEPARATOR STYLE COMMANDS:
fancygit --separator-default Change the separator (if it's present on current theme) to default style.
Expand Down
2 changes: 2 additions & 0 deletions prompt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ function fancygit_theme_handler() {
. "$HOME/.fancy-git/themes/human.sh";;
"simple")
. "$HOME/.fancy-git/themes/simple.sh";;
"pill")
. "$HOME/.fancy-git/themes/pill.sh";;
esac
}

Expand Down
Loading