From d88de65345bc06936b6707196c444a028c441a67 Mon Sep 17 00:00:00 2001 From: Seeridia Date: Fri, 29 Nov 2024 20:50:00 +0800 Subject: [PATCH] Version - 2.0.0-beta.2 --- README-CN.md | 14 ++- README.md | 4 + alto.css | 96 +++++++++++++----- lapis.css => alto/lapis.css | 0 {lapis => alto/lapis}/Cantarell-VF-fixed.otf | Bin .../lapis}/JetBrainsMono-Regular.ttf | Bin .../lapis}/SourceHanSerifCN-Bold.otf | Bin .../lapis}/SourceHanSerifCN-Medium.otf | Bin 8 files changed, 85 insertions(+), 29 deletions(-) rename lapis.css => alto/lapis.css (100%) rename {lapis => alto/lapis}/Cantarell-VF-fixed.otf (100%) rename {lapis => alto/lapis}/JetBrainsMono-Regular.ttf (100%) rename {lapis => alto/lapis}/SourceHanSerifCN-Bold.otf (100%) rename {lapis => alto/lapis}/SourceHanSerifCN-Medium.otf (100%) diff --git a/README-CN.md b/README-CN.md index 768ef91..9c67b85 100644 --- a/README-CN.md +++ b/README-CN.md @@ -1,5 +1,9 @@ Typora Theme Alto +> [!NOTE] +> 目前 Alto v2 暂时以 [Pre-release]((https://github.com/Seeridia/typora-theme-alto/releases)) 的方式发布，目前项目主分支即为 v2-beta +> 如需使用 Alto v1 可以前往 [Releases](https://github.com/Seeridia/typora-theme-alto/releases/latest) 下载 + ## 简介 **Alto 迎来了第二代！** @@ -9,8 +13,6 @@ Alto 为更现代更优雅的 Typora 界面而生，目前已完全支持 [Lapis 请在 “**一体化**” 界面下，使用 Alto -目前 Alto v2.0.0 暂时以 pre-release 的方式发布 - ## 预览 ![](./imgs/Preview1.png) @@ -41,4 +43,10 @@ Alto 为更现代更优雅的 Typora 界面而生，目前已完全支持 [Lapis - 如果你不会，那请开始学吧，以及，我也是刚开始学的，所以会出现很多不成熟的代码，请谅解 - 或许会有制作 Alto 自己完整主题的想法，但现在没什么空…… -![](./imgs/Header.png) \ No newline at end of file +![](./imgs/Header.png) + +## 主题支持与颜色 + +| 主题 | 颜色 | +| --- | --- | +| [Lapis](https://github.com/YiNNx/typora-theme-lapis) | \ No newline at end of file diff --git a/README.md b/README.md index bd935c1..5bd571d 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,10 @@

+> [!NOTE] +> Currently, Alto v2 is released as a [Pre-release](https://github.com/Seeridia/typora-theme-alto/releases), with the main branch of the project being v2-beta. +> If you need to use Alto v1, you can download it from the [Releases](https://github.com/Seeridia/typora-theme-alto/releases/latest) page. + ## Introduce **Welcome to the second generation of Alto!** diff --git a/alto.css b/alto.css index 33ac332..1d7f251 100644 --- a/alto.css +++ b/alto.css @@ -2,11 +2,24 @@ * Typora Theme - Alto / Author - Seeridia * https://github.com/Seeridia/typora-theme-alto * - * Version - 2.0.0-beta.1 + * Version - 2.0.0-beta.2 */ + +/* + * 主题配置 / Theme Configuration +*/ + @import "lapis.css"; +:root { + + --alto-accent-color: #487dac; + --alto-main-color: #e8f4ff; + +} + + /* * 说明 / Instructions @@ -15,9 +28,9 @@ Choose your favorite theme and apply the Alto interface! @import "github.css"; @import "newsprint.css"; -@import "night.css"; @import "whitey.css"; @import "pixyll.css"; +@import "alto/lapis.css"; 默认是 Lapis 主题，你可以在上面的代码中选择你喜欢的主题，然后替换上方的 '@import "lapis.css";' ，重启 Typora 即可。 The default is Lapis theme, you can choose your favorite theme from the code above and replace '@import "lapis.css";' with the theme you like, then restart Typora. @@ -26,33 +39,51 @@ The default is Lapis theme, you can choose your favorite theme from the code abo Other third-party themes can be downloaded and replaced with the code above, but they may not be fully adapted, please test them by yourself. You can also request the adaptation by submitting an issue or submitting a PR to contribute code. -Enjoy! - */ /* * 参考颜色 / Reference color -目前仅有一直蓝色，其他颜色正在找...... -Current only has a blue color, other colors are being found... +--alto-accent-color 强调色 +--alto-main-color 侧边栏颜色 + +你可以根据第三方主题和你的喜好来决定颜色，这里也给出参考颜色。 +You can choose the color based on the third-party theme and your preference. Here are some reference colors. + +更多颜色正在寻找... +More colors are being sought... -Blue 蓝 ---alto-main-color: #487dac; ---alto-bg-color: #e8f4ff; + * Blue 蓝 +--alto-accent-color: #487dac; +--alto-main-color: #e8f4ff; + + * Pink 粉 +--alto-accent-color: #d49fc3; +--alto-main-color: #ffe7f0; */ -:root { +/* + * 对于主动修改第三方主题颜色 / For modifying the color of third-party themes + +如果你想仅修改第三方主题颜色去搭配 Alto 主题，不妨去相应主题的css文件里找找颜色变量。 +If you want to modify only the color of the third-party theme to match Alto, +you can look for the color variable in the CSS file of the corresponding theme. - /* Alto Own Color */ - --alto-main-color: #487dac; - --alto-bg-color: #e8f4ff; +以 Lapis 主题为例，你可以在下方的 `:root` 中添加以下代码以修改颜色： + +--primary-color: var(--alto-accent-color); +--bg-color: var(--alto-main-color); + +*/ + + +:root { --alto-content-color: #fff; - --bg-color: var(--alto-bg-color); } html { - background-color: var(--alto-bg-color); + background-color: var(--alto-main-color); } /* @@ -72,12 +103,12 @@ content { background-color: var(--alto-content-color); border-radius: 8px !important; margin: 2px 8px 8px 8px; - } /* 书写区域鼠标移入的动画 */ content:hover { margin: 0px 5px 5px 5px; + box-shadow: 0 6px 8px rgba(0, 0, 0, 0.08), 0 2px 4px rgba(0, 0, 0, 0.06); } @@ -115,6 +146,10 @@ footer.ty-footer { margin-bottom: 0px; } +footer.stopselect.ty-footer { + background-color: transparent; +} + /* * 侧边栏 * Sidebar @@ -175,7 +210,7 @@ footer.ty-footer { } .file-node-icon.fa.fa-folder { - color: var(--alto-main-color); + color: var(--alto-accent-color); } .file-node-on-edi, @@ -219,6 +254,15 @@ footer.ty-footer { box-shadow: 0 6px 8px rgba(0, 0, 0, 0.08), 0 2px 4px rgba(0, 0, 0, 0.06); } +/* 侧边栏最近任务展开图标 */ +.ty-side-sort-btn.active { + color: var(--alto-accent-color); +} + +.selected-folder-menu-item a:after { + color: var(--alto-accent-color); +} + .sidebar-footer-item:hover { background: none; } @@ -243,8 +287,8 @@ footer.ty-footer { } .dropdown-menu>li>a:hover { - background: #f9fffd; - border-radius: 7px; + background: var(--alto-main-color); + border-radius: 4px; } /* @@ -280,7 +324,7 @@ footer.ty-footer { font-size: 2rem; font-weight: normal; margin-bottom: 10px; - color: var(--alto-main-color); + color: var(--alto-accent-color); } #recent-file-panel tbody tr { @@ -289,7 +333,7 @@ footer.ty-footer { } #recent-file-panel tbody tr:hover { - background-color: var(--alto-bg-color); + background-color: var(--alto-main-color); } #recent-file-panel-search-input, @@ -301,7 +345,7 @@ footer.ty-footer { .megamenu-menu-panel { margin-top: 0px !important; - border-bottom: 1px solid var(--alto-main-color); + border-bottom: 1px solid var(--alto-accent-color); padding-bottom: 30px; padding-top: 30px; margin-right: 20px; @@ -341,12 +385,12 @@ footer.ty-footer { background-color: transparent; border-top-right-radius: 6px; border-bottom-right-radius: 6px; - color: var(--alto-main-color); + color: var(--alto-accent-color); font-weight: bold; } .megamenu-menu-list li a.active { - border-left: var(--alto-main-color) solid 3px; + border-left: var(--alto-accent-color) solid 3px; } .megamenu-menu-list:not(.saved) li a:hover { @@ -377,7 +421,7 @@ footer.ty-footer { header, #megamenu-content { background-image: none !important; - background-color: var(--alto-bg-color); + background-color: var(--alto-main-color) !important; } #recent-document-table { @@ -386,5 +430,5 @@ header, /* 部分主题的提示 Pandoc 下载没有高亮 */ .open-pandoc-guide { - color: var(--alto-main-color) !important; + color: var(--alto-accent-color) !important; } \ No newline at end of file diff --git a/lapis.css b/alto/lapis.css similarity index 100% rename from lapis.css rename to alto/lapis.css diff --git a/lapis/Cantarell-VF-fixed.otf b/alto/lapis/Cantarell-VF-fixed.otf similarity index 100% rename from lapis/Cantarell-VF-fixed.otf rename to alto/lapis/Cantarell-VF-fixed.otf diff --git a/lapis/JetBrainsMono-Regular.ttf b/alto/lapis/JetBrainsMono-Regular.ttf similarity index 100% rename from lapis/JetBrainsMono-Regular.ttf rename to alto/lapis/JetBrainsMono-Regular.ttf diff --git a/lapis/SourceHanSerifCN-Bold.otf b/alto/lapis/SourceHanSerifCN-Bold.otf similarity index 100% rename from lapis/SourceHanSerifCN-Bold.otf rename to alto/lapis/SourceHanSerifCN-Bold.otf diff --git a/lapis/SourceHanSerifCN-Medium.otf b/alto/lapis/SourceHanSerifCN-Medium.otf similarity index 100% rename from lapis/SourceHanSerifCN-Medium.otf rename to alto/lapis/SourceHanSerifCN-Medium.otf