modified: CHANGELOG.md

modified: README.md modified: README_zh_CN.md modified: style/components/dialog.scss modified: theme.css modified: theme.json
mustakshif · Dec 27, 2023 · 3db0b16 · 3db0b16
1 parent 729738f
commit 3db0b16
Show file tree

Hide file tree

Showing 6 changed files with 141 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+### v1.0.7
+
+* 重新设计文档标签，改为单色样式，与题头图更好地融合
+* 重新设计搜索列表和搜索结果高亮，优化按文档分组显示
+* 去除设置菜单设置项之间的分割线
+
+<br />
+
+* Redesigned document tags by using a monocolor style, improving their integration with the header image.
+* Redesigned the search list and search results highlight, and enhanced the display of grouped search list.
+* Removed dividing lines between the options in settings.
+
+---
+
 ### v1.0.6
 
 * 优化代码块字体列表，代码块中文字体同正文字体

diff --git a/README.md b/README.md
@@ -41,18 +41,11 @@ An ultra-modern macOS-like theme for [SiYuan Note](https://github.com/siyuan-not
 
 Latest updates:
 
-### v1.0.6
+### v1.0.7
 
-* Optimized the font list of code blocks, making Chinese characters in code blocks consistent with the regular text.
-* Redesigned the marketplace project detail page.
-* Fixed the issue where the top bar and status bar were displaying abnormally on mobile devices.
-* Fixed the issue of the right margin not working for the tab bar in mini windows.
-
-### v1.0.5
-
-* Optimized the style of `Flashcard - Spaced Repetition` dialog.
-* Optimized the style of graph configuration panel.
-* Adjusted the list style when folded.
+* Redesigned document tags by using a monocolor style, improving their integration with the header image.
+* Redesigned the search list and search results highlight, and enhanced the display of grouped search list.
+* Removed dividing lines between the options in settings.
 
 Check all updates here 👉 [CHANGELOG](./CHANGELOG.md)
 
@@ -70,7 +63,7 @@ The theme development process drew inspiration from the following themes, and I
 | Reference Content                                                 | From Theme | Developer |
 | ---------------------------------------------------------- | ---------- | ------ |
 | Menu background blur                                             | [Cliff-Dark](https://github.com/chenshinshi/Cliff-Dark)         | [Crowds21](https://github.com/chenshinshi)     |
-|Toolbar hiding<br />Dots before sidebar panel list items<br />Outline list item icons<br />Status bar | [Savor](https://github.com/royc01/notion-theme)         | [Roy](https://github.com/royc01)     |
+|Toolbar hiding<br />Dots before sidebar panel list items<br />Outline list item icons<br />Status bar<br />Seach list | [Savor](https://github.com/royc01/notion-theme)         | [Roy](https://github.com/royc01)     |
 | File tree indent guides<br />`setMutationObserver` function                                      | [Rem Craft](https://github.com/svchord/Rem-Craft)         | [Seven Chord](https://github.com/svchord)     |
 
 （The order in the list above does not imply any ranking）

diff --git a/README_zh_CN.md b/README_zh_CN.md
@@ -43,18 +43,11 @@ Hadeeth 是一款极富现代感的类 macOS [思源笔记](https://github.com/s
 
 最近更新：
 
-### v1.0.6
+### v1.0.7
 
-* 优化代码块字体列表，代码块中文字体同正文字体
-* 优化集市项目详情页设计
-* 修复移动端顶栏、状态栏显示异常的问题
-* 修复小窗页签栏右边距失效的问题
-
-### v1.0.5
-
-* 优化 `闪卡 - 间隔复习` 窗口样式
-* 优化关系图配置面板样式
-* 调整列表项折叠时序号样式
+* 重新设计文档标签，改为单色样式，与题头图更好地融合
+* 重新设计搜索列表和搜索结果高亮，优化按文档分组显示
+* 去除设置菜单设置项之间的分割线
 
 查看全部日志 👉 [更新日志](./CHANGELOG.md)
 
@@ -72,7 +65,7 @@ Hadeeth 是一款极富现代感的类 macOS [思源笔记](https://github.com/s
 | 借鉴内容                                                 | 来自主题 | 作者 |
 | ---------------------------------------------------------- | ---------- | ------ |
 | 菜单背景模糊                                             | [Cliff-Dark](https://github.com/chenshinshi/Cliff-Dark)         | [Crowds21](https://github.com/chenshinshi)     |
-| 隐藏顶栏<br />侧栏面板列表项前圆点<br />大纲列表标题图标<br />状态栏 | [Savor](https://github.com/royc01/notion-theme)         | [Roy](https://github.com/royc01)     |
+| 隐藏顶栏<br />侧栏面板列表项前圆点<br />大纲列表标题图标<br />状态栏<br />搜索列表 | [Savor](https://github.com/royc01/notion-theme)         | [Roy](https://github.com/royc01)     |
 | 文档树缩进线<br />`setMutationObserver` 函数                                      | [Rem Craft](https://github.com/svchord/Rem-Craft)         | [Seven Chord](https://github.com/svchord)     |
 
 (以上排名不分先后)

diff --git a/style/components/dialog.scss b/style/components/dialog.scss
@@ -469,6 +469,121 @@
     }
 }
 
+#searchList {
+    background-color: var(--b3-theme-surface);
+
+    [data-type="search-item"] {
+        flex-wrap: wrap;
+        padding: 4px;
+        justify-content: flex-end;
+
+        .b3-list-item__graphic {
+            align-self: flex-start;
+            transform: translateY(20%);
+            color: var(--b3-theme-on-surface);
+        }
+
+        .b3-list-item__text {
+            @include theme-variant-color(color, on-background, 0.8);
+
+            font-weight: 500;
+            line-height: 1.5;
+            flex-shrink: 0;
+            flex-basis: calc(100% - 44px);
+            -webkit-line-clamp: 2;
+
+            mark {
+                background-color: transparent;
+                color: var(--b3-theme-primary);
+            }
+        }
+
+        .b3-list-item__meta {
+            // 备注文本等
+            .b3-list-item__hinttext {
+                line-height: 1;
+                padding: 4px 0;
+            }
+            // 文档路径
+            &--ellipsis {
+                max-width: calc(100% - 22px);
+                padding: 8px 0 8px 8px;
+                line-height: 1;
+            }
+        }
+    }
+
+    // 分组设置为“按文档分组”
+    >.b3-list-item:not([data-type="search-item"]) {
+        margin: 0;
+        padding: 0 8px;
+        border-radius: 0;
+        position: sticky;
+        top: -8px;
+        background-color: var(--b3-theme-surface);
+        z-index: 1;
+
+        .b3-list-item__toggle--hl:hover {
+            background-color: transparent;
+        }
+
+        &:hover .b3-list-item__text {
+            color: var(--b3-theme-on-background) !important;
+        }
+
+        +div>.b3-list-item {
+            min-height: unset;
+            margin-left: 40px;
+            padding-left: 4px !important;
+        }
+    }
+}
+
+// 水平布局
+.search__layout:not(.search__layout--row){
+    #searchList {
+        [data-type="search-item"] {    
+            .b3-list-item__graphic {
+                align-self: center;
+                transform: none;
+            }
+
+            span.b3-list-item__graphic{
+                margin-right: 0;
+                font-size: 14px;
+            }
+
+            .b3-list-item__text {  
+                flex-shrink: 1;
+                flex-basis: 0;
+                -webkit-line-clamp: 1;
+            }
+        }
+    }
+}
+
+// 高亮
+.protyle-wysiwyg [data-node-id] span[data-type~=search-mark] {
+    border-radius: 4px;
+    padding: 2px;
+    margin: 0 -2px;
+    mix-blend-mode: multiply;
+    -webkit-box-decoration-break: clone;
+    background-color: var(--b3-protyle-inline-mark-background) !important;
+    color: var(--b3-theme-on-background) !important;
+
+    @include darkmode-counterpart {
+        mix-blend-mode: normal;
+    }
+
+    &.search-mark--hl {
+        @include menu-shadow(map-get($theme-light, primary), $opacity-light: 0.2);
+        mix-blend-mode: normal;
+        background-color: var(--b3-theme-primary-lighter) !important;
+        color: var(--b3-theme-on-background) !important;
+    }
+}
+
 // 随机题头图列表
 .b3-dialog__body {
     position: relative;

diff --git a/theme.css b/theme.css
diff --git a/theme.json b/theme.json
@@ -2,7 +2,7 @@
   "name": "Hadeeth",
   "author": "MUSTAKSHIF",
   "url": "https://github.com/mustakshif/Hadeeth",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "displayName": {
     "default": "Hadeeth",
     "zh_CN": "Hadeeth",