We use cookies to ensure you get the best experience on our website
Home Explore Help
Register Sign In
0ct0pu5
/
siyuan
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

:lipstick: fix https://github.com/siyuan-note/siyuan/issues/6765

Vanessa 2 years ago
parent
457e96929c
commit
beae15377a
5 changed files with 20 additions and 16 deletions
Unified View Show Diff Stats
  1. 3 0
      app/src/assets/scss/_function.scss
  2. 1 1
      app/src/layout/index.ts
  3. 4 4
      app/src/protyle/export/index.ts
  4. 10 10
      app/src/search/util.ts
  5. 2 1
      app/src/util/pathName.ts

+ 3 - 0
app/src/assets/scss/_function.scss
View File 

@@ -1,4 +1,7 @@
 
 .fn {
 
 .fn {
 
+  &__hidescrollbar::-webkit-scrollbar {
 
+    display: none;
 
+  }
 
 
 
   &__ellipsis {
 
   &__ellipsis {
 
     @include text-clamp(1);
 
     @include text-clamp(1);

+ 1 - 1
app/src/layout/index.ts
View File 

@@ -96,7 +96,7 @@ export class Layout {
 
         resizeTabs();
 
         resizeTabs();
 
         // https://ld246.com/article/1669858316295
 
         // https://ld246.com/article/1669858316295
 
         if (this.direction === "tb") {
 
         if (this.direction === "tb") {
 
-            child.element.style.minHeight = "64px"
 
+            child.element.style.minHeight = "64px";
 
         }
 
         }
 
         child.parent = this;
 
         child.parent = this;
 
     }
 
     }

+ 4 - 4
app/src/protyle/export/index.ts
View File 

@@ -72,10 +72,10 @@ const renderPDF = (id: string) => {
 
         keepFold: false,
 
         keepFold: false,
 
     }));
 
     }));
 
     const servePath = window.location.protocol + "//" + window.location.host;
 
     const servePath = window.location.protocol + "//" + window.location.host;
 
-    const isDefault = (window.siyuan.config.appearance.mode === 1 && window.siyuan.config.appearance.themeDark === "midnight") || (window.siyuan.config.appearance.mode === 0 && window.siyuan.config.appearance.themeLight === "daylight")
 
+    const isDefault = (window.siyuan.config.appearance.mode === 1 && window.siyuan.config.appearance.themeDark === "midnight") || (window.siyuan.config.appearance.mode === 0 && window.siyuan.config.appearance.themeLight === "daylight");
 
     let themeStyle = "";
 
     let themeStyle = "";
 
     if (!isDefault) {
 
     if (!isDefault) {
 
-        themeStyle = `<link rel="stylesheet" type="text/css" id="themeStyle" href="${servePath}/appearance/themes/${window.siyuan.config.appearance.themeLight}/${window.siyuan.config.appearance.customCSS ? "custom" : "theme"}.css?${Constants.SIYUAN_VERSION}"/>`
 
+        themeStyle = `<link rel="stylesheet" type="text/css" id="themeStyle" href="${servePath}/appearance/themes/${window.siyuan.config.appearance.themeLight}/${window.siyuan.config.appearance.customCSS ? "custom" : "theme"}.css?${Constants.SIYUAN_VERSION}"/>`;
 
     }
 
     }
 
     const html = `<!DOCTYPE html><html>
 
     const html = `<!DOCTYPE html><html>
 
 <head>
 
 <head>
 
@@ -484,10 +484,10 @@ const onExport = (data: IWebSocketData, filePath: string, type: string, removeAs
 
         themeName = window.siyuan.config.appearance.themeDark;
 
         themeName = window.siyuan.config.appearance.themeDark;
 
         mode = 1;
 
         mode = 1;
 
     }
 
     }
 
-    const isDefault = (window.siyuan.config.appearance.mode === 1 && window.siyuan.config.appearance.themeDark === "midnight") || (window.siyuan.config.appearance.mode === 0 && window.siyuan.config.appearance.themeLight === "daylight")
 
+    const isDefault = (window.siyuan.config.appearance.mode === 1 && window.siyuan.config.appearance.themeDark === "midnight") || (window.siyuan.config.appearance.mode === 0 && window.siyuan.config.appearance.themeLight === "daylight");
 
     let themeStyle = "";
 
     let themeStyle = "";
 
     if (!isDefault) {
 
     if (!isDefault) {
 
-        themeStyle = `<link rel="stylesheet" type="text/css" id="themeStyle" href="appearance/themes/${themeName}/${window.siyuan.config.appearance.customCSS ? "custom" : "theme"}.css?${Constants.SIYUAN_VERSION}"/>`
 
+        themeStyle = `<link rel="stylesheet" type="text/css" id="themeStyle" href="appearance/themes/${themeName}/${window.siyuan.config.appearance.customCSS ? "custom" : "theme"}.css?${Constants.SIYUAN_VERSION}"/>`;
 
     }
 
     }
 
     const html = `<!DOCTYPE html><html>
 
     const html = `<!DOCTYPE html><html>
 
 <head>
 
 <head>

+ 10 - 10
app/src/search/util.ts
View File 

@@ -203,9 +203,9 @@ export const genSearch = (config: ISearchOption, element: Element, closeCB?: ()
 
                 config.hPath = "";
 
                 config.hPath = "";
 
                 element.querySelector("#searchPathInput").innerHTML = config.hPath;
 
                 element.querySelector("#searchPathInput").innerHTML = config.hPath;
 
                 inputTimeout = inputEvent(element, config, inputTimeout, edit, false);
 
                 inputTimeout = inputEvent(element, config, inputTimeout, edit, false);
 
-                const includeElement = element.querySelector("#searchInclude")
 
-                includeElement.classList.remove("b3-button--cancel")
 
-                includeElement.setAttribute("disabled", "disabled")
 
+                const includeElement = element.querySelector("#searchInclude");
 
+                includeElement.classList.remove("b3-button--cancel");
 
+                includeElement.setAttribute("disabled", "disabled");
 
                 event.stopPropagation();
 
                 event.stopPropagation();
 
                 event.preventDefault();
 
                 event.preventDefault();
 
                 break;
 
                 break;
 
@@ -249,12 +249,12 @@ export const genSearch = (config: ISearchOption, element: Element, closeCB?: ()
 
                         }
 
                         }
 
                         config.hPath = escapeHtml(hPathList.join(" "));
 
                         config.hPath = escapeHtml(hPathList.join(" "));
 
                         element.querySelector("#searchPathInput").innerHTML = `${config.hPath}<svg class="search__rmpath"><use xlink:href="#iconClose"></use></svg>`;
 
                         element.querySelector("#searchPathInput").innerHTML = `${config.hPath}<svg class="search__rmpath"><use xlink:href="#iconClose"></use></svg>`;
 
-                        const includeElement = element.querySelector("#searchInclude")
 
-                        includeElement.classList.remove("b3-button--cancel")
 
+                        const includeElement = element.querySelector("#searchInclude");
 
+                        includeElement.classList.remove("b3-button--cancel");
 
                         if (enableIncludeChild) {
 
                         if (enableIncludeChild) {
 
-                            includeElement.removeAttribute("disabled")
 
+                            includeElement.removeAttribute("disabled");
 
                         } else {
 
                         } else {
 
-                            includeElement.setAttribute("disabled", "disabled")
 
+                            includeElement.setAttribute("disabled", "disabled");
 
                         }
 
                         }
 
                         inputTimeout = inputEvent(element, config, inputTimeout, edit, false);
 
                         inputTimeout = inputEvent(element, config, inputTimeout, edit, false);
 
                     });
 
                     });
 
@@ -263,7 +263,7 @@ export const genSearch = (config: ISearchOption, element: Element, closeCB?: ()
 
                 event.preventDefault();
 
                 event.preventDefault();
 
                 break;
 
                 break;
 
             } else if (target.id === "searchInclude") {
 
             } else if (target.id === "searchInclude") {
 
-                target.classList.toggle("b3-button--cancel")
 
+                target.classList.toggle("b3-button--cancel");
 
                 if (target.classList.contains("b3-button--cancel")) {
 
                 if (target.classList.contains("b3-button--cancel")) {
 
                     config.idPath.forEach((item, index) => {
 
                     config.idPath.forEach((item, index) => {
 
                         if (!item.endsWith(".sy") && item.split("/").length > 1) {
 
                         if (!item.endsWith(".sy") && item.split("/").length > 1) {
 
@@ -686,7 +686,7 @@ const addConfigFilterMenu = (config: ISearchOption, edit: Protyle, element: Elem
 
     <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
 
     <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
 
 </div>`,
 
 </div>`,
 
         width: "520px",
 
         width: "520px",
 
-    })
 
+    });
 
     const btnsElement = filterDialog.element.querySelectorAll(".b3-button");
 
     const btnsElement = filterDialog.element.querySelectorAll(".b3-button");
 
     btnsElement[0].addEventListener("click", () => {
 
     btnsElement[0].addEventListener("click", () => {
 
         filterDialog.destroy();
 
         filterDialog.destroy();
 
@@ -694,7 +694,7 @@ const addConfigFilterMenu = (config: ISearchOption, edit: Protyle, element: Elem
 
     btnsElement[1].addEventListener("click", () => {
 
     btnsElement[1].addEventListener("click", () => {
 
         filterDialog.element.querySelectorAll(".b3-switch").forEach((item: HTMLInputElement) => {
 
         filterDialog.element.querySelectorAll(".b3-switch").forEach((item: HTMLInputElement) => {
 
             config.types[item.getAttribute("data-type") as TSearchFilter] = item.checked;
 
             config.types[item.getAttribute("data-type") as TSearchFilter] = item.checked;
 
-        })
 
+        });
 
         inputEvent(element, config, undefined, edit);
 
         inputEvent(element, config, undefined, edit);
 
         filterDialog.destroy();
 
         filterDialog.destroy();
 
     });
 
     });

+ 2 - 1
app/src/util/pathName.ts
View File 

@@ -96,7 +96,8 @@ export const movePathTo = (cb: (toPath: string[], toNotebook: string[]) => void,
 
         return;
 
         return;
 
     }
 
     }
 
     const dialog = new Dialog({
 
     const dialog = new Dialog({
 
-        title: `${title || window.siyuan.languages.move} <span class="ft__smaller ft__on-surface"></span>`,
 
+        title: `${title || window.siyuan.languages.move}
 
+<div style="max-height: 14px;overflow: auto;line-height: 14px;-webkit-mask-image: linear-gradient(to top, rgba(0, 0, 0, 0) 0, #000 6px);padding-bottom: 4px;margin-bottom: -4px" class="ft__smaller ft__on-surface fn__hidescrollbar"></div>`,
 
         content: `<div>
 
         content: `<div>
 
     <div class="b3-form__icon" style="margin: 8px">
 
     <div class="b3-form__icon" style="margin: 8px">
 
         <svg class="b3-form__icon-icon"><use xlink:href="#iconSearch"></use></svg>
 
         <svg class="b3-form__icon-icon"><use xlink:href="#iconSearch"></use></svg>

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5