Skip to content

Commit

Permalink
Merge pull request #815 from Hi-Windom/v0.35
Browse files Browse the repository at this point in the history
V0.35
  • Loading branch information
Soltus authored Jun 7, 2024
2 parents a22ed90 + 5b2f944 commit fce80d1
Show file tree
Hide file tree
Showing 82 changed files with 4,974 additions and 4,402 deletions.
8 changes: 6 additions & 2 deletions .github/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,11 @@
</p>

<p align="center">
<br><br>
<br>
<img alt="split" src="./split.png"/>
<br><br><br>
</p>

<!-- https://github.com/kyechan99/capsule-render -->
<p align="center">
<img src="https://capsule-render.vercel.app/api?type=waving&color=timeGradient&height=300&&section=footer&text=Hi-Windom&fontSize=90&fontAlign=50&fontAlignY=70&desc=Power%20by%20&descAlign=50&descSize=30&descAlignY=40&animation=twinkling" />
</p>
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ lerna-debug.log*
package-lock.json
yarn.lock

# workflows
# Workflows
**/__pycache__

# Sillot extend
Expand Down
20 changes: 13 additions & 7 deletions .vscode/Sillot.code-workspace
Original file line number Diff line number Diff line change
@@ -1,28 +1,34 @@
{
"folders": [
{
"path": "..",
"name": "汐洛🤍/ 🗂️"
"path": "..", // 必填
"name": "汐洛🤍/ 🗂️", // 必填
"url": "https://github.com/Hi-Windom/Sillot" // 仅描述,无效字段
},
{
"path": "../kernel", // 列出子文件夹,在父文件夹的 setting.json 添加隐藏(排除)
"name": "汐洛版思源内核🤍/kernel 🗂️"
"name": "汐洛绞架内核🤍/kernel 🗂️",
"url": "https://github.com/Hi-Windom/Sillot/kernel"
},
{
"path": "../app/appearance", // 列出子文件夹,在父文件夹的 setting.json 添加隐藏(排除)
"name": "汐洛版思源美化🤍/app/appearance 🗂️"
"name": "汐洛绞架美化🤍/app/appearance 🗂️",
"url": "https://github.com/Hi-Windom/Sillot/app/appearance"
},
{
"path": "../.vscode/extensions/Sillot", // 列出子文件夹,在父文件夹的 setting.json 添加隐藏(排除)
"name": "汐洛 VSC 扩展🤍/.vscode/extensions/Sillot 🗂️"
"name": "汐洛 VSC 扩展🤍/.vscode/extensions/Sillot 🗂️",
"url": "https://github.com/Hi-Windom/Sillot/.vscode/extensions/Sillot"
},
{
"path": "../docs/starlight", // 列出子文件夹,在父文件夹的 setting.json 添加隐藏(排除)
"name": "汐洛宝典🤍/docs/starlight 🗂️"
"name": "汐洛宝典🤍/docs/starlight 🗂️",
"url": "https://github.com/Hi-Windom/Sillot/docs/starlight"
},
{
"path": "../../Sillot-android", // 开发在 Android Studio 完成,这里列出只是方便 Git 管理
"name": "汐洛安卓🤍../Sillot-android 🗂️"
"name": "汐洛安卓🤍../Sillot-android 🗂️",
"url": "https://github.com/Hi-Windom/Sillot-android"
},
{
"path": "../../sofillBuilder", // 沁棘开发仓库(暂未开源)
Expand Down
4 changes: 2 additions & 2 deletions .vscode/extensions/Sillot/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "sillot",
"displayName": "汐洛 Sillot",
"description": "汐洛彖夲肜矩阵(Sillot T☳Converbenk Matrix)为智慧新彖务服务。此插件为汐洛官方插件,提供多功能一体化集成。",
"version": "0.35.2600",
"version": "0.35.2810",
"preview": true,
"repository": "https://github.com/Hi-Windom/Sillot",
"publisher": "Hi-Windom",
Expand Down Expand Up @@ -459,5 +459,5 @@
"fs-extra": "^11.2.0",
"json5": "^2.2.3"
},
"packageManager": "pnpm@9.1.4"
"packageManager": "pnpm@9.2.0"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import * as path from "path";
export function add_task_运行工作区脚本文件(context: vscode.ExtensionContext) {
const disposable = vscode.commands.registerCommand("sillot.运行工作区脚本文件", async () => {
let batFiles: vscode.Uri[] | undefined = undefined;
const limiter1 = 58;
const limiter1 = 31;
const fileNameStartWith = "workspace-";
// 使用 withProgress 显示进度
vscode.window
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ENV GO111MODULE=on
ENV CGO_ENABLED=1
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential && \
cd kernel && go build --tags fts5 -v -ldflags "-s -w -X github.com/Hi-Windom/Sillot/kernel/util.Mode=prod" && \
cd kernel && go build --tags fts5 -v -ldflags "-s -w" && \
mkdir /opt/Sillot/ && \
rm /Hi-Windom/Sillot/app/appearance/langs/zh_CHT.json && \
rm /Hi-Windom/Sillot/app/appearance/langs/fr_FR.json && \
Expand Down
4 changes: 2 additions & 2 deletions app/appearance/langs/zh_CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@
"insertImgURL": "插入图片链接",
"insertIframeURL": "插入 IFrame 链接",
"context": "上下文",
"dockTip": "\n单击 展开/最小化\n右键 调整位置",
"dockTip": "\n单击 <span class='ft__on-surface ft__nowrap'>展开/最小化</span>\n右键/拖拽 <span class='ft__on-surface ft__nowrap'>调整位置</span>",
"shadow": "投影",
"hollow": "镂空",
"attrValue1": "属性值留空则会自动删除该属性",
Expand Down Expand Up @@ -860,7 +860,7 @@
"insertBefore": "光标所在块前插入空块",
"insertAfter": "光标所在块后插入空块",
"list1": "列表",
"insert": "插入元素",
"element": "元素",
"closeTab": "关闭当前页签",
"keymap": "快捷键",
"clearFontStyle": "清除样式",
Expand Down
Empty file.
164 changes: 0 additions & 164 deletions app/appearance/themes/_lnco/dark/theme.css

This file was deleted.

Loading

0 comments on commit fce80d1

Please sign in to comment.