From 61cdac230f66231844119d385458bf1588c34e1c Mon Sep 17 00:00:00 2001
From: Benjamin Andresen <bandresen@gmail.com>
Date: Sat, 23 Jun 2018 16:25:58 +0200
Subject: [PATCH] ui/vc emacs/vc: unify hydra design

this design will also break less based on the fonts
---
 modules/emacs/vc/config.el     | 10 +++++-----
 modules/ui/vc-gutter/config.el | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/emacs/vc/config.el b/modules/emacs/vc/config.el
index 7558f4be4..5100cbea4 100644
--- a/modules/emacs/vc/config.el
+++ b/modules/emacs/vc/config.el
@@ -72,15 +72,15 @@
                            ;; no merge conflicts remain.
                            :post (smerge-auto-leave))
     "
-                                                    ╭────────┐
-  Movement   Keep           Diff              Other │ smerge │
-  ╭─────────────────────────────────────────────────┴────────╯
+                                                         [smerge]
+  Movement   Keep           Diff              Other
+  ╭─────────────────────────────────────────────────────────╯
      ^_g_^       [_b_] base       [_<_] upper/base    [_C_] Combine
      ^_C-k_^     [_u_] upper      [_=_] upper/lower   [_r_] resolve
      ^_k_ ↑^     [_l_] lower      [_>_] base/lower    [_R_] remove
      ^_j_ ↓^     [_a_] all        [_H_] hightlight
-     ^_C-j_^     [_RET_] current  [_E_] ediff             ╭──────────
-     ^_G_^                                            │ [_q_] quit"
+     ^_C-j_^     [_RET_] current  [_E_] ediff                 ╭──────────
+     ^_G_^                                                │ [_q_] quit"
     ("g" (progn (goto-char (point-min)) (smerge-next)))
     ("G" (progn (goto-char (point-max)) (smerge-prev)))
     ("C-j" smerge-next)
diff --git a/modules/ui/vc-gutter/config.el b/modules/ui/vc-gutter/config.el
index 5c8417ead..e13239d43 100644
--- a/modules/ui/vc-gutter/config.el
+++ b/modules/ui/vc-gutter/config.el
@@ -54,15 +54,15 @@ to the right fringe.")
   (defhydra +version-control@git-gutter
     (:body-pre (git-gutter-mode 1) :hint nil)
     "
-                                     ╭─────────────────┐
-  Movement   Hunk Actions     Misc.  │ gg: +%-4s(car (git-gutter:statistic))/ -%-3s(cdr (git-gutter:statistic)) │
-  ╭──────────────────────────────────┴─────────────────╯
+                                               [git gutter]
+   Movement  Hunk Actions     Misc.         +%-4s(car (git-gutter:statistic))/ -%-4s(cdr (git-gutter:statistic))
+  ╭──────────────────────────────────┴────────────────╯
      ^_g_^       [_s_] stage        [_R_] set start Rev
      ^_k_^       [_r_] revert
      ^↑ ^      [_m_] mark
-     ^↓ ^      [_p_] popup          ╭──────────────────────
-     ^_j_^                          │[_q_] quit
-     ^_G_^                          │[_Q_] Quit and disable"
+     ^↓ ^      [_p_] popup             ╭─────────────────────
+     ^_j_^                             │[_q_] quit
+     ^_G_^                             │[_Q_] Quit and disable"
     ("j" (progn (git-gutter:next-hunk 1) (recenter)))
     ("k" (progn (git-gutter:previous-hunk 1) (recenter)))
     ("g" (progn (goto-char (point-min)) (git-gutter:next-hunk 1)))