diff --git a/app/src/assets/scss/_list.scss b/app/src/assets/scss/_list.scss index e7f92db88..edb0375bb 100644 --- a/app/src/assets/scss/_list.scss +++ b/app/src/assets/scss/_list.scss @@ -18,6 +18,31 @@ list-style: none; } + &--border { + ul { + margin-left: 34px; + position: relative; + } + + & > ul ul:before { + content: ""; + height: 100%; + top: 0; + position: absolute; + border-left: 1px solid var(--b3-theme-background-light); + left: -55px; + } + + & > ul li:before { + content: ""; + height: 100%; + top: 0; + position: absolute; + border-left: 1px solid var(--b3-theme-background-light); + left: -21px; + } + } + &-item { line-height: 28px; padding: 1px 8px; diff --git a/app/src/assets/scss/base.scss b/app/src/assets/scss/base.scss index 4f80f9476..6f664dd78 100644 --- a/app/src/assets/scss/base.scss +++ b/app/src/assets/scss/base.scss @@ -261,15 +261,6 @@ progressLoading: 400 } .config { - - &-keymap__item-name:before{ - content:""; - height: 100%; - top: 0; - position: absolute; - border-left: 1px solid var(--b3-theme-background-light); - left: -21px; - } &-query { display: flex; flex-wrap: wrap; diff --git a/app/src/config/keymap.ts b/app/src/config/keymap.ts index 81a45e0db..b1631fbca 100644 --- a/app/src/config/keymap.ts +++ b/app/src/config/keymap.ts @@ -7,12 +7,12 @@ import {exportLayout} from "../layout/util"; export const keymap = { element: undefined as Element, - _genItem(keymap: Record, left: number, keys: string) { + _genItem(keymap: Record, keys: string) { let html = ""; Object.keys(keymap).forEach(key => { if (window.siyuan.languages[key]) { - html += `
  • - ${window.siyuan.languages[key]} + html += `
  • + ${window.siyuan.languages[key]} @@ -52,56 +52,56 @@ export const keymap = {
    -
      -
    • - +
        +
      • + ${window.siyuan.languages.general}
      • -
          ${keymap._genItem(window.siyuan.config.keymap.general, 24, "general")}
        +
          ${keymap._genItem(window.siyuan.config.keymap.general, "general")}
      -
        -
      • - +
          +
        • + ${window.siyuan.languages.editor}
          • -
          • - +
          • + ${window.siyuan.languages.general}
          • -
              ${keymap._genItem(window.siyuan.config.keymap.editor.general, 40, "editor" + Constants.ZWSP + "general")}
            -
          • - +
              ${keymap._genItem(window.siyuan.config.keymap.editor.general, "editor" + Constants.ZWSP + "general")}
            +
          • + ${window.siyuan.languages.insert}
          • -
              ${keymap._genItem(window.siyuan.config.keymap.editor.insert, 40, "editor" + Constants.ZWSP + "insert")}
            -
          • - +
              ${keymap._genItem(window.siyuan.config.keymap.editor.insert, "editor" + Constants.ZWSP + "insert")}
            +
          • + ${window.siyuan.languages.headings}
          • -
              ${keymap._genItem(window.siyuan.config.keymap.editor.heading, 40, "editor" + Constants.ZWSP + "heading")}
            -
          • - +
              ${keymap._genItem(window.siyuan.config.keymap.editor.heading, "editor" + Constants.ZWSP + "heading")}
            +
          • + ${window.siyuan.languages.list1}
          • -
              ${keymap._genItem(window.siyuan.config.keymap.editor.list, 40, "editor" + Constants.ZWSP + "list")}
            -
          • - +
              ${keymap._genItem(window.siyuan.config.keymap.editor.list, "editor" + Constants.ZWSP + "list")}
            +
          • + ${window.siyuan.languages.table}
          • -
              ${keymap._genItem(window.siyuan.config.keymap.editor.table, 40, "editor" + Constants.ZWSP + "table")}
            +
              ${keymap._genItem(window.siyuan.config.keymap.editor.table, "editor" + Constants.ZWSP + "table")}
        `;