Merge remote-tracking branch 'upstream/master'

ogr3 · Jun 8, 2016 · d620745 · d620745
2 parents 281714d + 0ee3ef8
commit d620745
Show file tree

Hide file tree

Showing 3 changed files with 94 additions and 0 deletions.
diff --git a/themes/Evermeet.bgptheme b/themes/Evermeet.bgptheme
@@ -0,0 +1,30 @@
+# This theme for gitprompt.sh is designed for dark color schemes
+# It is most suitable for Retina or high resolution displays
+
+override_git_prompt_colors() {
+	GIT_PROMPT_THEME_NAME="Evermeet"
+
+	GIT_PROMPT_PREFIX=""                  # start of the git info string
+	GIT_PROMPT_SUFFIX=""                  # the end of the git info string
+	GIT_PROMPT_SEPARATOR="|"              # separates each item
+
+	GIT_PROMPT_BRANCH="${Magenta}"        # the git branch that is active in the current directory
+	GIT_PROMPT_STAGED="${Cyan}●"          # the number of staged files/directories
+	GIT_PROMPT_CONFLICTS="${BoldRed}✖"    # the number of files in conflict
+	GIT_PROMPT_CHANGED="${Cyan}✚"         # the number of changed files
+
+	GIT_PROMPT_UNTRACKED="${Cyan}…"       # the number of untracked files/dirs
+	GIT_PROMPT_STASHED="${Magenta}⚑"      # the number of stashed files/dir
+	GIT_PROMPT_CLEAN="${BoldGreen}✔"      # a colored flag indicating a "clean" repo
+
+	GIT_PROMPT_UPSTREAM=" {${Magenta}_UPSTREAM_${ResetColor}}"
+
+	GIT_PROMPT_START_USER="[${BoldGreen}\u@\h${ResetColor} ${BoldYellow}\${?}${ResetColor} ${BoldBlue}\w${ResetColor}"
+	GIT_PROMPT_START_ROOT="[${BoldRed}\u@\h${ResetColor} ${BoldYellow}\${?}${ResetColor} ${BoldBlue}\w${ResetColor}"
+	GIT_PROMPT_END_USER="]$ "
+	GIT_PROMPT_END_ROOT="]# "
+
+	GIT_PROMPT_SYMBOLS_NO_REMOTE_TRACKING="⭑"   # This symbol is written after the branch, if the branch is not tracked
+}
+
+reload_git_prompt_colors "Evermeet"
diff --git a/themes/Evermeet_Lowres.bgptheme b/themes/Evermeet_Lowres.bgptheme
@@ -0,0 +1,32 @@
+# This theme for gitprompt.sh is designed for dark color schemes
+# On lowres screens unicode characters like ✖  require a space after them
+# otherwise the following character may overlap with the unicode character
+# tweaked for low resolution and non-retina screens
+
+override_git_prompt_colors() {
+	GIT_PROMPT_THEME_NAME="Evermeet_Lowres"
+
+	GIT_PROMPT_PREFIX=""                  # start of the git info string
+	GIT_PROMPT_SUFFIX=""                  # the end of the git info string
+	GIT_PROMPT_SEPARATOR="|"              # separates each item
+
+	GIT_PROMPT_BRANCH="${Magenta}"        # the git branch that is active in the current directory
+	GIT_PROMPT_STAGED="${Cyan}●"          # the number of staged files/directories
+	GIT_PROMPT_CONFLICTS="${BoldRed}✖ "   # the number of files in conflict
+	GIT_PROMPT_CHANGED="${Cyan}✚ "        # the number of changed files
+
+	GIT_PROMPT_UNTRACKED="${Cyan}…"       # the number of untracked files/dirs
+	GIT_PROMPT_STASHED="${Magenta}⚑"      # the number of stashed files/dir
+	GIT_PROMPT_CLEAN="${BoldGreen}✔"      # a colored flag indicating a "clean" repo
+
+	GIT_PROMPT_UPSTREAM=" {${Magenta}_UPSTREAM_${ResetColor}}"
+
+	GIT_PROMPT_START_USER="[${BoldGreen}\u@\h${ResetColor} ${BoldYellow}\${?}${ResetColor} ${BoldBlue}\w${ResetColor}"
+	GIT_PROMPT_START_ROOT="[${BoldRed}\u@\h${ResetColor} ${BoldYellow}\${?}${ResetColor} ${BoldBlue}\w${ResetColor}"
+	GIT_PROMPT_END_USER="]$ "
+	GIT_PROMPT_END_ROOT="]# "
+
+	GIT_PROMPT_SYMBOLS_NO_REMOTE_TRACKING="⭑ "   # This symbol is written after the branch, if the branch is not tracked
+}
+
+reload_git_prompt_colors "Evermeet_Lowres"
diff --git a/themes/Evermeet_Ubuntu.bgptheme b/themes/Evermeet_Ubuntu.bgptheme
@@ -0,0 +1,32 @@
+# This theme for gitprompt.sh is designed for dark color schemes
+# On lowres screens unicode characters like ✖  require a space after them
+# otherwise the following character may overlap with the unicode character
+# tweaked for Ubuntu terminal fonts
+
+override_git_prompt_colors() {
+	GIT_PROMPT_THEME_NAME="Evermeet_Ubuntu"
+
+	GIT_PROMPT_PREFIX=""                  # start of the git info string
+	GIT_PROMPT_SUFFIX=""                  # the end of the git info string
+	GIT_PROMPT_SEPARATOR="|"              # separates each item
+
+	GIT_PROMPT_BRANCH="${Magenta}"        # the git branch that is active in the current directory
+	GIT_PROMPT_STAGED="${Cyan}● "         # the number of staged files/directories
+	GIT_PROMPT_CONFLICTS="${BoldRed}✖ "   # the number of files in conflict
+	GIT_PROMPT_CHANGED="${Cyan}✚ "        # the number of changed files
+
+	GIT_PROMPT_UNTRACKED="${Cyan}…"       # the number of untracked files/dirs
+	GIT_PROMPT_STASHED="${Magenta}⚑ "     # the number of stashed files/dir
+	GIT_PROMPT_CLEAN="${BoldGreen}✔ "     # a colored flag indicating a "clean" repo
+
+	GIT_PROMPT_UPSTREAM=" {${Magenta}_UPSTREAM_${ResetColor}}"
+
+	GIT_PROMPT_START_USER="[${BoldGreen}\u@\h${ResetColor} ${BoldYellow}\${?}${ResetColor} ${BoldBlue}\w${ResetColor}"
+	GIT_PROMPT_START_ROOT="[${BoldRed}\u@\h${ResetColor} ${BoldYellow}\${?}${ResetColor} ${BoldBlue}\w${ResetColor}"
+	GIT_PROMPT_END_USER="]$ "
+	GIT_PROMPT_END_ROOT="]# "
+
+	GIT_PROMPT_SYMBOLS_NO_REMOTE_TRACKING="⭑ "   # This symbol is written after the branch, if the branch is not tracked
+}
+
+reload_git_prompt_colors "Evermeet_Ubuntu"