From 2fc85473840b0e4c65c6543dc4f1454f4acfda3c Mon Sep 17 00:00:00 2001 From: Kazu Yokomizo Date: Sat, 23 Sep 2017 01:20:39 +0900 Subject: [PATCH 1/2] Fix layout at CreateFolderModal --- browser/main/NoteList/NoteList.styl | 1 + browser/main/modals/CreateFolderModal.styl | 25 +++++++++++----------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/browser/main/NoteList/NoteList.styl b/browser/main/NoteList/NoteList.styl index 892ad3d8..c8023a38 100644 --- a/browser/main/NoteList/NoteList.styl +++ b/browser/main/NoteList/NoteList.styl @@ -2,6 +2,7 @@ $control-height = 30px .root absolute left bottom + bottom 30px top $topBar-height - 1 background-color $ui-noteList-backgroundColor diff --git a/browser/main/modals/CreateFolderModal.styl b/browser/main/modals/CreateFolderModal.styl index 16ca7fba..97fddec7 100644 --- a/browser/main/modals/CreateFolderModal.styl +++ b/browser/main/modals/CreateFolderModal.styl @@ -4,10 +4,9 @@ height 270px overflow hidden position relative - padding 0 40px .header - height 70px + height 80px margin-bottom 10px margin-top 20px font-size 18px @@ -15,23 +14,27 @@ background-color $ui-backgroundColor color $ui-text-color +.title + font-size 36px + font-weight 600 + .control-folder-label text-align left - font-size 12px + font-size 14px color $ui-text-color .control-folder-input display block - height 30px - width 420px + height 40px + width 490px padding 0 5px - margin 10px auto 15px + margin 10px 0 border 1px solid #C9C9C9 // TODO: use variable. border-radius 2px background-color transparent outline none vertical-align middle - font-size 14px + font-size 16px &:disabled background-color $ui-input--disabled-backgroundColor &:focus, &:active @@ -39,14 +42,13 @@ .control-confirmButton display block - float right - height 30px - width 100px + height 35px + width 140px border none border-radius 2px padding 0 25px margin 20px auto - font-size 12px + font-size 14px colorPrimaryButton() body[data-theme="dark"] @@ -56,7 +58,6 @@ body[data-theme="dark"] height 270px overflow hidden position relative - padding 0 40px .header background-color transparent From 5e476054d7755e029ec1249bd77e951ff624aa76 Mon Sep 17 00:00:00 2001 From: Kazu Yokomizo Date: Sat, 23 Sep 2017 01:34:51 +0900 Subject: [PATCH 2/2] Fix layout at NewNoteModal --- browser/main/modals/NewNoteModal.styl | 17 +++++++++-------- browser/styles/index.styl | 6 ++++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/browser/main/modals/NewNoteModal.styl b/browser/main/modals/NewNoteModal.styl index b12a20cf..97b18816 100644 --- a/browser/main/modals/NewNoteModal.styl +++ b/browser/main/modals/NewNoteModal.styl @@ -9,16 +9,19 @@ font-size 18px line-height 50px padding 0 15px - background-color $ui-backgroundColor - border-bottom solid 1px $ui-borderColor color $ui-text-color + margin-bottom 20px + +.title + font-size 36px + font-weight 600 .control - padding 25px 15px 15px + padding 25px 0px text-align center .control-button - width 220px + width 240px height 220px margin 0 15px border $ui-border @@ -30,8 +33,8 @@ colorPrimaryButton() .control-button-icon - font-size 50px - margin-bottom 15px + font-size 48px + margin-bottom 25px .control-button-label font-size 18px @@ -49,8 +52,6 @@ body[data-theme="dark"] modalDark() .header - background-color $ui-dark-button--hover-backgroundColor - border-color $ui-dark-borderColor color $ui-dark-text-color .control-button diff --git a/browser/styles/index.styl b/browser/styles/index.styl index 634f09a2..50cd8f7e 100644 --- a/browser/styles/index.styl +++ b/browser/styles/index.styl @@ -150,8 +150,10 @@ modal() position relative z-index $modal-z-index width 100% - margin-left 40px - margin-right 40px + margin-left 80px + margin-right 80px + margin-bottom 80px + margin-top 100px background-color $modal-background overflow hidden border-radius $modal-border-radius