v1.1.12

mustakshif · Jan 12, 2024 · 30890e7 · 30890e7
1 parent d80ee5b
commit 30890e7
Show file tree

Hide file tree

Showing 9 changed files with 144 additions and 63 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,23 @@
+### v1.1.12
+
+* 优化 `资源面板` 样式
+* 优化菜单中开关项目的上下对齐
+* 优化 `数据库` 菜单中聚焦文本框背景色
+* 统一 `数据库` 按钮和标签的圆角
+* 简化 `数据库` 选中单元格样式
+* 修复 `数据库` 部分菜单背景模糊失效的问题
+
+<br />
+
+* Optimized the style of the `Assets Panel`.
+* Aligned toggle items in menu for better vertical align.
+* Optimized the background color of the focused text box in `Database` menus.
+* Unified the rounding of buttons and labels of `Database`.
+* Simplified the style of selected cells of `Database`.
+* Fixed the issue where the background blur effect was not working properly in some menus of `Database`.
+
+---
+
 ### v1.1.11
 
 * 优化 `命令面板` UI

diff --git a/README.md b/README.md
@@ -10,13 +10,14 @@ An ultra-modern macOS-like theme for [SiYuan Note](https://github.com/siyuan-not
 
 ## Latest Updates
 
-### v1.1.11
-
-* Optimized the `command panel` UI.
-* Aligned `code block` language identifiers.
-* Visually aligned the counter in the `backlink` panel.
-* Fixed the issue where the background blur on the sidebar panel was not working in certain cases.
-* Fixed the color of the highlighted icon in the text editing toolbar.
+### v1.1.12
+
+* Optimized the style of the `Assets Panel`.
+* Aligned toggle items in menu for better vertical align.
+* Optimized the background color of the focused text box in `Database` menus.
+* Unified the rounding of buttons and labels of `Database`.
+* Simplified the style of selected cells of `Database`.
+* Fixed the issue where the background blur effect was not working properly in some menus of `Database`.
 
 Check all updates here 👉 [CHANGELOG](./CHANGELOG.md)
 

diff --git a/README_zh_CN.md b/README_zh_CN.md
@@ -10,13 +10,14 @@ Hadeeth 是一款极富现代感的类 macOS [思源笔记](https://github.com/s
 
 ## 最近更新
 
-### v1.1.11
-
-* 优化 `命令面板` UI
-* 对齐 `代码块` 语言标识
-* 视觉对齐 `反链面板` 计数器
-* 修复部分情况下侧栏面板背景模糊失效的问题
-* 修复文字编辑工具条高亮图标的颜色
+### v1.1.12
+
+* 优化 `资源面板` 样式
+* 优化菜单中开关项目的上下对齐
+* 优化 `数据库` 菜单中聚焦文本框背景色d 
+* 统一 `数据库` 按钮和标签的圆角
+* 简化 `数据库` 选中单元格样式
+* 修复 `数据库` 部分菜单背景模糊失效的问题
 
 查看全部日志 👉 [更新日志](./CHANGELOG.md)
 

diff --git a/assets/banner_v11.png b/assets/banner_v11.png
diff --git a/style/components/menu.scss b/style/components/menu.scss
@@ -46,6 +46,10 @@
                 }
             }
 
+            >.b3-menu__label>.fn__flex {
+                margin: 2px 0 !important;
+            }
+
             // &--show:not(.b3-menu__item--readonly):not([disabled]):not(.b3-menu__item--current) {
             //     background-color:
             //         grayscale(pickThemeColor($theme-light, menu-item-hv-background));
@@ -90,23 +94,23 @@
         }
 
         @media screen and (min-width: 1292px) {
-    
+
             width: auto !important;
             max-height: 65vh;
-    
+
             &>div {
                 column-count: 5;
                 column-gap: 4px;
                 column-rule: 1px solid var(--b3-border-color-trans);
-    
+
                 .b3-list-item {
-    
+
                     .b3-list-item__text {
                         width: max-content;
                         margin-right: 4px;
                     }
                 }
-    
+
                 .b3-menu__separator:not(:nth-of-type(2n + 4)) {
                     break-before: column;
                     margin-bottom: -5px;
@@ -121,7 +125,7 @@
 
         .b3-list-item {
             width: calc(100% - 12px) !important;
-            
+
             &--focus:not(:hover) {
                 background-color: var(--b3-theme-primary-lightest);
             }
@@ -145,6 +149,7 @@
             font-weight: 500;
         }
     }
+
     .b3-list-item--two .b3-list-item__meta.b3-list-item__showall:not(:first-child) {
         padding: 4px 4px 4px 22px;
         width: fit-content;
@@ -184,6 +189,7 @@
 // emoji 面板
 
 .b3-dialog--open .b3-dialog.emojis-container {
+
     // -> js
     .b3-dialog__container {
         background-color: var(--b3-menu-background);
@@ -242,13 +248,46 @@
     }
 }
 
+
 #searchHistoryList {
     background-color: var(--b3-menu-background);
     overflow: auto;
 }
 
-#commonMenu[data-name='search-history'] {
-    .b3-menu__items {
-        max-height: calc(70vh - 10px);
+#commonMenu {
+    &[data-name='search-history'] {
+        .b3-menu__items {
+            max-height: calc(70vh - 10px);
+        }
+    }
+
+    // 资源面板
+    &[data-name="background-asset"] {
+        .b3-menu__items {
+            padding: 0;
+            .b3-menu__item--custom {
+                margin: 0;
+                padding: 0;
+
+                .b3-menu__label>.fn__flex {
+                    margin: 0 !important;
+
+                    .fn__flex-column{
+                        // 搜索框
+                        > .fn__flex:first-child {
+                            margin: 8px !important;
+                        }
+                        // 列表
+                        .b3-list {
+                            padding-bottom: 8px;
+                        }
+                    }
+                }
+            }
+        }
+
+        #preview {
+            >*{border-radius: 4px;}
+        }
     }
 }
diff --git a/style/customizable/blur.scss b/style/customizable/blur.scss
@@ -305,6 +305,11 @@ body:not(.body--blur, .hadeeth-disable-backdrop-blur) {
     .b3-menu__items {
         @include theme-variant-color(background-color, menu-background, $medium-transparency);
     }
+
+    // 数据库菜单
+    .protyle-icons {
+        mix-blend-mode: normal;
+    }
 }
 
 // '/'菜单
@@ -453,7 +458,7 @@ body:not(.body--blur, .hadeeth-disable-backdrop-blur) {
 
 .tooltip {
     @include theme-variant-color(background-color, menu-background, 0.8);
-    @include bg-blur(20px);
+    @include bg-blur($medium-blur-rd);
 }
 
 .protyle-toolbar__item,

diff --git a/style/layout/editor.scss b/style/layout/editor.scss
@@ -370,6 +370,7 @@
         .protyle-action {
             opacity: 0;
         }
+
         .protyle-action__drag {
             top: 50%;
             transform: translateY(-50%);
@@ -391,7 +392,7 @@
     // 表格 ——————————————————————————————————————
     table {
         border-radius: 6px;
-        border: 1px solid var(--b3-border-color-trans);        
+        border: 1px solid var(--b3-border-color-trans);
         width: auto;
 
         td,
@@ -774,7 +775,8 @@
         padding-top: 3px;
         border-radius: 20px;
 
-        &:first-child, &:last-child {
+        &:first-child,
+        &:last-child {
             border-radius: 20px;
         }
 
@@ -993,7 +995,6 @@
 }
 
 // 数据库/属性视图 ————————————————————————————
-
 .av {
 
     // 数据库视图切换、标题
@@ -1061,7 +1062,7 @@
                 border-right-color: var(--b3-border-color-trans);
 
                 .b3-chip {
-                    border-radius: 4px;
+                    border-radius: 20px;
                     padding: 2px 6px;
                     color: var(--b3-theme-on-surface);
                     background-color: var(--b3-theme-surface);
@@ -1093,6 +1094,11 @@
                     text-decoration-thickness: 0.1em;
                 }
 
+                // 复制按钮
+                .block__icon {
+                    border-radius: 20px;
+                }
+
                 &:hover {
                     .block__icon {
                         background-color: var(--b3-theme-surface) !important;
@@ -1104,50 +1110,59 @@
         // 单元格选中状态
         .av__cell--select {
             box-shadow: none;
-            outline: 3px solid var(--b3-theme-primary-light);
-            z-index: 3;
+            // outline: 3px solid var(--b3-theme-primary-light);
+            // z-index: 3;
+            border-radius: 0;
         }
     }
 
     // 菜单
     &__panel {
         .b3-menu {
             .b3-menu__items {
-                .b3-menu__item[data-type="nobg"] {
-                    cursor: default;
-                    align-items: center;
-                    height: 30px;
-
-                    .b3-menu__label {
-                        font-weight: 500;
-                        color: var(--b3-theme-on-surface)
+                .b3-menu__item {
+                    &[data-type="nobg"] {
+                        cursor: default;
+                        align-items: center;
+                        height: 30px;
+
+                        .b3-menu__label {
+                            font-weight: 500;
+                            color: var(--b3-theme-on-surface)
+                        }
+
+                        // ~.b3-menu__item {
+                        //     input:focus {
+                        //         background-color: var(--b3-menu-background);
+                        //     }
+                        // }
                     }
 
-                    // ~.b3-menu__item {
-                    //     input:focus {
-                    //         background-color: var(--b3-menu-background);
-                    //     }
-                    // }
-                }
+                    &[data-type="goUpdateColType"] {
+                        height: 30px;
+                        align-items: center;
+                        margin-top: 4px;
+                    }
 
-                .b3-menu__item[data-type="goUpdateColType"] {
-                    height: 30px;
-                    align-items: center;
-                    margin-top: 4px;
-                }
+                    &[draggable=true] {
+                        mix-blend-mode: normal !important;
+
+                        .b3-chip:not(.b3-chip--primary) {
+                            background-color: var(--b3-theme-surface);
+                        }
 
-                .b3-menu__item[draggable=true] {
-                    mix-blend-mode: normal !important;
+                        &:hover .b3-menu__action {
+                            opacity: 0.7;
 
-                    .b3-chip:not(.b3-chip--primary) {
-                        background-color: var(--b3-theme-surface);
+                            &:hover {
+                                opacity: 1;
+                            }
+                        }
                     }
 
-                    &:hover .b3-menu__action {
-                        opacity: 0.7;
-
-                        &:hover {
-                            opacity: 1;
+                    .b3-menu__label{
+                        input[data-type="addOption"]:focus{
+                            background-color: var(--b3-menu-background);
                         }
                     }
                 }
@@ -1185,7 +1200,7 @@
 
                 .b3-chip--middle,
                 &~div [data-type="addColOptionOrCell"] .b3-chip {
-                    border-radius: 4px;
+                    border-radius: 20px;
                 }
 
                 input {
@@ -1242,8 +1257,8 @@
             }
         }
 
-        &:hover textarea,
-        textarea:focus {
+        &:hover textarea:not([data-type="ocr"]),
+        textarea:not([data-type="ocr"]):focus {
             background-color: var(--b3-menu-background);
             transition: none;
         }

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.1.11",
+  "version": "1.1.12",
   "displayName": {
     "default": "Hadeeth",
     "zh_CN": "Hadeeth",