From e68069fd2f1f3bf1442b5f19be68c6ed98d78e8e Mon Sep 17 00:00:00 2001 From: Kazu Yokomizo Date: Sat, 29 Jul 2017 13:40:04 +0900 Subject: [PATCH 1/2] Fix undo button layout at notedetail --- browser/main/Detail/NoteDetailInfo.styl | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/browser/main/Detail/NoteDetailInfo.styl b/browser/main/Detail/NoteDetailInfo.styl index bca687f3..fc71a2f7 100644 --- a/browser/main/Detail/NoteDetailInfo.styl +++ b/browser/main/Detail/NoteDetailInfo.styl @@ -55,7 +55,25 @@ $info-margin-under-border = 27px padding-left 30px .undo-button - topBarButtonLight() + width 34px + height 34px + border-radius 17px + font-size 14px + margin 15px 7px + border none + color $ui-button-color + display flex + align-items center + justify-content center + fill $ui-button-color + background-color transparent + cursor pointer + &:active + border-color $ui-button--active-backgroundColor + &:hover + background-color alpha($ui-button--hover-backgroundColor, 60%) + .control-lockButton-tooltip + opacity 1 body[data-theme="dark"] .info From a49d53179aeee33602aa428836cc9df6e8dfebc2 Mon Sep 17 00:00:00 2001 From: Kazu Yokomizo Date: Sat, 29 Jul 2017 13:49:45 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Change=20=E2=80=9CTrashed=E2=80=9D=20to=20?= =?UTF-8?q?=E2=80=9CTrash=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- browser/components/SideNavFilter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/components/SideNavFilter.js b/browser/components/SideNavFilter.js index cce4d5d0..d6bc7642 100644 --- a/browser/components/SideNavFilter.js +++ b/browser/components/SideNavFilter.js @@ -34,7 +34,7 @@ const SideNavFilter = ({ onClick={handleTrashedButtonClick} > - Trashed + Trash )