fix: existing shortcuts and css tweaks

src/main/frontend/components/onboarding.cljs

@@ -262,6 +262,7 @@
          [:tr [:td (t :help/toggle-doc-mode)] [:td "t d"]]
          [:tr [:td (t :help/toggle-theme)] [:td "t t"]]
          [:tr [:td (t :help/toggle-right-sidebar)] [:td "t r"]]
+         [:tr [:td (t :help/toggle-settings)] [:td "t s"]]
          [:tr [:td (t :help/toggle-insert-new-block)] [:td "t e"]]
          [:tr [:td (t :help/jump-to-journals)] [:td (util/->platform-shortcut "Alt-j")]]]]
        [:table

src/main/frontend/components/settings.css

@@ -1,9 +1,9 @@
 .cp__settings {
   &-main {
-    padding-bottom: 20px;
+    padding: 24px;
 
     > h1.title {
-      margin-bottom: .8rem;
+      margin-bottom: 2rem;
     }
 
     hr {

src/main/frontend/components/sidebar.cljs

@@ -245,19 +245,19 @@
        "?"])))
 
 (rum/defc settings-modal
-  [setting-open?]
+  [settings-open?]
   (rum/use-effect!
    (fn []
-     (if setting-open?
+     (if settings-open?
        (state/set-modal!
         (fn [close-fn]
           (gobj/set close-fn "user-close" #(ui-handler/toggle-settings-modal!))
           [:div.settings-modal (settings/settings)]))
        (state/set-modal! nil))
 
-     (util/lock-global-scroll setting-open?)
+     (util/lock-global-scroll settings-open?)
      #())
-   [setting-open?]) nil)
+   [settings-open?]) nil)
 
 (rum/defcs sidebar <
   (mixins/modal :modal/show?)
@@ -306,7 +306,7 @@
         granted? (state/sub [:nfs/user-granted? (state/get-current-repo)])
         theme (state/sub :ui/theme)
         white? (= "white" (state/sub :ui/theme))
-        setting-open? (state/sub :ui/setting-open?)
+        settings-open? (state/sub :ui/settings-open?)
         sidebar-open?  (state/sub :ui/sidebar-open?)
         route-name (get-in route-match [:data :name])
         global-graph-pages? (= :graph route-name)
@@ -354,7 +354,7 @@
 
         (ui/notification)
         (ui/modal)
-        (settings-modal setting-open?)
+        (settings-modal settings-open?)
         (custom-context-menu)
         [:a#download.hidden]
         (when

src/main/frontend/dicts.cljs

@@ -160,6 +160,7 @@ title: How to take dummy notes?
         :help/toggle-contents "Toggle Contents"
         :help/toggle-theme "Toggle between dark/light theme"
         :help/toggle-right-sidebar "Toggle right sidebar"
+        :help/toggle-settings "Toggle settings"
         :help/toggle-insert-new-block "Toggle Enter/Alt+Enter for inserting new block"
         :help/jump-to-journals "Jump to Journals"
         :formatting "Formatting"
@@ -886,6 +887,7 @@ title: How to take dummy notes?
            :help/toggle-contents "打开/关闭目录"
            :help/toggle-theme "“在暗色/亮色主题之间切换”"
            :help/toggle-right-sidebar "启用/关闭右侧栏"
+           :help/toggle-settings "显示/关闭设置"
            :help/toggle-insert-new-block "切换 Enter/Alt+Enter 以插入新块"
            :help/jump-to-journals "跳转到日记"
            :formatting "格式化"

src/main/frontend/handler/ui.cljs

@@ -34,8 +34,8 @@
         (state/sidebar-add-block! current-repo id :contents nil)))))
 
 (defn toggle-settings-modal!
-  ([] (toggle-settings-modal! (not (:ui/setting-open? @state/state))))
-  ([v] (state/set-state! :ui/setting-open? v)))
+  []
+  (state/toggle-settings!))
 
 ;; FIXME: re-render all embedded blocks since they will not be re-rendered automatically
 

src/main/frontend/keyboards.cljs

@@ -30,13 +30,8 @@
   [f]
   (fn [e]
     (when-not (state/editing?)
-      (f e) true)))
-
-(defn enable-when-editing-mode!
-  [f]
-  (fn [e]
-    (when (state/editing?)
-      (f e) true)))
+      (f e))
+    true))
 
 (def shortcut state/get-shortcut)
 
@@ -53,7 +48,9 @@
        (or (shortcut :ui/toggle-new-block) "t e")
        (enable-when-not-editing-mode! state/toggle-new-block-shortcut!)
        (or (shortcut :ui/show-contents) "t c")
-       [(enable-when-not-editing-mode! ui-handler/toggle-contents!) true]
+       (enable-when-not-editing-mode! ui-handler/toggle-contents!)
+       (or (shortcut :editor/toggle-settings) "t s")
+       (enable-when-not-editing-mode! ui-handler/toggle-settings-modal!)
        (or (shortcut :ui/toggle-between-page-and-file) "s")
        (enable-when-not-editing-mode! route-handler/toggle-between-page-and-file!)
        (or (shortcut :git/commit) "c")
@@ -68,16 +65,9 @@
        (or (shortcut :editor/redo) "mod+shift+z") [history-handler/redo! true]
        (or (shortcut :go/search) "mod+u") [route-handler/go-to-search! true]
        (or (shortcut :go/journals) (if util/mac? "mod+j" "alt+j")) [route-handler/go-to-journals! true]
-       (or (shortcut :editor/zoom-in)
-           (if util/mac? "mod+." "alt+right")) [editor-handler/zoom-in! true]
-       (or (shortcut :editor/zoom-out)
-           (if util/mac? "mod+," "alt+left")) [(fn []
-                                                 ((some-fn apply)
-                                                  (enable-when-editing-mode! editor-handler/zoom-out!)
-                                                  #(if util/mac? (ui-handler/toggle-settings-modal!) true)))
-                                               true]
-       (or (shortcut :editor/cycle-todo)
-           "mod+enter") [editor-handler/cycle-todo! true]
+       (or (shortcut :editor/zoom-in) (if util/mac? "mod+." "alt+right")) [editor-handler/zoom-in! true]
+       (or (shortcut :editor/zoom-out) (if util/mac? "mod+," "alt+left")) [editor-handler/zoom-out! true]
+       (or (shortcut :editor/cycle-todo) "mod+enter") [editor-handler/cycle-todo! true]
        (or (shortcut :editor/expand-block-children) "mod+down") [editor-handler/expand! true]
        (or (shortcut :editor/collapse-block-children) "mod+up") [editor-handler/collapse! true]
        (or (shortcut :editor/follow-link) "mod+o") [editor-handler/follow-link-under-cursor! true]

src/main/frontend/state.cljs

@@ -50,7 +50,7 @@
     :modal/show? false
 
     ;; right sidebar
-    :ui/setting-open? false
+    :ui/settings-open? false
     :ui/sidebar-open? false
     :ui/left-sidebar-open? false
     :ui/theme (or (storage/get :ui/theme) "dark")
@@ -1109,6 +1109,14 @@
   []
   (set-search-result! nil))
 
+(defn toggle!
+  [path]
+  (update-state! path not))
+
+(defn toggle-settings!
+  []
+  (toggle! :ui/settings-open?))
+
 ;; TODO: Move those to the uni `state`
 
 (defonce editor-op (atom nil))

src/main/frontend/ui.cljs

@@ -420,7 +420,7 @@
              "entered" "ease-out duration-300 opacity-100"
              "exiting" "ease-in duration-200 opacity-100"
              "exited" "ease-in duration-200 opacity-0")}
-   [:div.absolute.inset-0.bg-gray-500.opacity-75]])
+   [:div.absolute.inset-0.opacity-75]])
 
 (rum/defc modal-panel
   [panel-content transition-state close-fn]

src/main/frontend/ui.css

@@ -61,9 +61,13 @@
     @apply fixed inset-0 transition-opacity;
   }
 
+  &-overlay div {
+    background: var(--ls-quaternary-background-color);
+  }
+
   &-panel {
     @apply relative bg-white rounded-md px-4 pt-5
-    pb-4 overflow-hidden shadow-xl;
+    pb-4 shadow-xl;
   }
 
   &-close {