Merge branch 'master' into next

pull/22/head
Ben Hilburn 8 years ago
commit c70bb0d4ee

@ -150,7 +150,7 @@ case $POWERLEVEL9K_MODE in
SSH_ICON '(ssh)' SSH_ICON '(ssh)'
) )
;; ;;
'nerdfont-fontconfig') 'nerdfont-complete'|'nerdfont-fontconfig')
# nerd-font patched (complete) font required! See # nerd-font patched (complete) font required! See
# https://github.com/ryanoasis/nerd-fonts # https://github.com/ryanoasis/nerd-fonts
# Set the right locale to protect special characters # Set the right locale to protect special characters

@ -1013,7 +1013,7 @@ prompt_status() {
"$1_prompt_segment" "$0_ERROR" "$2" "$DEFAULT_COLOR" "red" "" 'FAIL_ICON' "$1_prompt_segment" "$0_ERROR" "$2" "$DEFAULT_COLOR" "red" "" 'FAIL_ICON'
fi fi
elif [[ "$POWERLEVEL9K_STATUS_VERBOSE" == true || "$POWERLEVEL9K_STATUS_OK_IN_NON_VERBOSE" == true ]]; then elif [[ "$POWERLEVEL9K_STATUS_VERBOSE" == true || "$POWERLEVEL9K_STATUS_OK_IN_NON_VERBOSE" == true ]]; then
"$1_prompt_segment" "$0_OK" "$2" "$DEFAULT_COLOR" "046" "" 'OK_ICON' "$1_prompt_segment" "$0_OK" "$2" "$DEFAULT_COLOR" "green" "" 'OK_ICON'
fi fi
} }

Loading…
Cancel
Save