Skip to content
This repository has been archived by the owner on Nov 2, 2024. It is now read-only.

Commit

Permalink
修复一些问题
Browse files Browse the repository at this point in the history
为免本地化加载提供支持
字体改用jsdelivr加载
  • Loading branch information
latedreamdev committed Jun 9, 2024
1 parent 7881cd6 commit 29d9082
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 29 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div align="right">

[简体中文](README-sch.md) | English
[简体中文](README-zh.md) | English

<sup>language translations may not be 100% acc</sup>

Expand Down
3 changes: 2 additions & 1 deletion dist/all.init.css
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
3 changes: 1 addition & 2 deletions dist/all.init.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
36 changes: 18 additions & 18 deletions dist/libs/fonts.css
Original file line number Diff line number Diff line change
@@ -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";
}
2 changes: 1 addition & 1 deletion dist/libs/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion dist/lite.init.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);}});
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);}});
11 changes: 6 additions & 5 deletions dist/oreuicfg.json
Original file line number Diff line number Diff line change
@@ -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模块太严了,不许注释,就只能这么写咯 ( ̄▽ ̄)\""
}
"还没写,不管改成什么都不会工作(": 0,
"你问我为什么这么写注释?es6的json模块太严了,不许注释,就只能这么写咯 ( ̄▽ ̄)\"": 0
}

0 comments on commit 29d9082

Please sign in to comment.