Skip to content

Commit

Permalink
modified: CHANGELOG.md
Browse files Browse the repository at this point in the history
	modified:   README.md
	modified:   README_zh_CN.md
	modified:   style/_base.scss
	modified:   style/components/dialog.scss
	modified:   style/components/menu.scss
	modified:   style/components/misc.scss
	modified:   theme.css
	modified:   theme.json
  • Loading branch information
mustakshif committed Dec 28, 2023
1 parent a673a8c commit 8ae1148
Show file tree
Hide file tree
Showing 9 changed files with 59 additions and 35 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
### v1.0.9

* 优化搜索列表按文档分组时被选中条目的样式
* 优化 emoji 选单底部导航的图标显示
* 微调正文字体颜色,页面呈现更柔和
* 修复暗色模式下 Windows 端选单背景颜色异常的问题


* Optimized the style of selected items in the search list when grouped by documents.
* Improved the display of icons in the bottom navigation of the emoji menu.
* Fine-tuned the font color of the body text for a softer page rendering.
* Fixed an issue where the background color of select menus were abnormal in dark mode on Windows.

---

### v1.0.8

* 优化搜索列表按文档分组显示
Expand Down
22 changes: 9 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ An ultra-modern macOS-like theme for [SiYuan Note](https://github.com/siyuan-not
## Theme Features

* 📃 Top bar hidden, window drag area adjusted for maximum display space.
* 📌 Quickly access the top bar by hovering over the area with interactive icons on the left and right sides of the top of the window.
* 📌 Window drag area adjusted to **blank areas** of:
* ❗️ Quickly access the top bar by hovering over the area with icons on the left and right sides of the top of the window.
* ❗️ Window drag area adjusted to **blank areas** of:
* **Tab bar (not toolbar/top bar)**
* **Breadcrumb**
* **Sidebar panel title and above**
Expand All @@ -21,15 +21,15 @@ An ultra-modern macOS-like theme for [SiYuan Note](https://github.com/siyuan-not
* 📐 Extra spacing between layout blocks removed, expanding overall display range.
* 🌓 Light and dark modes supported.
* 🗂️ File tree and outline indent guides line added.
* 🔗 Backlink list display optimized.
* 🔍 Search list and backlink list display optimized.
* ⚙️ Styles of iFrame, videos, images, and other controls redesigned.
* 🧊 Glassmorphism introduced, enhancing the visual hierarchy.
* 💫 Lively effects added appropriately, enriching the interaction experience.
* 🚀 High level of performance maintained.
* ↕️ Applied system scrollbar on macOS, which can be hidden automatically and reduce visual interference.
* 🚥 Position of traffic lights on macOS adjusted, optimizing the layout rhythm.

* 📌 You will need to restart the application after switching to another theme to restore the traffic light to its default position.
* ❗️ You will need to restart the application after switching to another theme to restore the traffic light to its default position.
* ...

## How to use
Expand All @@ -41,16 +41,12 @@ An ultra-modern macOS-like theme for [SiYuan Note](https://github.com/siyuan-not

Latest updates:

### v1.0.8
### v1.0.9

* Improved the display of grouped search results.
* Fixed the issue where the theme README.md could not be found.

### v1.0.7

* 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.
* Optimized the style of selected items in the search list when grouped by documents.
* Improved the display of icons in the bottom navigation of the emoji menu.
* Fine-tuned the font color of the body text for a softer page rendering.
* Fixed an issue where the background color of select menus were abnormal in dark mode on Windows.

Check all updates here 👉 [CHANGELOG](./CHANGELOG.md)

Expand Down
16 changes: 6 additions & 10 deletions README_zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Hadeeth 是一款极富现代感的类 macOS [思源笔记](https://github.com/s
* 📐 取消页面区块间的多余间距,扩大展示范围
* 🌓 支持亮色模式和暗色模式
* 🗂️ 添加文档树、大纲缩进参考线
* 🔗 优化反链列表展示
* 🔍 优化搜索列表、反链列表展示
* ⚙️ 重新设计 iFrame、视频、图片等控件样式
* 🧊 引入毛玻璃材质,带来富有层次感的视觉体验
* 💫 适当加入鲜活动效,丰富交互体验
Expand All @@ -43,16 +43,12 @@ Hadeeth 是一款极富现代感的类 macOS [思源笔记](https://github.com/s

最近更新:

### v1.0.8
### v1.0.9

* 优化搜索列表按文档分组显示
* 修复主题简介无法找到的问题

### v1.0.7

* 重新设计文档标签,改为单色样式,与题头图更好地融合
* 重新设计搜索列表和搜索结果高亮,优化按文档分组显示
* 去除设置菜单设置项之间的分割线
* 优化搜索列表按文档分组时被选中条目的样式
* 优化 emoji 选单底部导航的图标显示
* 微调正文字体颜色,页面呈现更柔和
* 修复暗色模式下 Windows 端选单背景颜色异常的问题

查看全部日志 👉 [更新日志](./CHANGELOG.md)

Expand Down
4 changes: 2 additions & 2 deletions style/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ $theme-light: (
error: rgb(234, 77, 60),
on-primary: #fff,
on-secondary: #fff,
on-background: rgb(38, 38, 38),
on-background: rgb(69, 69, 69),
on-surface-gray: rgb(127, 127, 127),
border: hsl(0, 0%, 90%),
scroll: rgba(0, 0, 0, 0.2),
Expand Down Expand Up @@ -243,7 +243,7 @@ $theme-dark: (
error: rgb(255, 59, 48),
on-primary: #ffffffe3,
on-secondary: #fff,
on-background: rgb(222, 222, 222),
on-background: rgb(220, 220, 220),
on-surface-gray: rgb(127, 127, 127),
border: hsl(0, 0%, 26%),
scroll: rgba(255, 255, 255, 0.2),
Expand Down
20 changes: 17 additions & 3 deletions style/components/dialog.scss
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,9 @@
}

// 搜索 ————————————————————————————————————
&[data-key="dialog-globalsearch"] {
&[data-key="dialog-globalsearch"],
&[data-key="dialog-search"],
&[data-key="dialog-replace"] {
.b3-dialog__container {
.b3-dialog__body {
.search__layout {
Expand Down Expand Up @@ -477,6 +479,14 @@
}
}

#replaceBtn, #replaceAllBtn {
@include button-action('primary') {
background-color: transparent;
padding: 2px 8px;
box-shadow: none;
}
}

#searchList {
[data-type="search-item"] {
flex-wrap: wrap;
Expand All @@ -490,7 +500,7 @@
}

.b3-list-item__text {
@include theme-variant-color(color, on-background, 0.8);
@include theme-variant-color(color, on-background, 0.9);

font-weight: 500;
line-height: 1.5;
Expand Down Expand Up @@ -544,6 +554,10 @@
padding: 4px;
// margin-left: 40px;
// padding-left: 4px !important;

&.b3-list-item--focus {
background-color: var(--b3-theme-primary-lightest);
}
}
}
}
Expand Down Expand Up @@ -586,7 +600,7 @@
}

&.search-mark--hl {
@include menu-shadow(map-get($theme-light, primary), $opacity-light: 0.2);
@include menu-shadow(map-get($theme-light, primary), $opacity-light: 0.15);
mix-blend-mode: normal;
background-color: var(--b3-theme-primary-lighter) !important;
color: var(--b3-theme-on-background) !important;
Expand Down
1 change: 1 addition & 0 deletions style/components/menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@

&__panel+.fn__flex {
border-top: 1px solid var(--b3-border-color);
font-family: var(--b3-font-family-emoji);

.emojis__type {
padding: 4px 0;
Expand Down
6 changes: 4 additions & 2 deletions style/components/misc.scss
Original file line number Diff line number Diff line change
Expand Up @@ -139,17 +139,19 @@ select.b3-select {
box-shadow: none;
}


// 以下解决文本框聚焦时外框被裁切的情况
// .config__panel .config__tab-container .fn__flex-1:has(>&) {
// overflow: visible;
// }
}


select.b3-select {
&:hover {
&:hover,
&:focus {
background-color: var(--b3-menu-background);
}
//focus 修复暗色模式下 Windows 端选单背景颜色异常
}

textarea {
Expand Down
2 changes: 1 addition & 1 deletion theme.css

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions theme.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
"name": "Hadeeth",
"author": "MUSTAKSHIF",
"url": "https://github.com/mustakshif/Hadeeth",
"version": "1.0.8",
"version": "1.0.9",
"displayName": {
"default": "Hadeeth",
"zh_CN": "Hadeeth",
"en_US": "Hadeeth"
},
"description": {
"default": "极富现代感的类 macOS 主题,以轻量、极简的风格,带来优雅、高效的笔记体验。",
"zh_CN": "极富现代感的类 macOS 主题,以轻量、极简的风格,带来优雅、高效的笔记体验。",
"en_US": "An ultra-modern macOS-like theme that offers a lightweight and minimalistic style, providing an elegant and efficient note-taking experience."
"default": "极富现代感的类 macOS 主题,以轻量、极简的风格,带来优雅、高效的笔记体验。ps:如果找不到顶栏,那一定是没看第一节的第一点👇",
"zh_CN": "极富现代感的类 macOS 主题,以轻量、极简的风格,带来优雅、高效的笔记体验。ps:如果找不到顶栏,那一定是没看第一节的第一点👇",
"en_US": "An ultra-modern macOS-like theme that offers a lightweight and minimalistic style, providing an elegant and efficient note-taking experience. ps: If you can't find the top bar, you must have missed the first point of the first section👇"
},
"readme": {
"default": "README_zh_CN.md",
Expand Down

0 comments on commit 8ae1148

Please sign in to comment.