diff --git a/browser/main/Detail/DetailVars.styl b/browser/main/Detail/DetailVars.styl index a4e3d93d..ad492c54 100644 --- a/browser/main/Detail/DetailVars.styl +++ b/browser/main/Detail/DetailVars.styl @@ -5,3 +5,5 @@ // Margin on the left side and the right side for NoteDetail component. $note-detail-left-margin = 25px $note-detail-right-margin = 25px + +$note-detail-box-shadow = 2px 0 15px -8px #b1b1b1 inset diff --git a/browser/main/Detail/MarkdownNoteDetail.styl b/browser/main/Detail/MarkdownNoteDetail.styl index 5144464a..e23296a4 100644 --- a/browser/main/Detail/MarkdownNoteDetail.styl +++ b/browser/main/Detail/MarkdownNoteDetail.styl @@ -7,6 +7,7 @@ border-style solid border-color $ui-borderColor background-color $ui-noteDetail-backgroundColor + box-shadow $note-detail-box-shadow .body absolute left right @@ -22,3 +23,4 @@ body[data-theme="dark"] .root border-color $ui-dark-borderColor background-color $ui-dark-noteDetail-backgroundColor + box-shadow none diff --git a/browser/main/Detail/SnippetNoteDetail.styl b/browser/main/Detail/SnippetNoteDetail.styl index db0690b4..9356f6b2 100644 --- a/browser/main/Detail/SnippetNoteDetail.styl +++ b/browser/main/Detail/SnippetNoteDetail.styl @@ -7,6 +7,7 @@ border-style solid border-color $ui-borderColor background-color $ui-noteDetail-backgroundColor + box-shadow $note-detail-box-shadow .body absolute left right @@ -70,6 +71,7 @@ body[data-theme="dark"] .root border-color $ui-dark-borderColor background-color $ui-dark-noteDetail-backgroundColor + box-shadow none .body background-color $ui-dark-noteDetail-backgroundColor diff --git a/browser/main/Main.styl b/browser/main/Main.styl index b703f52c..29f21f04 100644 --- a/browser/main/Main.styl +++ b/browser/main/Main.styl @@ -16,9 +16,7 @@ .slider-right @extend .slider - z-index $right-slider-z-index width 1px - box-shadow 0 2px 10px 0px #b1b1b1 .slider--active @extend .slider diff --git a/browser/main/NoteList/NoteList.styl b/browser/main/NoteList/NoteList.styl index 89af2a94..0adb3678 100644 --- a/browser/main/NoteList/NoteList.styl +++ b/browser/main/NoteList/NoteList.styl @@ -4,7 +4,6 @@ $control-height = 30px absolute left bottom top $topBar-height - 1 background-color $ui-noteList-backgroundColor - z-index $notelist-z-index .control absolute top left right diff --git a/browser/main/StatusBar/StatusBar.styl b/browser/main/StatusBar/StatusBar.styl index e2bfb2d8..6c14b86b 100644 --- a/browser/main/StatusBar/StatusBar.styl +++ b/browser/main/StatusBar/StatusBar.styl @@ -1,9 +1,12 @@ +@import('../Detail/DetailVars') + .root absolute bottom left right height $statusBar-height background-color $ui-noteDetail-backgroundColor border-top $ui-border display flex + box-shadow $note-detail-box-shadow .blank flex 1 @@ -41,6 +44,7 @@ body[data-theme="dark"] .root background-color $ui-dark-noteDetail-backgroundColor border-color $ui-dark-borderColor + box-shadow none .zoom border-color $ui-dark-borderColor diff --git a/browser/main/TopBar/TopBar.styl b/browser/main/TopBar/TopBar.styl index 18d3eb43..9eccccb4 100644 --- a/browser/main/TopBar/TopBar.styl +++ b/browser/main/TopBar/TopBar.styl @@ -2,7 +2,6 @@ position relative background-color $ui-noteList-backgroundColor height $topBar-height - 1 - z-index $topbar-z-index .root--expanded @extend .root @@ -61,6 +60,7 @@ $control-height = 34px overflow ellipsis &:hover background-color alpha($ui-active-color, 10%) + .control-search-optionList-item-folder border-left 4px solid transparent padding 2px 5px @@ -69,14 +69,17 @@ $control-height = 34px font-size 12px height 16px margin-bottom 4px + .control-search-optionList-item-folder-surfix font-size 10px margin-left 5px color $ui-inactive-text-color + .control-search-optionList-item-type font-size 12px color $ui-inactive-text-color padding-right 3px + .control-search-optionList-empty height 150px color $ui-inactive-text-color diff --git a/browser/styles/index.styl b/browser/styles/index.styl index 206935aa..bfd6e865 100644 --- a/browser/styles/index.styl +++ b/browser/styles/index.styl @@ -10,11 +10,6 @@ $sideNav-width = 200px $sideNav--folded-width = 44px $topBar-height = 60px -// z-index -$topbar-z-index = 20 -$notelist-z-index = 20 -$right-slider-z-index = 10 - // UI default $ui-text-color = #515151 $ui-inactive-text-color = #939395