From f10f9b6a176fe0e66ca5da47cb01327dbb52499b Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Tue, 23 Oct 2018 05:41:42 -0700 Subject: [PATCH] ui: ensure more consistent quiet style in horizontal borders (#838) --- hledger-ui/Hledger/UI/Theme.hs | 2 +- hledger-ui/Hledger/UI/UIUtils.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hledger-ui/Hledger/UI/Theme.hs b/hledger-ui/Hledger/UI/Theme.hs index 47ba74b19..4e25606af 100644 --- a/hledger-ui/Hledger/UI/Theme.hs +++ b/hledger-ui/Hledger/UI/Theme.hs @@ -74,7 +74,7 @@ themesList = [ (borderAttr <> "bold", white `on` black & bold), (borderAttr <> "query", cyan `on` black & bold), (borderAttr <> "depth", yellow `on` black & bold), - (borderAttr <> "keys", black `on` white & bold), +-- (borderAttr <> "keys", black `on` white & bold), (borderAttr <> "minibuffer", white `on` black & bold), -- ("normal" , black `on` white), ("list" , black `on` white), -- regular list items diff --git a/hledger-ui/Hledger/UI/UIUtils.hs b/hledger-ui/Hledger/UI/UIUtils.hs index c2f82fc4e..5e238ba8d 100644 --- a/hledger-ui/Hledger/UI/UIUtils.hs +++ b/hledger-ui/Hledger/UI/UIUtils.hs @@ -221,11 +221,11 @@ topBottomBorderWithLabels toplabel bottomlabel body = "" -- " debug: "++show (_w,h') render $ - hBorderWithLabel (toplabel <+> str debugmsg) + hBorderWithLabel (withAttr borderAttr $ toplabel <+> str debugmsg) <=> body' <=> - hBorderWithLabel bottomlabel + hBorderWithLabel (withAttr borderAttr bottomlabel) ---- XXX should be equivalent to the above, but isn't (page down goes offscreen) --_topBottomBorderWithLabel2 :: Widget Name -> Widget Name -> Widget Name