Style Breeze with Kryon CSS
Breeze's style sheets, theme catalogs and custom appearance sheets are CSS now, read by the css package (6aad71c) on Kryon b9aed758. Custom sheets saved as KSS convert to CSS at first start; the KSS setting stays, and a sheet with no CSS form opens as a draft to fix. Host theme colors still replace only a custom property of the same kind, and user sheets rank above the app's. The tree also carries the Apps pin cd72a24 and the Apps controller digest of the bundle built from it.
This commit is contained in:
1 parent
456ca38212
commit
7ccbf5cd97
117 files changed
+1763
-1421
No files matched your search
@@ -12,7 +12,7 @@ root = Path(__file__).resolve().parent.parent
|
||||
compiler = Path(sys.argv[1]).resolve()
|
||||
ui = Path(sys.argv[2]).resolve() if len(sys.argv) > 2 else root / "build/packages/kryon/src/ui"
|
||||
standard = Path(sys.argv[3]).resolve() if len(sys.argv) > 3 else root / "build/packages/ziran/std"
|
||||
kss = Path(sys.argv[4]).resolve() if len(sys.argv) > 4 else root / "build/packages/kss/src"
|
||||
css = Path(sys.argv[4]).resolve() if len(sys.argv) > 4 else root / "build/packages/css/src"
|
||||
client = Path(os.environ.get("DAOCHI_CLIENT_DIR", root / "build/packages/daochi-client"))
|
||||
game2d = root / "build/packages/game2d/src"
|
||||
sources = sorted((root / "src").rglob("*.zi"))
|
||||
@@ -46,7 +46,7 @@ result = subprocess.run(
|
||||
"--module-path",
|
||||
str(ui),
|
||||
"--module-path",
|
||||
str(kss),
|
||||
str(css),
|
||||
"--module-path",
|
||||
str(ui.parent / "backend"),
|
||||
"--module-path",
|
||||
|
||||
@@ -17,7 +17,7 @@ MIME_TYPES = {
|
||||
".mp3": "audio/mpeg",
|
||||
".ttf": "font/ttf",
|
||||
".otf": "font/otf",
|
||||
".kss": "text/plain",
|
||||
".css": "text/css",
|
||||
".txt": "text/plain",
|
||||
".dat": "application/octet-stream",
|
||||
}
|
||||
@@ -37,8 +37,8 @@ def emit(output: Path, files: list[Path], root: Path) -> None:
|
||||
path = "cells/" + path.removeprefix("build/apps/")
|
||||
if path == "build/inbe.zx":
|
||||
path = "inbe.zx"
|
||||
if path.startswith("build/packages/kss/styles/"):
|
||||
path = path.removeprefix("build/packages/kss/")
|
||||
if path.startswith("build/packages/css/styles/"):
|
||||
path = path.removeprefix("build/packages/css/")
|
||||
if path.startswith("build/packages/kryon/icons/"):
|
||||
path = path.removeprefix("build/packages/kryon/")
|
||||
if path in entries:
|
||||
|
||||
@@ -33,7 +33,7 @@ command = ["sh", str(root / "scripts/run-ziran.sh"), str(args.compiler),
|
||||
for name in args.define:
|
||||
command.extend(["--define", name])
|
||||
for directory in (
|
||||
root / "src", kryon / "src/ui", kryon / "src/backend", root / "build/packages/kss/src",
|
||||
root / "src", kryon / "src/ui", kryon / "src/backend", root / "build/packages/css/src",
|
||||
root / "build/packages/game2d/src", root / "build/packages/ziran/std",
|
||||
Path(os.environ.get("DAOCHI_CLIENT_DIR", root / "build/packages/daochi-client")),
|
||||
):
|
||||
|
||||
+1
-1
@@ -90,7 +90,7 @@ link() {
|
||||
|
||||
link ziran ziran
|
||||
link kryon kryon
|
||||
link kss kss
|
||||
link css css
|
||||
link oqs oqs
|
||||
link raylib raylib
|
||||
link libwebp libwebp
|
||||
|
||||
@@ -40,9 +40,9 @@ patterns = (
|
||||
'assets/social/*.png', 'assets/social/*.webp', 'assets/social/telegram.svg',
|
||||
'assets/sounds/*.ogg',
|
||||
'assets/habits/**/*', 'assets/lists/**/*', 'assets/diary/**/*', 'assets/lumi/**/*',
|
||||
'assets/fonts/subset/*-App-Regular.*', 'assets/styles/*.kss',
|
||||
'locales/*.txt', 'themes/catalog_*.kss',
|
||||
'build/packages/kss/styles/*.kss', 'build/packages/kryon/icons/ui.webp',
|
||||
'assets/fonts/subset/*-App-Regular.*', 'assets/styles/*.css',
|
||||
'locales/*.txt', 'themes/catalog_*.css',
|
||||
'build/packages/css/styles/*.css', 'build/packages/kryon/icons/ui.webp',
|
||||
'build/packages/kryon/icons/pfp.webp',
|
||||
) + tuple(f'assets/{name}/**/*' for name in NODE_APPS)
|
||||
# The practice media comes from the practices package and is packaged
|
||||
@@ -82,7 +82,7 @@ for file, path in sorted(sources.items(), key=lambda source: source[1]):
|
||||
for feature in ('habits', 'lists', 'diary', 'lumi') + NODE_APPS:
|
||||
if path.startswith('assets/' + feature + '/'):
|
||||
owner = feature
|
||||
for prefix in ('build/packages/kss/', 'build/packages/kryon/'):
|
||||
for prefix in ('build/packages/css/', 'build/packages/kryon/'):
|
||||
if path.startswith(prefix):
|
||||
path = path.removeprefix(prefix)
|
||||
target = OUTPUT / owner / path
|
||||
|
||||
@@ -77,7 +77,7 @@ def check_locked_sources():
|
||||
result = subprocess.run(
|
||||
["make", "--no-print-directory", "screenshot-source-check",
|
||||
"PACKAGE_FLAGS=--locked", "KRYON_DIR=build/packages/kryon",
|
||||
"KSS_DIR=build/packages/kss", "ZIRAN_DIR=build/packages/ziran"],
|
||||
"CSS_DIR=build/packages/css", "ZIRAN_DIR=build/packages/ziran"],
|
||||
cwd=ROOT, env=env, capture_output=True,
|
||||
text=True, timeout=120)
|
||||
require(result.returncode == 0,
|
||||
|
||||
Reference in new issue
Block a user