From 29d908274177bb1a0ac9d1054bb0edf5155bf80a Mon Sep 17 00:00:00 2001 From: XiaozhiSans Date: Sun, 9 Jun 2024 12:10:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20=E4=B8=BA=E5=85=8D=E6=9C=AC=E5=9C=B0=E5=8C=96?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=8F=90=E4=BE=9B=E6=94=AF=E6=8C=81=20?= =?UTF-8?q?=E5=AD=97=E4=BD=93=E6=94=B9=E7=94=A8jsdelivr=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README-sch.md => README-zh.md | 0 README.md | 2 +- dist/all.init.css | 3 ++- dist/all.init.js | 3 +-- dist/libs/fonts.css | 36 +++++++++++++++++------------------ dist/libs/main.css | 2 +- dist/lite.init.js | 2 +- dist/oreuicfg.json | 11 ++++++----- 8 files changed, 30 insertions(+), 29 deletions(-) rename README-sch.md => README-zh.md (100%) diff --git a/README-sch.md b/README-zh.md similarity index 100% rename from README-sch.md rename to README-zh.md diff --git a/README.md b/README.md index 4217d41..e188b29 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@
-[简体中文](README-sch.md) | English +[简体中文](README-zh.md) | English language translations may not be 100% acc diff --git a/dist/all.init.css b/dist/all.init.css index 227a0ff..2b66530 100644 --- a/dist/all.init.css +++ b/dist/all.init.css @@ -1,4 +1,5 @@ -@import url(./libs/fonts.css); +/* @import url(./libs/fonts.css); */ +@import url(https://cdn.jsdelivr.net/gh/XiaozhiSans/ore-ui-web/dist/libs/fonts.css); @import url(./libs/icons.css); @import url(./libs/images.css); @import url(./libs/main.css); diff --git a/dist/all.init.js b/dist/all.init.js index 7ed06e4..e577f2a 100644 --- a/dist/all.init.js +++ b/dist/all.init.js @@ -3,11 +3,10 @@ * license: cc by-nc-sa 4.0 * code by XiaozhiSans */ -import data from "./oreuicfg.json" with {type:"json"}; +import cfg from "./oreuicfg.json" with {type:"json"}; import {info} from "./libs/info.js"; import {sounds, playSound} from "./libs/sounds.js"; import {oreui} from "./libs/main.js"; -const cfg = data; globalThis.playSound = playSound, globalThis.sounds = sounds; diff --git a/dist/libs/fonts.css b/dist/libs/fonts.css index a28e8b6..09cf097 100644 --- a/dist/libs/fonts.css +++ b/dist/libs/fonts.css @@ -1,93 +1,93 @@ @font-face { - font-family: Minecraft Ten v2; + font-family: "Minecraft Ten v2"; src: url(../fonts/Minecraft-Ten-ed29a.otf); } @font-face { - font-family: Minecraft Seven v2; + font-family: "Minecraft Seven v2"; src: url(../fonts/Minecraft-Seven-66398.otf); } @font-face { - font-family: Minecraft Five v2; + font-family: "Minecraft Five v2"; src: url(../fonts/Minecraft-Five-48bb3.otf); } @font-face { - font-family: Minecraft Five v2; + font-family: "Minecraft Five v2"; font-weight: 700; src: url(../fonts/Minecraft-Five-Bold-4ded8.otf); } @font-face { - font-family: Noto Sans; + font-family: "Noto Sans"; font-weight: 700; src: url(../fonts/NotoSans-Bold-14d47.ttf); } @font-face { - font-family: Noto Sans; + font-family: "Noto Sans"; font-style: italic; font-weight: 700; src: url(../fonts/NotoSans-BoldItalic-30174.ttf); } @font-face { - font-family: Noto Sans; + font-family: "Noto Sans"; font-style: italic; src: url(../fonts/NotoSans-Italic-11442.ttf); } @font-face { - font-family: Noto Sans JP; + font-family: "Noto Sans JP"; src: url(../fonts/NotoSansJP-Regular-aaed5.otf); } @font-face { - font-family: Noto Sans JP Regular; + font-family: "Noto Sans JP Regular"; src: url(../fonts/NotoSansJP-Regular-aaed5.otf); } @font-face { - font-family: Noto Sans KR; + font-family: "Noto Sans KR"; src: url(../fonts/NotoSansKR-Regular-8625b.otf); } @font-face { - font-family: Noto Sans SC; + font-family: "Noto Sans SC"; src: url(../fonts/NotoSansSC-Regular-a4317.otf); } @font-face { - font-family: Noto Sans TC; + font-family: "Noto Sans TC"; src: url(../fonts/NotoSansTC-Regular-2eeaf.otf); } @font-face { - font-family: Noto Sans AR; + font-family: "Noto Sans AR"; src: url(../fonts/NotoSansArabic-Regular-9137a.ttf); } @font-face { - font-family: Noto Sans Mongolian; + font-family: "Noto Sans Mongolian"; src: url(../fonts/NotoSansMongolian-Regular-f4200.ttf); } @font-face { - font-family: Noto Sans Syriac; + font-family: "Noto Sans Syriac"; src: url(../fonts/NotoSansSyriac-Regular-1bff6.ttf); } @font-face { - font-family: Noto Sans TamilSupplement; + font-family: "Noto Sans TamilSupplement"; src: url(../fonts/NotoSansTamilSupplement-Regular-a407d.ttf); } @font-face { - font-family: Noto Sans; + font-family: "Noto Sans"; src: url(../fonts/NotoSansMerged-Regular-5df70.ttf); } html { - --oreui: Minecraft Seven v2, Noto Sans, Noto Sans SC, Noto Sans TC, Noto Sans JP, Noto Sans KR, Noto Sans Mongolian, Noto Sans Syriac, Noto Sans TamilSupplement; + --oreui: "Minecraft Seven v2", "Noto Sans", "Noto Sans SC", "Noto Sans TC", "Noto Sans JP", "Noto Sans KR", "Noto Sans Mongolian", "Noto Sans Syriac", "Noto Sans TamilSupplement"; } \ No newline at end of file diff --git a/dist/libs/main.css b/dist/libs/main.css index 3bfe62f..02b9b0d 100644 --- a/dist/libs/main.css +++ b/dist/libs/main.css @@ -75,7 +75,7 @@ body { overflow: hidden; } h1.title { - font-family: Minecraft Ten v2, "Noto Sans SC"; + font-family: "Minecraft Ten v2", "Noto Sans SC"; font-weight: bold; font-size: 30px; } diff --git a/dist/lite.init.js b/dist/lite.init.js index d3a36b6..98a74e2 100644 --- a/dist/lite.init.js +++ b/dist/lite.init.js @@ -3,4 +3,4 @@ * license: cc by-nc-sa 4.0 * code by XiaozhiSans */ -import data from "./oreuicfg.json" with {type:"json"};import {info as i} from "./libs/info.js";const c = data;document.addEventListener("DOMContentLoaded",()=>{try{let l=document.createElement("link");l.rel="stylesheet";l.type="text/css";l.href=c.path+"all.init.css";document.querySelector("head").appendChild(l);console.log(`[oreui] init oreui successful, version: ${i.version}(${i.date})`);}catch(error){console.warn("[oreui] init oreui faild. ", error);}}); \ No newline at end of file +import c from "./oreuicfg.json" with {type:"json"};import {info as i} from "./libs/info.js";document.addEventListener("DOMContentLoaded",()=>{try{let l=document.createElement("link");l.rel="stylesheet";l.type="text/css";l.href=c.path+"all.init.css";document.querySelector("head").appendChild(l);console.log(`[oreui] init oreui successful, version: ${i.version}(${i.date})`);}catch(error){console.warn("[oreui] init oreui faild. ", error);}}); \ No newline at end of file diff --git a/dist/oreuicfg.json b/dist/oreuicfg.json index a837d03..7aa5fad 100644 --- a/dist/oreuicfg.json +++ b/dist/oreuicfg.json @@ -1,8 +1,9 @@ { - "path": "dist/", + "path": "https://xiaozhisans.off.pw/ore-ui-web/dist/", + "部署本地请修改为`你的域名/{oreui路径}/dist/`": 0, "button_click_sound": true, - "comment": "点击按钮音效,开启后给`:not(.--no-click-sound, .-nocs)`以及非顶栏按钮添加`sounds.click`点击音效", + "点击按钮音效,开启后给`:not(.--no-click-sound, .-nocs)`以及非顶栏按钮添加`sounds.click`点击音效": 0, "check_update": false, - "comment_0": "还没写,不管改成什么都不会工作(", - "comment_1": "你问我为什么这么写注释?es6的json模块太严了,不许注释,就只能这么写咯 (￣▽￣)\"" -} \ No newline at end of file + "还没写,不管改成什么都不会工作(": 0, + "你问我为什么这么写注释?es6的json模块太严了,不许注释,就只能这么写咯 (￣▽￣)\"": 0 +}