1c468c63c078a874fc6dc22ba19206a9a6cfe7a2

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Merge pull request #839 from eproxus/sunrise-fixes

Correct color and font issues on Ubuntu

Diff

 1diff --git a/themes/sunrise.zsh-theme b/themes/sunrise.zsh-theme
 2index 88b371d792f4d1620e03bf80b0e9fa7654ab9c06..acc6ed312f863bd63cf2cdcc738beb8341cd8994 100644
 3--- a/themes/sunrise.zsh-theme
 4+++ b/themes/sunrise.zsh-theme
 5@@ -5,16 +5,15 @@
 6 #-------------------------------------------------------------------------------
 7 
 8 # Color shortcuts
 9-R=$fg[red]
10-G=$fg[green]
11-M=$fg[magenta]
12-RB=$fg_bold[red]
13-YB=$fg_bold[yellow]
14-BB=$fg_bold[blue]
15+R=$fg_no_bold[red]
16+G=$fg_no_bold[green]
17+M=$fg_no_bold[magenta]
18+Y=$fg_no_bold[yellow]
19+B=$fg_no_bold[blue]
20 RESET=$reset_color
21 
22 if [ "$(whoami)" = "root" ]; then
23-    PROMPTCOLOR="%{$RB%}" PREFIX="-!-";
24+    PROMPTCOLOR="%{$R%}" PREFIX="-!-";
25 else
26     PROMPTCOLOR="" PREFIX="---";
27 fi
28@@ -73,13 +72,14 @@ function custom_git_prompt() {
29 PROMPT='%B$PREFIX %2~ $(custom_git_prompt)%{$M%}%B»%b%{$RESET%} '
30 RPS1="${return_code}"
31 
32-ZSH_THEME_GIT_PROMPT_PREFIX="%{$YB%}‹"
33-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$YB%}›%{$RESET%} "
34+ZSH_THEME_GIT_PROMPT_PREFIX="%{$Y%}‹"
35+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$Y%}›%{$RESET%} "
36 
37 ZSH_THEME_GIT_PROMPT_DIRTY="%{$R%}*"
38 ZSH_THEME_GIT_PROMPT_CLEAN=""
39 
40-ZSH_THEME_GIT_PROMPT_AHEAD="%{$BB%}➔"
41+ZSH_THEME_GIT_PROMPT_AHEAD="%{$B%}➔"
42+
43 
44 ZSH_THEME_GIT_STATUS_PREFIX=" "
45 
46@@ -90,7 +90,7 @@ ZSH_THEME_GIT_PROMPT_STAGED_RENAMED="%{$G%}R"
47 ZSH_THEME_GIT_PROMPT_STAGED_DELETED="%{$G%}D"
48 
49 # Not-staged
50-ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$R%}⁇"
51+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$R%}?"
52 ZSH_THEME_GIT_PROMPT_MODIFIED="%{$R%}M"
53 ZSH_THEME_GIT_PROMPT_DELETED="%{$R%}D"
54 ZSH_THEME_GIT_PROMPT_UNMERGED="%{$R%}UU"