Browse Source

:lipstick: https://github.com/siyuan-note/siyuan/issues/6417

Vanessa 2 years ago
parent
commit
39feb6bd4b

+ 13 - 9
app/src/assets/scss/_function.scss

@@ -48,6 +48,10 @@
     &-shrink {
     &-shrink {
       flex-shrink: 0;
       flex-shrink: 0;
     }
     }
+
+    &-wrap {
+      flex-wrap: wrap;
+    }
   }
   }
 
 
   &__pointer {
   &__pointer {
@@ -101,15 +105,15 @@
   }
   }
 
 
   &__code {
   &__code {
-      padding: 0.2em 0.4em;
-      margin: 0;
-      font-size: 85%;
-      border-radius: 3px;
-      font-family: var(--b3-font-family-code);
-      word-break: break-word;
-      background-size: 20px 20px;
-      white-space: pre-wrap;
-      background-color: var(--b3-protyle-code-background);
+    padding: 0.2em 0.4em;
+    margin: 0;
+    font-size: 85%;
+    border-radius: 3px;
+    font-family: var(--b3-font-family-code);
+    word-break: break-word;
+    background-size: 20px 20px;
+    white-space: pre-wrap;
+    background-color: var(--b3-protyle-code-background);
   }
   }
 }
 }
 
 

+ 1 - 1
app/src/config/bazaar.ts

@@ -40,7 +40,7 @@ export const bazaar = {
 <div class="fn__flex-1">
 <div class="fn__flex-1">
     <div data-type="theme" class="bazaarPanel" data-init="true">
     <div data-type="theme" class="bazaarPanel" data-init="true">
         <div class="fn__hr"></div>
         <div class="fn__hr"></div>
-        <div class="fn__flex">
+        <div class="fn__flex fn__flex-wrap">
             <div class="fn__space"></div>
             <div class="fn__space"></div>
             <div class="fn__space"></div>
             <div class="fn__space"></div>
             <svg class="svg ft__on-surface fn__flex-center"><use xlink:href="#iconSort"></use></svg>
             <svg class="svg ft__on-surface fn__flex-center"><use xlink:href="#iconSort"></use></svg>

+ 1 - 1
app/src/config/keymap.ts

@@ -45,7 +45,7 @@ export const keymap = {
     </button>
     </button>
 </label>
 </label>
 <div class="b3-label file-tree config-keymap" id="keymapList">
 <div class="b3-label file-tree config-keymap" id="keymapList">
-    <div class="fn__flex">
+    <div class="fn__flex fn__flex-wrap">
         <label class="b3-form__icon fn__flex-1">
         <label class="b3-form__icon fn__flex-1">
             <svg class="b3-form__icon-icon"><use xlink:href="#iconSearch"></use></svg>
             <svg class="b3-form__icon-icon"><use xlink:href="#iconSearch"></use></svg>
             <input id="keymapInput" class="b3-form__icon-input b3-text-field fn__block" placeholder="${window.siyuan.languages.search}">
             <input id="keymapInput" class="b3-form__icon-input b3-text-field fn__block" placeholder="${window.siyuan.languages.search}">

+ 3 - 3
app/src/config/search.ts

@@ -77,9 +77,9 @@ export const initConfigSearch = (element: HTMLElement) => {
             "useFixedPort", "useFixedPortTip", "googleAnalytics", "googleAnalyticsTip"]),
             "useFixedPort", "useFixedPortTip", "googleAnalytics", "googleAnalyticsTip"]),
     ];
     ];
     const inputElement = element.querySelector(".b3-form__icon input") as HTMLInputElement;
     const inputElement = element.querySelector(".b3-form__icon input") as HTMLInputElement;
-    if (window.siyuan.config.system.container !== "ios") {
-        inputElement.focus();
-    }
+    /// #if !BROWSER
+    inputElement.focus();
+    /// #endif
     const updateTab = () => {
     const updateTab = () => {
         const indexList: number[] = [];
         const indexList: number[] = [];
         const inputValue = inputElement.value;
         const inputValue = inputElement.value;