diff --git a/.github/ABOUT.md b/.github/ABOUT.md index 42fea3b..11948a9 100644 --- a/.github/ABOUT.md +++ b/.github/ABOUT.md @@ -46,7 +46,7 @@ folder it did not touch. | nextpad-plus-plus: Validate themes and apply script | `editors/nextpad-plus-plus/` changed | Every theme parses and meets its contrast floor with Geist Mono and the apply script passes ShellCheck | | vivado: Validate themes and apply scripts | `editors/vivado/` changed | Every theme holds the editor colours and the 21 syntax styles in Vivado's formats and meets its contrast floor, the Linux script passes ShellCheck and the PowerShell script parses | | notepad-plus-plus: Validate themes and apply script | `editors/notepad-plus-plus/` changed | Every theme is well formed with Geist Mono and valid colours and the PowerShell script parses | -| thonny: Validate themes and apply scripts | `editors/thonny/` changed | The plugin defines all eight themes, every platform's settings name a theme and Geist Mono, the shell scripts pass ShellCheck and the PowerShell script parses | +| thonny: Validate themes and apply scripts | `editors/thonny/` changed | The plugin defines all ten themes, every platform's settings name a theme and Geist Mono, the shell scripts pass ShellCheck and the PowerShell script parses | | matlab: Validate themes and apply scripts | `editors/matlab/` changed | Every theme names a desktop theme and RGB colours, every platform names Geist Mono, the shell scripts pass ShellCheck and the PowerShell script parses | | ltspice: Validate themes and apply scripts | `editors/ltspice/` changed | Every theme sets the same colour entries with 24-bit values, the shell scripts pass ShellCheck and the PowerShell script parses | | proteus: Validate themes and apply scripts | `editors/proteus/` changed | Every theme has a short unique set name, valid PCB values and the default template's schematic slots and the PowerShell scripts parse | diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index e45831d..d07d233 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -26,6 +26,7 @@ body: - terminal/terminal - terminal/tmux - terminal/btop + - terminal/nano - terminal/cli-tools - git/gitconfig - git/git-hooks @@ -48,10 +49,15 @@ body: - editors/matlab - editors/ltspice - editors/proteus + - editors/nano - apps/raycast - apps/rectangle - apps/obsidian - apps/zotero + - apps/onedrive + - apps/zacess-scenes + - apps/zacess-games + - apps/translucenttb - The repository as a whole (README, CI, templates) validations: required: true diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index beff00d..07297c7 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -26,6 +26,7 @@ body: - terminal/terminal - terminal/tmux - terminal/btop + - terminal/nano - terminal/cli-tools - git/gitconfig - git/git-hooks @@ -48,10 +49,15 @@ body: - editors/matlab - editors/ltspice - editors/proteus + - editors/nano - apps/raycast - apps/rectangle - apps/obsidian - apps/zotero + - apps/onedrive + - apps/zacess-scenes + - apps/zacess-games + - apps/translucenttb - The repository as a whole (README, CI, templates) validations: required: true diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index f44a297..3df01f8 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -12,6 +12,7 @@ A short, clear description of the change in your own words. - [ ] `terminal/terminal/` - [ ] `terminal/tmux/` - [ ] `terminal/btop/` +- [ ] `terminal/nano/` - [ ] `terminal/cli-tools/` - [ ] `git/gitconfig/` - [ ] `git/git-hooks/` @@ -34,10 +35,15 @@ A short, clear description of the change in your own words. - [ ] `editors/matlab/` - [ ] `editors/ltspice/` - [ ] `editors/proteus/` +- [ ] `editors/nano/` - [ ] `apps/raycast/` - [ ] `apps/rectangle/` - [ ] `apps/obsidian/` - [ ] `apps/zotero/` +- [ ] `apps/onedrive/` +- [ ] `apps/zacess-scenes/` +- [ ] `apps/zacess-games/` +- [ ] `apps/translucenttb/` - [ ] The repository root or `.github/` If a change applies to macOS, Linux and Windows, confirm all three copies were updated, not just one. diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2be9e88..e0cb2a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1265,8 +1265,8 @@ jobs: print(f"::error file={path}::the root is not a dictionary") bad = 1 print(f"theme/: {len(themes)} classic themes parse") - if len(themes) != 8: - print(f"::error::expected 8 .xccolortheme files, found {len(themes)}") + if len(themes) != 10: + print(f"::error::expected 10 .xccolortheme files, found {len(themes)}") bad = 1 for path in sorted(glob.glob("theme/*.xcworkspacecolortheme")): json.load(open(path)) diff --git a/ACCESSIBILITY.md b/ACCESSIBILITY.md index 239a50a..fb7cede 100644 --- a/ACCESSIBILITY.md +++ b/ACCESSIBILITY.md @@ -11,7 +11,7 @@ tiring to type. Every folder in this repository follows the same rules: -- **One set of themes everywhere.** Terminals, editors and IDEs all use the eight Zacess themes, +- **One set of themes everywhere.** Terminals, editors and IDEs all use the same Zacess themes, with Zacess Deep Contrast Dark as the default, so switching tools never changes how the screen reads. `zt` in the [shell](shell/README.md) switches every installed tool at once. - **Colour is never the only signal.** Status, errors and warnings carry words as well as colour. @@ -37,6 +37,7 @@ Each folder says exactly what it changes and what it cannot change yet. | defaults | [setup/defaults/ACCESSIBILITY.md](setup/defaults/ACCESSIBILITY.md) | | terminal | [terminal/terminal/ACCESSIBILITY.md](terminal/terminal/ACCESSIBILITY.md) | | tmux | [terminal/tmux/ACCESSIBILITY.md](terminal/tmux/ACCESSIBILITY.md) | +| btop | [terminal/btop/ACCESSIBILITY.md](terminal/btop/ACCESSIBILITY.md) | | cli-tools | [terminal/cli-tools/ACCESSIBILITY.md](terminal/cli-tools/ACCESSIBILITY.md) | | vscode | [editors/vscode/ACCESSIBILITY.md](editors/vscode/ACCESSIBILITY.md) | | zed | [editors/zed/ACCESSIBILITY.md](editors/zed/ACCESSIBILITY.md) | @@ -56,10 +57,14 @@ Each folder says exactly what it changes and what it cannot change yet. | matlab | [editors/matlab/ACCESSIBILITY.md](editors/matlab/ACCESSIBILITY.md) | | ltspice | [editors/ltspice/ACCESSIBILITY.md](editors/ltspice/ACCESSIBILITY.md) | | proteus | [editors/proteus/ACCESSIBILITY.md](editors/proteus/ACCESSIBILITY.md) | +| nano | [editors/nano/ACCESSIBILITY.md](editors/nano/ACCESSIBILITY.md) | | raycast | [apps/raycast/ACCESSIBILITY.md](apps/raycast/ACCESSIBILITY.md) | | rectangle | [apps/rectangle/ACCESSIBILITY.md](apps/rectangle/ACCESSIBILITY.md) | | obsidian | [apps/obsidian/ACCESSIBILITY.md](apps/obsidian/ACCESSIBILITY.md) | | zotero | [apps/zotero/ACCESSIBILITY.md](apps/zotero/ACCESSIBILITY.md) | +| onedrive | [apps/onedrive/ACCESSIBILITY.md](apps/onedrive/ACCESSIBILITY.md) | +| zacess-scenes | [apps/zacess-scenes/ACCESSIBILITY.md](apps/zacess-scenes/ACCESSIBILITY.md) | +| zacess-games | [apps/zacess-games/ACCESSIBILITY.md](apps/zacess-games/ACCESSIBILITY.md) | | translucenttb | [apps/translucenttb/ACCESSIBILITY.md](apps/translucenttb/ACCESSIBILITY.md) | The gitconfig, git-hooks and ssh folders change nothing about how anything looks or is operated, so diff --git a/CHANGELOG.md b/CHANGELOG.md index fc8024f..fb258d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,18 @@ A patch step for fixes, a minor step for additions and a major step when the lay ## [Unreleased] +## [2.11.0] - 2026-11-08 + +### Added + +- Eight custom Zacess Scenes in `apps/zacess-scenes/scenes`, drawn as Lua pixel scenes with scrolling captions: hello-isaac, now-building, lidarsat, scope, phaemos, build-passed, build-failed and football, where BUILD FC scores when the build passes and the shot hits the post or lands in the keeper's hands when it fails. The setup scripts link them into the scenes folder on every machine. `scenes.toml` plays the new pass scenes (rocket launch, pit stop, PCB bring-up, drone landing, kettle boil) and fail scenes (launch scrub, stuck pit stop, dead LED, landing abort, cold kettle) alongside the custom ones. +- Zacess Warm Dark and Zacess Warm Light, the gentler pair held to WCAG AA (4.5:1), join the eight themes, so `zt warm-dark`, `zt warm-light` and `termtheme warm-dark` work on macOS, Linux, WSL and Windows. The terminal palette takes both from Zacess Themes and `build-themes.py` writes them for Terminal.app, iTerm2, Ghostty, Kitty, Alacritty, Windows Terminal, Ptyxis, GNOME Terminal, tmux, btop and nano, measuring each theme against its own text floor. KiCad, Processing, Vivado, Nextpad++, Notepad++, LTspice, MATLAB, Microchip Studio, Proteus, Thonny, Eclipse, STM32CubeIDE, Zed and Zotero carry both themes. Every apply script accepts the two short names. VS Code, Arduino IDE, the JetBrains IDEs, Neovim, Obsidian and Xcode take them once their packages move to the Zacess Themes release that ships them. + +### Changed + +- Every theme pin moves to Zacess Themes 1.0.0, the release that brings Zacess Warm Dark and Zacess Warm Light into every store and package. The JetBrains, Arduino IDE, Zed and Obsidian packages take their new digests, along with the VS Code extension list, zacess.nvim and the terminal palette version. The Arduino package lists all ten themes and the Obsidian package installs a fifth theme, Zacess Warm, which `themes.json` maps to the two warm looks. The Zed theme file and the Eclipse themes are copied from the release again. The Nextpad++, KiCad, Processing and Vivado builds read the 1.0.0 palette by its digest. The STM32CubeIDE, MATLAB, Proteus, Thonny, LTspice, Microchip Studio and Notepad++ themes are rebuilt from the release. The Arduino and Obsidian checks now expect ten themes. The Processing and Vivado checks hold syntax on the current line to 4.5:1, the rule Zacess Themes 0.6.0 sets, in place of 7:1. +- The demo screenshots and clips for the macOS and Linux shell, lazygit, fzf, the terminal, tmux, Neovim and the git hooks are recorded again from the current setup. The shell, lazygit, fzf and git hook scenes gain Warm Dark and Warm Light versions. A new shot of the whole setup in one tmux session, with Neovim across the top and a shell, btop and a Zacess Scenes scene along the bottom, heads the root README and the tmux README. Two more shots in the same layout show a build that passes and one that fails, with Zacess Scenes watch mode beside each: the garden under its ALL GOOD banner and the storm under its FAILED banner with the error lines. They sit side by side below the main shot in the root README. All three are recorded in Deep Contrast Light as well and the READMEs show the light or dark shot to match the system theme. + ### Fixed - Starship no longer prints `Executing command ... timed out` on a slow first prompt: `command_timeout` is 2000 ms on macOS, Linux and Windows, up from the 500 ms default. diff --git a/NOTICE.md b/NOTICE.md index fc46e11..c7c96af 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -19,7 +19,7 @@ the list of style names and slots is followed. | Material | Where it is used | Credit | | --- | --- | --- | -| Zacess Themes | The eight colour themes in every terminal, editor and IDE folder. The KiCad, Processing, Nextpad++, Vivado, Notepad++, Thonny, MATLAB, LTspice, Proteus and Microchip Studio themes are built from its palette. Zed's theme file in `editors/zed/shared/themes` is the one Zacess Themes 0.5.0 ships for Zed, copied as released. The JetBrains IDEs get the Zacess Themes plugin from the JetBrains Marketplace. When an IDE's launcher cannot be found they get it from a pinned release checked against its digest | [zacesshq/themes](https://github.com/zacesshq/themes) | +| Zacess Themes | The colour themes in every terminal, editor and IDE folder. The KiCad, Processing, Nextpad++, Vivado, Notepad++, Thonny, MATLAB, LTspice, Proteus and Microchip Studio themes are built from its palette. Zed's theme file in `editors/zed/shared/themes` is the one Zacess Themes 1.0.0 ships for Zed, copied as released. The JetBrains IDEs get the Zacess Themes plugin from the JetBrains Marketplace. When an IDE's launcher cannot be found they get it from a pinned release checked against its digest | [zacesshq/themes](https://github.com/zacesshq/themes) | | Geist Mono and Nerd Fonts | The terminal and editor font; the Windows bootstrap downloads the Nerd Fonts build of Geist Mono | [Geist](https://github.com/vercel/geist-font) by Vercel and [Nerd Fonts](https://github.com/ryanoasis/nerd-fonts), both under the SIL Open Font License | | Starship | The prompt in the [shell](shell) folder | [starship/starship](https://github.com/starship/starship) | | zsh-syntax-highlighting | Typed-command colours in the zsh profiles | [zsh-users/zsh-syntax-highlighting](https://github.com/zsh-users/zsh-syntax-highlighting) | diff --git a/README.md b/README.md index 912e8aa..4a1cbad 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,15 @@ [![CI](https://github.com/zaccesss/dotfiles/actions/workflows/ci.yml/badge.svg)](https://github.com/zaccesss/dotfiles/actions/workflows/ci.yml) [![Licence: MIT](https://img.shields.io/badge/licence-MIT-green.svg)](LICENSE) +A tmux session in Zacess Deep Contrast, dark or light to match the system theme. Neovim runs across the top, its file tree listing the Zacess Scenes Lua files beside build-passed.lua open in the editor. Along the bottom, from left to right: a shell showing a five-line git log and a build that passed, btop with CPU load and network traffic, then the harbour scene from Zacess Scenes playing in the same theme + + + + + + +
A passing build in the same tmux layout: Neovim with build-passed.lua across the top, a shell where python3 -m compileall finishes and prints build passed, then btop. Zacess Scenes watch mode fills the last pane with the garden scene under a large ALL GOOD banner, a check mark and the caption "Everything is growing nicely."
A passing build
A failing build in the same tmux layout: Neovim with build-failed.lua across the top, a shell where git status lists a new report.py and python3 -m compileall stops on SyntaxError: expected ':' before printing build failed, then btop. Zacess Scenes watch mode fills the last pane with the storm scene under a large FAILED banner with a cross, the caption "Something broke. The storm will pass." and the two error lines
A failing build
+ --- ## What this is @@ -16,7 +25,7 @@ machine up, the shell profile and its aliases, the terminal and its tools, Git a and IDE and the few desktop apps I drive from the keyboard. I have monocular vision, so distinct, high-contrast colours do real work for me rather than being a -matter of taste. Every folder uses the same eight Zacess themes, with Zacess Deep Contrast Dark as +matter of taste. Every folder uses the same Zacess themes, with Zacess Deep Contrast Dark as the default, so moving between a terminal, an editor and an IDE never changes how the screen reads. The [accessibility statement](ACCESSIBILITY.md) says what that means in practice. @@ -65,8 +74,8 @@ To use one tool on its own, open its folder below and follow its setup guide. | [shell](shell/README.md) | The zsh, bash and PowerShell profiles with their aliases and helpers, the Starship prompt, the Command Prompt start-up and the `zt` theme switcher | | [terminal](terminal/README.md) | The Zacess terminal themes, tmux and the everyday command line tools | | [git](git/README.md) | The gitconfig, the Git hooks and the SSH client config | -| [editors](editors/README.md) | VS Code, Zed, the JetBrains IDEs, Eclipse, STM32CubeIDE, Xcode, Neovim, Arduino IDE, Microchip Studio, KiCad, Vivado, Processing, Notepad++, Nextpad++, Thonny, MATLAB, LTspice and Proteus | -| [apps](apps/README.md) | Raycast and Rectangle on the Mac, Obsidian and Zotero everywhere and TranslucentTB on Windows | +| [editors](editors/README.md) | VS Code, Zed, the JetBrains IDEs, Eclipse, STM32CubeIDE, Xcode, Neovim, Arduino IDE, Microchip Studio, KiCad, Vivado, Processing, Notepad++, Nextpad++, nano, Thonny, MATLAB, LTspice and Proteus | +| [apps](apps/README.md) | Raycast and Rectangle on the Mac, Obsidian, Zotero, Zacess Scenes with eight custom Lua scenes and Zacess Games everywhere, OneDrive on Linux and TranslucentTB on Windows | How the repository is checked and maintained (every workflow, issue form and template) is in [.github/ABOUT.md](.github/ABOUT.md). diff --git a/apps/obsidian/ACCESSIBILITY.md b/apps/obsidian/ACCESSIBILITY.md index 15e3eb7..69d30f7 100644 --- a/apps/obsidian/ACCESSIBILITY.md +++ b/apps/obsidian/ACCESSIBILITY.md @@ -4,7 +4,7 @@ The same high contrast theme on every machine, set once in the vault. ## Vision -- The default is Zacess Deep Contrast Dark: the Zacess Deep Contrast theme with Obsidian's dark base colour scheme. All eight Zacess looks are available, light ones included: the four Zacess themes are installed and each carries a light and a dark look, chosen under **Settings > Appearance**. Measured contrast is in the [Zacess Themes accessibility statement](https://github.com/zacesshq/themes/blob/main/ACCESSIBILITY.md). +- The default is Zacess Deep Contrast Dark: the Zacess Deep Contrast theme with Obsidian's dark base colour scheme. All ten Zacess looks are available, light ones included: the four Zacess themes are installed and each carries a light and a dark look, chosen under **Settings > Appearance**. Measured contrast is in the [Zacess Themes accessibility statement](https://github.com/zacesshq/themes/blob/main/ACCESSIBILITY.md). - Code blocks and inline code use GeistMono Nerd Font, the font every editor uses. - Links are underlined as well as coloured in the Zacess themes. The active tab, the open file and a selected row carry a bar, so colour is never the only signal. diff --git a/apps/obsidian/README.md b/apps/obsidian/README.md index 430e32a..4698bb6 100644 --- a/apps/obsidian/README.md +++ b/apps/obsidian/README.md @@ -10,7 +10,7 @@ Obsidian setup: the four Zacess community themes installed in a vault, the chose | `.obsidian/appearance.json` | `cssTheme` (the theme that carries the chosen look), `theme` (its dark `obsidian` or light `moonstone` half) and `monospaceFontFamily` GeistMono Nerd Font | Each Zacess theme follows Obsidian's own base colour scheme between its light and dark look, so no plugin is needed | | This machine's `obsidian.json` | The vault marked as the one that opens | Obsidian starts in that vault | -In a synced vault the `.obsidian` folder travels with it, so the themes and the look are shared by every machine that opens it. `obsidian.json` is each machine's own. [`shared/themes.json`](shared/themes.json) maps each of the eight looks to its theme and base colour scheme: Zacess Deep Contrast Dark is `Zacess Deep Contrast` plus `obsidian`, Zacess Cream is `Zacess Cream` plus `moonstone`, Zacess Yellow on Black is `Zacess Cream` plus `obsidian` and so on. +In a synced vault the `.obsidian` folder travels with it, so the themes and the look are shared by every machine that opens it. `obsidian.json` is each machine's own. [`shared/themes.json`](shared/themes.json) maps each of the ten looks to its theme and base colour scheme: Zacess Deep Contrast Dark is `Zacess Deep Contrast` plus `obsidian`, Zacess Cream is `Zacess Cream` plus `moonstone`, Zacess Yellow on Black is `Zacess Cream` plus `obsidian` and so on. ## Apply @@ -46,4 +46,4 @@ The vault list is `~/Library/Application Support/obsidian/obsidian.json` on macO ## Validation -[`scripts/validate.py`](scripts/validate.py) runs in CI on Linux. It checks all eight looks map to an installed theme and a base colour scheme, every theme package pins a release zip with a full digest and the appearance settings name Geist Mono. +[`scripts/validate.py`](scripts/validate.py) runs in CI on Linux. It checks all ten looks map to an installed theme and a base colour scheme, every theme package pins a release zip with a full digest and the appearance settings name Geist Mono. diff --git a/apps/obsidian/linux/apply.sh b/apps/obsidian/linux/apply.sh index 6ef7c54..f4d1a84 100644 --- a/apps/obsidian/linux/apply.sh +++ b/apps/obsidian/linux/apply.sh @@ -5,9 +5,9 @@ # (the vault defaults to OBSIDIAN_VAULT, the same variable zt reads, then ~/Obsidian/Vault, a # plain folder outside any cloud-synced one) # -# --theme picks one of the eight Zacess looks by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is -# deep-dark. each look is one half of a community theme (Zacess, Zacess Cream, Zacess High Contrast +# --theme picks one of the ten Zacess looks by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), id (deep-contrast-dark) or full +# name. the default is deep-dark. each look is one half of a community theme (Zacess, Zacess Cream, Zacess High Contrast # or Zacess Deep Contrast) chosen by Obsidian's base colour scheme, so appearance.json gets both # cssTheme and theme. the work is done by ../shared/apply.py; nothing is backed up. the vault list # is ~/.config/obsidian/obsidian.json (the Flatpak's copy when md.obsidian.Obsidian is installed). @@ -35,12 +35,14 @@ theme_name() { light) echo "Zacess Light" ;; cream) echo "Zacess Cream" ;; yellow|yellow-on-black) echo "Zacess Yellow on Black" ;; + warm-dark) echo "Zacess Warm Dark" ;; + warm-light) echo "Zacess Warm Light" ;; *) return 1 ;; esac } if ! name="$(theme_name "$theme")"; then echo "Unknown theme: $theme" >&2 - echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow." >&2 + echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light." >&2 exit 1 fi diff --git a/apps/obsidian/mac/apply.sh b/apps/obsidian/mac/apply.sh index 40f4d80..93ce3cb 100755 --- a/apps/obsidian/mac/apply.sh +++ b/apps/obsidian/mac/apply.sh @@ -5,9 +5,9 @@ # (the vault defaults to OBSIDIAN_VAULT, the same variable zt reads, then ~/Obsidian/Vault, a # plain folder outside any cloud-synced one) # -# --theme picks one of the eight Zacess looks by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is -# deep-dark. each look is one half of a community theme (Zacess, Zacess Cream, Zacess High Contrast +# --theme picks one of the ten Zacess looks by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), id (deep-contrast-dark) or full +# name. the default is deep-dark. each look is one half of a community theme (Zacess, Zacess Cream, Zacess High Contrast # or Zacess Deep Contrast) chosen by Obsidian's base colour scheme, so appearance.json gets both # cssTheme and theme. the work is done by ../shared/apply.py; nothing is backed up. the vault list # is ~/Library/Application Support/obsidian/obsidian.json. in a synced vault the .obsidian folder @@ -36,12 +36,14 @@ theme_name() { light) echo "Zacess Light" ;; cream) echo "Zacess Cream" ;; yellow|yellow-on-black) echo "Zacess Yellow on Black" ;; + warm-dark) echo "Zacess Warm Dark" ;; + warm-light) echo "Zacess Warm Light" ;; *) return 1 ;; esac } if ! name="$(theme_name "$theme")"; then echo "Unknown theme: $theme" >&2 - echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow." >&2 + echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light." >&2 exit 1 fi diff --git a/apps/obsidian/scripts/validate.py b/apps/obsidian/scripts/validate.py index da0c3b7..962bbf4 100644 --- a/apps/obsidian/scripts/validate.py +++ b/apps/obsidian/scripts/validate.py @@ -1,6 +1,6 @@ """Checks the Obsidian folder without Obsidian: run from anywhere, exits non-zero on a problem. -- shared/themes.json maps all eight Zacess looks to the community theme that carries each (cssTheme) +- shared/themes.json maps all ten Zacess looks to the community theme that carries each (cssTheme) and Obsidian's dark (obsidian) or light (moonstone) base colour scheme - shared/theme-package.json pins one release zip per theme by version and a 64-character SHA-256 digest. Every theme themes.json names has a package @@ -15,13 +15,13 @@ import sys NAMES = ["Zacess Deep Contrast Dark", "Zacess Deep Contrast Light", "Zacess High Contrast Dark", - "Zacess High Contrast Light", "Zacess Dark", "Zacess Light", "Zacess Cream", "Zacess Yellow on Black"] + "Zacess High Contrast Light", "Zacess Dark", "Zacess Light", "Zacess Cream", "Zacess Yellow on Black", "Zacess Warm Dark", "Zacess Warm Light"] root = pathlib.Path(__file__).resolve().parent.parent problems = [] themes = json.loads((root / "shared" / "themes.json").read_text(encoding="utf-8")) if sorted(themes) != sorted(NAMES): - problems.append("themes.json: does not hold exactly the eight Zacess looks") + problems.append("themes.json: does not hold exactly the ten Zacess looks") for name, choice in themes.items(): if choice.get("theme") not in ("obsidian", "moonstone"): problems.append(f"themes.json: {name} theme is not obsidian (dark) or moonstone (light)") diff --git a/apps/obsidian/shared/theme-package.json b/apps/obsidian/shared/theme-package.json index 676f7e7..59b5094 100644 --- a/apps/obsidian/shared/theme-package.json +++ b/apps/obsidian/shared/theme-package.json @@ -1,29 +1,35 @@ { - "version": "0.12.0", + "version": "1.0.0", "themes": [ { "name": "zacess-obsidian", "folder": "Zacess", - "url": "https://github.com/zacesshq/themes/releases/download/v0.12.0/zacess-obsidian-0.12.0.zip", - "sha256": "2f22622f7197deb7ca965d2b97e882dddffed5ecbfd3a3c7b2d032cad0905cea" + "url": "https://github.com/zacesshq/themes/releases/download/v1.0.0/zacess-obsidian-1.0.0.zip", + "sha256": "fc2cbbb719e0e03d510cb92a5e01f340b31042161c8cf05ef962750888d03696" }, { "name": "zacess-cream-obsidian", "folder": "Zacess Cream", - "url": "https://github.com/zacesshq/themes/releases/download/v0.12.0/zacess-cream-obsidian-0.12.0.zip", - "sha256": "a80a8621271eb7d00bae45390ce9482280abb8aa35954e04e72960ac4c9e70e6" + "url": "https://github.com/zacesshq/themes/releases/download/v1.0.0/zacess-cream-obsidian-1.0.0.zip", + "sha256": "b45bf15b0f332ea883f7d9f679194e6cc313c82e62bf438acd2324a18f3a0da3" }, { "name": "zacess-high-contrast-obsidian", "folder": "Zacess High Contrast", - "url": "https://github.com/zacesshq/themes/releases/download/v0.12.0/zacess-high-contrast-obsidian-0.12.0.zip", - "sha256": "575026fb8886258c6fee5e6a7662536642899b57e8114f4b5e98e64dbf7aa037" + "url": "https://github.com/zacesshq/themes/releases/download/v1.0.0/zacess-high-contrast-obsidian-1.0.0.zip", + "sha256": "e9cc99bcd4f316a75053e7e894e1caf600a8d040b3f7b9c6dbcd896854236a29" }, { "name": "zacess-deep-contrast-obsidian", "folder": "Zacess Deep Contrast", - "url": "https://github.com/zacesshq/themes/releases/download/v0.12.0/zacess-deep-contrast-obsidian-0.12.0.zip", - "sha256": "803e5ce632c0a1fbabe8ecd53715d91b481c7df117bf18322be4392e65a669d1" + "url": "https://github.com/zacesshq/themes/releases/download/v1.0.0/zacess-deep-contrast-obsidian-1.0.0.zip", + "sha256": "62fece4c6537131f5efa30e57e64a1087a165673c5a5ecdefebbe65e0c49accb" + }, + { + "name": "zacess-warm-obsidian", + "folder": "Zacess Warm", + "url": "https://github.com/zacesshq/themes/releases/download/v1.0.0/zacess-warm-obsidian-1.0.0.zip", + "sha256": "6267fb19e85a622cc46abf2180e1460cd4c82dd07417cd6660f9d4c1ffb6a31e" } ] } diff --git a/apps/obsidian/shared/themes.json b/apps/obsidian/shared/themes.json index 8513f08..78a47e6 100644 --- a/apps/obsidian/shared/themes.json +++ b/apps/obsidian/shared/themes.json @@ -6,5 +6,7 @@ "Zacess Dark": { "cssTheme": "Zacess", "theme": "obsidian" }, "Zacess Light": { "cssTheme": "Zacess", "theme": "moonstone" }, "Zacess Cream": { "cssTheme": "Zacess Cream", "theme": "moonstone" }, - "Zacess Yellow on Black": { "cssTheme": "Zacess Cream", "theme": "obsidian" } + "Zacess Yellow on Black": { "cssTheme": "Zacess Cream", "theme": "obsidian" }, + "Zacess Warm Dark": { "cssTheme": "Zacess Warm", "theme": "obsidian" }, + "Zacess Warm Light": { "cssTheme": "Zacess Warm", "theme": "moonstone" } } diff --git a/apps/obsidian/windows/apply.ps1 b/apps/obsidian/windows/apply.ps1 index 35f97d8..366897e 100644 --- a/apps/obsidian/windows/apply.ps1 +++ b/apps/obsidian/windows/apply.ps1 @@ -4,9 +4,9 @@ # (the vault defaults to OBSIDIAN_VAULT, the same variable zt reads, then %USERPROFILE%\Obsidian\Vault, # a plain folder outside any cloud-synced one) # -# -Theme picks one of the eight Zacess looks by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is -# deep-dark. each look is one half of a community theme (Zacess, Zacess Cream, Zacess High Contrast +# -Theme picks one of the ten Zacess looks by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), id (deep-contrast-dark) or full +# name. the default is deep-dark. each look is one half of a community theme (Zacess, Zacess Cream, Zacess High Contrast # or Zacess Deep Contrast) chosen by Obsidian's base colour scheme, so appearance.json gets both # cssTheme and theme. # @@ -29,12 +29,13 @@ $themeNames = [ordered]@{ 'hc-light' = 'Zacess High Contrast Light'; 'high-contrast-light' = 'Zacess High Contrast Light' 'dark' = 'Zacess Dark'; 'light' = 'Zacess Light'; 'cream' = 'Zacess Cream' 'yellow' = 'Zacess Yellow on Black'; 'yellow-on-black' = 'Zacess Yellow on Black' + 'warm-dark' = 'Zacess Warm Dark'; 'warm-light' = 'Zacess Warm Light' } $key = ($Theme.ToLowerInvariant() -replace '^zacess[ -]', '') -replace ' ', '-' $name = $themeNames[$key] if (-not $name) { [Console]::Error.WriteLine("Unknown theme: $Theme") - [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow.') + [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light.') exit 1 } $dot = Join-Path $Vault '.obsidian' diff --git a/apps/zacess-scenes/ACCESSIBILITY.md b/apps/zacess-scenes/ACCESSIBILITY.md index 65bec7a..996f3a7 100644 --- a/apps/zacess-scenes/ACCESSIBILITY.md +++ b/apps/zacess-scenes/ACCESSIBILITY.md @@ -6,3 +6,4 @@ What the example Zacess Scenes settings change on screen and in sound. - **The theme follows `zt`.** Scenes take the colours of the Zacess theme the terminal is on, so contrast is never lower than the theme's own. - **Sound is never the only signal.** Every tone in watch mode has the same state written on screen. Volume is 40 and quiet hours keep it silent from 22:00 to 07:00. - **Notifications.** Off in the example. With `[notifications] enabled = true` a desktop notification says when a build fails or is fixed, which screen readers announce. +- **My own scenes follow the same rules.** The Lua scenes in `scenes/` name palette roles rather than colours, give every status a word as well as a colour, scroll text at a steady readable rate and slow down further under reduced motion. They pass the program's flash meter like the built-in scenes. diff --git a/apps/zacess-scenes/README.md b/apps/zacess-scenes/README.md index cabb998..e18958e 100644 --- a/apps/zacess-scenes/README.md +++ b/apps/zacess-scenes/README.md @@ -7,6 +7,7 @@ | [`scenes.toml`](scenes.toml) | Example settings: a few pass and fail scenes on shuffle every 5 minutes (a scene run on its own too), calm motion, the bells sounds at volume 40 with the typo tone, quiet hours from 22:00 to 07:00 and the background sound off until `a` turns it on | | [`setup.sh`](setup.sh) | macOS and Linux: the newest release binary into `~/.local/bin` checked against its checksum, bacon with cargo and `scenes.toml` linked to `~/.config/zacess/scenes.toml` | | [`setup.ps1`](setup.ps1) | Windows: the same into `~\.local\bin` and `%APPDATA%\zacess\scenes.toml`, linked with Developer Mode on and copied otherwise | +| [`scenes/`](scenes/) | My own Lua scenes, linked one by one into the scenes folder beside `scenes.toml` by both setup scripts (see [My scenes](#my-scenes)) | There is no theme in `scenes.toml` on purpose: Scenes reads the theme `zt` last set, so a scene always matches the terminal. On Windows `zt` keeps that file under `%LOCALAPPDATA%`, where Scenes does not look, so the PowerShell commands hand the theme over themselves. @@ -24,6 +25,29 @@ bash apps/zacess-scenes/setup.sh Run it again whenever a new release is out: it only downloads when the installed version is older. `--link` (or `-Link`) only links the settings. Edit `scenes.toml` to pick your own scenes and sounds; `zacess-scenes list` shows them all. +## My scenes + +Eight scenes of my own, written in Lua against the [Lua scene API](https://github.com/zacesshq/scenes/blob/main/docs/lua.md). They load like the built-in ones, so `zs list` marks them as yours and `zs` can pick them at random. + +| Scene | Kind | Shows | +| --- | --- | --- | +| [`hello-isaac`](scenes/hello-isaac.lua) | general | A big scrolling greeting for the time of day (good morning, good afternoon, good evening or late night) with the date. Behind it is a pixel sky tinted for the time with soft clouds, the sun crossing by the hour or a crescent moon at night. Rolling hills with trees run along the bottom. A line under it is typed over by a different project every nine seconds | +| [`now-building`](scenes/now-building.lua) | general | A departure board of my projects with a platform, tagline and status each that turn over like split flaps every ten seconds, plus a calling-at ticker of every tagline | +| [`lidarsat`](scenes/lidarsat.lua) | general | A pixel quadcopter over shaded hills and lit rooftops sweeping a fan of lidar rays at the ground. Every return stays on the land, so a point cloud grows behind it. A nav readout and a caption ticker sit on top | +| [`scope`](scenes/scope.lua) | general | A pixel oscilloscope in roll mode with a dotted graticule: a sine on channel 1 and a PWM square wave with a slowly drifting duty cycle on channel 2, each with a faint phosphor glow, plus readouts and a bench ticker | +| [`phaemos`](scenes/phaemos.lua) | general | A pixel motor and pump with four PHAEMOS nodes sending readings along a bus to the gateway, beside a scrolling vibration chart for each. The pump bearing wears to WATCH, gets a service estimate and is serviced again | +| [`build-passed`](scenes/build-passed.lua) | pass | BUILD PASSED AT 14:05 scrolling in the big font under pixel bunting with tumbling confetti. The ticker gives the time it passed, how long it has been green and the passing streak | +| [`build-failed`](scenes/build-failed.lua) | fail | BUILD FAILED AT 14:05 scrolling slowly over a pixel circuit board where one broken trace stops its signal at the gap. The ticker gives the time it failed, how long it has been failing and one small next step | +| [`football`](scenes/football.lua) | general | BUILD FC against BUGS on a striped pixel pitch with a goal and net, two kits (the away kit striped), a keeper and a crowd under the scoreboard. The teams pass the ball about calmly between results. A pass ends a short move in a goal: the net ripples, the scorer celebrates, the crowd does a slow wave and the scoreboard shows the score and GOAL AT 14:05. A fail ends it off the post or in the keeper's hands with the players holding their heads. Then the scoreboard gives one small next step. A ticker keeps the match report for the session: passes, fails, the streak and the time of the last result | + +Run one with `zs `, such as `zs lidarsat`. For the build watcher, `zw --scene build-passed --fail-scene build-failed` uses the pair for one run. `football` handles both results itself, so `zw --scene football --fail-scene football` keeps the one match going and its score carries over from a pass to a fail. `build-passed`, `build-failed` and `football` are already in the `pass` and `fail` lists in `scenes.toml`, so the rotation picks them too. + +Every scene draws with palette roles only, never a colour of its own, so it follows the theme `zt` set and keeps that theme's contrast in all ten Zacess themes, light ones included. Status is always a word as well as a colour (OK, WATCH, TESTING and the rest). Scrolling text moves in whole cells at a steady rate and loops without a seam; calm motion and reduced motion slow it further. Under reduced motion the rotors stop and the board's letters appear in place without flapping. Every scene passes the program's flash meter. + +The scenes read the local time from `ctx.clock` and paint with the pixel canvas, both added to Zacess Scenes after 0.6.0. The pass and fail scenes and `football` take the time of a result from the moment the watch mode reports it, so a scene run on its own or just swapped in by the rotation leaves the time out rather than guess it. On an older release without the clock, `hello-isaac` says a plain hello and the times are left out. Without the canvas, every scene draws the same shapes in half-block characters instead. + +To change one, edit it here: the link means the next start picks the change up. On Windows without Developer Mode the scenes are copied, so run the setup again with `-Link`. To check one, `zs snap --theme warm-light --out still.svg` draws a still and `zacess-scenes list` reports any scene that fails to load. + ## Commands The shell topics `zacess-scenes` add these on every system: diff --git a/apps/zacess-scenes/scenes.toml b/apps/zacess-scenes/scenes.toml index 17d82ca..e8f18c4 100644 --- a/apps/zacess-scenes/scenes.toml +++ b/apps/zacess-scenes/scenes.toml @@ -7,9 +7,9 @@ [scenes] # calm scenes for a passing build, picked in turn -pass = ["koi-pond", "lanterns", "tea", "winter-cabin", "constellations", "aurora"] +pass = ["koi-pond", "lanterns", "tea", "winter-cabin", "constellations", "city-night", "aurora", "cat-nap", "mountain-lake", "garden", "balloons", "rocket-launch", "pit-stop", "pcb-bring-up", "drone-landing", "kettle-boil", "build-passed", "football"] # slow failure scenes -fail = ["storm", "flood", "fog"] +fail = ["storm", "flood", "fog", "tangle", "leak", "short-circuit", "thin-ice", "launch-scrub", "pit-stop-stuck", "dead-led", "landing-abort", "kettle-cold", "build-failed", "football"] rotation = "shuffle" # minutes before the next scene, in the watch and follow modes and in a scene run on its own interval = 5 diff --git a/apps/zacess-scenes/scenes/build-failed.lua b/apps/zacess-scenes/scenes/build-failed.lua new file mode 100644 index 0000000..f319b16 --- /dev/null +++ b/apps/zacess-scenes/scenes/build-failed.lua @@ -0,0 +1,421 @@ +-- build-failed: my own fail scene for the build watcher, calm rather than alarming. BUILD FAILED +-- scrolls slowly across the top while signals run along the copper of a pixel circuit board. One +-- trace is broken, so its signal stops at the gap: something to find and fix. A ticker near the +-- bottom says when it failed, how long it has been failing and gives one small next step. +-- +-- installed into the Zacess Scenes folder by apps/zacess-scenes/setup.sh or setup.ps1. Every +-- colour is a palette role, so the scene follows whichever Zacess theme zt last set. It reads the +-- time from ctx.clock and paints with the pixel canvas; on an older Zacess Scenes without them it +-- leaves the time out and draws the same shapes in half-block characters. + +-- cells a second the big banner moves; slower than the pass banner, a failure is no rush +local BANNER_RATE = 6 +-- cells a second the ticker moves +local TICKER_RATE = 6 +-- pixels a second a signal travels along a trace +local SIGNAL_RATE = 9 +-- seconds a stopped signal waits at the break before the next one sets off +local WAIT = 2.5 + +local TIPS = { + "read the first error, not the last", + "fix one thing, then save", + "check what changed since it was green", + "run the failing test on its own", + "a short walk counts as debugging", +} +-- the colour bands on each resistor, as resistors carry them +local BANDS = { "red", "magenta", "yellow", "green" } + +-- a 5 by 7 pixel font: each glyph is its seven rows split by spaces, # for a lit pixel +local FONT = { + A = ".###. #...# #...# ##### #...# #...# #...#", + B = "####. #...# #...# ####. #...# #...# ####.", + C = ".###. #...# #.... #.... #.... #...# .###.", + D = "####. #...# #...# #...# #...# #...# ####.", + E = "##### #.... #.... ####. #.... #.... #####", + F = "##### #.... #.... ####. #.... #.... #....", + G = ".###. #...# #.... #.### #...# #...# .####", + H = "#...# #...# #...# ##### #...# #...# #...#", + I = "### .#. .#. .#. .#. .#. ###", + J = "..### ...#. ...#. ...#. ...#. #..#. .##..", + K = "#...# #..#. #.#.. ##... #.#.. #..#. #...#", + L = "#.... #.... #.... #.... #.... #.... #####", + M = "#...# ##.## #.#.# #.#.# #...# #...# #...#", + N = "#...# #...# ##..# #.#.# #..## #...# #...#", + O = ".###. #...# #...# #...# #...# #...# .###.", + P = "####. #...# #...# ####. #.... #.... #....", + Q = ".###. #...# #...# #...# #.#.# #..#. .##.#", + R = "####. #...# #...# ####. #.#.. #..#. #...#", + S = ".#### #.... #.... .###. ....# ....# ####.", + T = "##### ..#.. ..#.. ..#.. ..#.. ..#.. ..#..", + U = "#...# #...# #...# #...# #...# #...# .###.", + V = "#...# #...# #...# #...# #...# .#.#. ..#..", + W = "#...# #...# #...# #.#.# #.#.# #.#.# .#.#.", + X = "#...# #...# .#.#. ..#.. .#.#. #...# #...#", + Y = "#...# #...# .#.#. ..#.. ..#.. ..#.. ..#..", + Z = "##### ....# ...#. ..#.. .#... #.... #####", + ["0"] = ".###. #...# #..## #.#.# ##..# #...# .###.", + ["1"] = "..#.. .##.. ..#.. ..#.. ..#.. ..#.. .###.", + ["2"] = ".###. #...# ....# ...#. ..#.. .#... #####", + ["3"] = "####. ....# ....# .###. ....# ....# ####.", + ["4"] = "...#. ..##. .#.#. #..#. ##### ...#. ...#.", + ["5"] = "##### #.... ####. ....# ....# #...# .###.", + ["6"] = ".###. #.... #.... ####. #...# #...# .###.", + ["7"] = "##### ....# ...#. ..#.. .#... .#... .#...", + ["8"] = ".###. #...# #...# .###. #...# #...# .###.", + ["9"] = ".###. #...# #...# .#### ....# ....# .###.", + [" "] = "... ... ... ... ... ... ...", + ["."] = ".. .. .. .. .. ## ##", + [","] = ".. .. .. .. .# .# #.", + ["!"] = "# # # # # . #", + [":"] = ". # # . # # .", + ["'"] = "# # . . . . .", + ["-"] = "... ... ... ### ... ... ...", + ["·"] = ".. .. .. ## ## .. ..", + ["✓"] = "..... ....# ...## #.##. ###.. .#... .....", + ["?"] = ".###. #...# ....# ...#. ..#.. ..... ..#..", +} + +-- every glyph as its list of pixel rows, split once when the file loads +local glyphs = {} +for ch, rows in pairs(FONT) do + local grid = {} + for row in rows:gmatch("%S+") do + grid[#grid + 1] = row + end + glyphs[ch] = grid +end + +-- lays a message out as four rows of half-block cells, two pixel rows to a cell so each pixel is +-- about square. Returns the rows as lists of characters (false where nothing is lit) and the width +local function layout(message) + local cells = { {}, {}, {}, {} } + local width = 0 + for _, code in utf8.codes(message:upper()) do + local grid = glyphs[utf8.char(code)] or glyphs[" "] + local gw = #grid[1] + for col = 1, gw do + for r = 1, 4 do + local top = grid[r * 2 - 1]:sub(col, col) == "#" + local bottom = r * 2 <= #grid and grid[r * 2]:sub(col, col) == "#" + cells[r][width + col] = (top and bottom and "█") or (top and "▀") or (bottom and "▄") or false + end + end + -- one empty column between letters + width = width + gw + 1 + for r = 1, 4 do + cells[r][width] = false + end + end + return cells, width +end + +-- draws a laid out banner scrolled left by offset cells so it loops without a seam. With once set +-- it is drawn a single time at that offset instead. Only lit cells are drawn, which leaves the backdrop showing +-- through the gaps in the letters +local function draw_banner(cells, width, offset, y, w, role, once) + for r = 1, 4 do + local row = cells[r] + local run, start = {}, nil + for x = 0, w do + local col = x + offset + local ch = false + if x < w and (not once or (col >= 0 and col < width)) then + ch = row[col % width + 1] + end + if ch then + start = start or x + run[#run + 1] = ch + elseif start then + put(start, y + r - 1, table.concat(run), role) + run, start = {}, nil + end + end + end +end + +-- a string as a list of characters, so text with a middle dot slices by character, not byte +local function chars(s) + local list = {} + for _, code in utf8.codes(s) do + list[#list + 1] = utf8.char(code) + end + return list +end + +-- pixel drawing that runs on every version of Zacess Scenes: the program's own pixel canvas +-- where it has one. On an older version without it the same calls are drawn as half-block +-- characters, so the scene still shows its shapes. Call flush after the pixels and before any +-- text, since text is drawn over them +local function painter(ctx) + if ctx.rect then + return { + width = ctx.pixel_width, + height = ctx.pixel_height, + pixel = ctx.pixel, + rect = ctx.rect, + disc = ctx.disc, + line = ctx.line, + flush = function() end, + } + end + local w, h = ctx.width, ctx.height * 2 + local grid = {} + local function set(x, y, role, strength) + -- faint imagery drops away here, as it does on screen with colour turned off + if (strength or 1) < 0.3 then + return + end + x, y = math.floor(x), math.floor(y) + if x >= 0 and x < w and y >= 0 and y < h then + grid[y * w + x] = role or "text" + end + end + local p = { width = w, height = h } + p.pixel = set + p.rect = function(x, y, rw, rh, role, strength) + for yy = math.max(0, math.floor(y)), math.min(h, math.floor(y + rh)) - 1 do + for xx = math.max(0, math.floor(x)), math.min(w, math.floor(x + rw)) - 1 do + set(xx, yy, role, strength) + end + end + end + p.disc = function(cx, cy, r, role, strength) + for yy = math.floor(cy - r), math.ceil(cy + r) do + for xx = math.floor(cx - r), math.ceil(cx + r) do + if (xx - cx) ^ 2 + (yy - cy) ^ 2 <= r * r then + set(xx, yy, role, strength) + end + end + end + end + p.line = function(x1, y1, x2, y2, role, strength) + local n = math.max(math.abs(x2 - x1), math.abs(y2 - y1), 1) + for i = 0, n do + set(x1 + (x2 - x1) * i / n + 0.5, y1 + (y2 - y1) * i / n + 0.5, role, strength) + end + end + p.flush = function() + for cy = 0, ctx.height - 1 do + for x = 0, w - 1 do + local top, bottom = grid[cy * 2 * w + x], grid[(cy * 2 + 1) * w + x] + if top and bottom then + put(x, cy, top == bottom and "█" or "▀", top) + elseif top then + put(x, cy, "▀", top) + elseif bottom then + put(x, cy, "▄", bottom) + end + end + end + end + return p +end + +local banner, banner_width, banner_text +local scroll = 0 +local ticker_scroll = 0 +local signals = {} +-- when the build went red, the clock time it did and how many failing runs in a row, all known +-- only once the watch mode has called a hook on this scene, so a scene run on its own never +-- guesses a time +local failed_at = nil +local failed_time = nil +local fails = 0 + +-- the words in the big banner, with the time of the result once it is known +local function banner_words() + if failed_time then + return "build failed at " .. failed_time .. " · one thing at a time · " + end + return "build failed · one thing at a time · " +end + +-- the board in cells: the rows its traces run along, which one is broken and where the gap is +local function board(ctx) + local w, h = ctx.width, ctx.height + local top = math.max(8, math.floor(h / 6) + 7) + local bottom = h - 6 + local count = math.max(2, math.min(5, math.floor((bottom - top) / 3) + 1)) + local traces = {} + for i = 1, count do + local y = top + math.floor((i - 1) * (bottom - top) / math.max(1, count - 1)) + traces[i] = { y = y, broken = i == math.floor(count / 2) + 1 } + end + return traces, math.floor(w * 0.62) +end + +local function reset_signals(ctx) + signals = {} + local traces = board(ctx) + for i = 1, #traces do + signals[i] = { x = -ctx.random(0, 30), wait = 0 } + end +end + +-- minutes and seconds, padded so the ticker keeps its length as the clock counts up +local function stopwatch(seconds) + local s = math.floor(seconds) + return string.format("%2d:%02d", math.floor(s / 60), s % 60) +end + +return { + name = "build-failed", + kind = "fail", + summary = "BUILD FAILED scrolling slowly over a pixel circuit board with one broken trace", + captions = { + "Build failed. One thing at a time.", + "Something to fix. Read the first error.", + "Not green yet. Breathe, then look.", + }, + + init = function(ctx) + reset_signals(ctx) + end, + + resize = function(ctx) + reset_signals(ctx) + end, + + frame = function(ctx) + local w, h = ctx.width, ctx.height + local t = ctx.time + local px = painter(ctx) + local traces, gap = board(ctx) + local chip = w - 16 + + local words = banner_words() + if words ~= banner_text then + banner_text = words + banner, banner_width = layout(words) + end + + -- the board itself, a faint green with a slightly stronger edge + local top = (traces[1].y - 3) * 2 + local bottom = (traces[#traces].y + 2) * 2 + px.rect(1, top, w - 2, bottom - top, "green", 0.1) + px.line(1, top, w - 2, top, "green", 0.3) + px.line(1, bottom, w - 2, bottom, "green", 0.3) + + -- each trace in copper with a pad at the start, a resistor with its bands and a capacitor + for i, trace in ipairs(traces) do + local y = trace.y * 2 + if trace.broken then + px.line(4, y, gap - 2, y, "yellow", 0.7) + px.line(gap + 3, y, chip, y, "yellow", 0.7) + -- the two ends of the break, marked + px.rect(gap - 3, y - 1, 3, 3, "error", 1) + px.rect(gap + 2, y - 1, 3, 3, "error", 1) + else + px.line(4, y, chip, y, "yellow", 0.7) + end + -- square pads, as on a real board; small discs come out as plus shapes in pixels + px.rect(3, y - 2, 5, 5, "yellow", 1) + px.rect(4, y - 1, 3, 3, "green", 0.1) + local r = math.floor(w * (0.18 + 0.07 * (i % 3))) + px.rect(r, y - 1, 9, 3, "syntax.function", 0.8) + for b = 0, 2 do + px.rect(r + 2 + b * 2, y - 1, 1, 3, BANDS[(i + b) % #BANDS + 1], 1) + end + local c = math.floor(w * (0.42 + 0.05 * (i % 2))) + px.rect(c, y - 2, 4, 5, "green", 0.1) + px.line(c, y - 2, c, y + 2, "text", 0.9) + px.line(c + 3, y - 2, c + 3, y + 2, "text", 0.9) + end + + -- the chip every trace runs into, with a pin for each + local chip_top = (traces[1].y - 1) * 2 + local chip_bottom = (traces[#traces].y + 1) * 2 + px.rect(chip, chip_top, 9, chip_bottom - chip_top, "grey", 0.6) + px.pixel(chip + 1, chip_top + 1, "text", 1) + for _, trace in ipairs(traces) do + px.line(chip + 9, trace.y * 2, w - 3, trace.y * 2, "yellow", 0.7) + px.rect(w - 4, trace.y * 2 - 1, 3, 3, "yellow", 1) + end + + -- signals run left to right with a fading tail; on the broken trace one stops at the gap, + -- waits, then the next one sets off from the left + for i, trace in ipairs(traces) do + local s = signals[i] + if s then + if s.wait > 0 then + s.wait = s.wait - ctx.dt + if s.wait <= 0 then + s.x = 4 + end + else + s.x = s.x + ctx.dt * SIGNAL_RATE * ctx.speed + if trace.broken and s.x >= gap - 4 then + s.x = gap - 4 + s.wait = WAIT + elseif s.x > chip - 2 then + s.x = 4 - ctx.random(0, 20) + end + end + local sx = math.floor(s.x) + if sx >= 6 then + local head = trace.broken and "warning" or "bright_cyan" + local tail = trace.broken and "warning" or "info" + for k = 1, 4 do + px.pixel(sx - k, trace.y * 2, tail, 1 - k * 0.2) + end + px.rect(sx, trace.y * 2 - 1, 2, 3, head, 1) + end + end + end + px.flush() + + -- labels above the parts and clear of their bodies, then the question mark under the gap + for i, trace in ipairs(traces) do + local r = math.floor(w * (0.18 + 0.07 * (i % 3))) + local c = math.floor(w * (0.42 + 0.05 * (i % 2))) + put(r + 3, trace.y - 2, "R" .. i, "text") + put(c, trace.y - 2, "C" .. i, "text") + if trace.broken then + put(gap, trace.y + 1, "?", "warning") + end + end + put(chip + 3, traces[1].y - 2, "U1", "text") + + -- the banner across the top + local by = math.max(1, math.floor(h / 6) - 1) + scroll = scroll + ctx.dt * BANNER_RATE * ctx.speed + draw_banner(banner, banner_width, math.floor(scroll), by, w, "error") + + -- the ticker two rows up from the bottom, so the watch mode's status bar never hides it. + -- The tip changes once per failing run, not on a timer + local tip = TIPS[math.max(0, fails - 1) % #TIPS + 1] + local parts = "build failed" + if failed_time then + parts = parts .. " at " .. failed_time + end + parts = parts .. " · " + if failed_at then + parts = parts .. "failing for " .. stopwatch(t - failed_at) .. " · " + end + if fails > 1 then + parts = parts .. string.format("%d failing runs in a row", fails) .. " · " + end + local text = chars(parts .. tip .. " · ") + ticker_scroll = ticker_scroll + ctx.dt * TICKER_RATE * ctx.speed + local offset = math.floor(ticker_scroll) + local out = {} + for x = 1, w do + out[x] = text[(x - 1 + offset) % #text + 1] + end + put(0, h - 4, string.rep("─", w), "grey") + put(0, h - 3, table.concat(out), "warning") + end, + + on_fail = function(ctx) + -- the clock keeps running from the first failure, while the time shown is the latest one + failed_at = failed_at or ctx.time + failed_time = ctx.clock and ctx.clock.time or failed_time + fails = fails + 1 + if fails > 1 then + local tip = TIPS[(fails - 1) % #TIPS + 1] + return "Still failing. " .. tip:sub(1, 1):upper() .. tip:sub(2) .. "." + end + end, +} diff --git a/apps/zacess-scenes/scenes/build-passed.lua b/apps/zacess-scenes/scenes/build-passed.lua new file mode 100644 index 0000000..caf6d23 --- /dev/null +++ b/apps/zacess-scenes/scenes/build-passed.lua @@ -0,0 +1,374 @@ +-- build-passed: my own pass scene for the build watcher. BUILD PASSED scrolls across the top in +-- the big font with the time of the result, under pixel bunting with confetti tumbling slowly +-- down. A ticker near the bottom says when it passed, how long it has been green and how many +-- passing runs came in a row. +-- +-- installed into the Zacess Scenes folder by apps/zacess-scenes/setup.sh or setup.ps1. Every +-- colour is a palette role, so the scene follows whichever Zacess theme zt last set. It reads the +-- time from ctx.clock and paints with the pixel canvas; on an older Zacess Scenes without them it +-- leaves the time out and draws the same shapes in half-block characters. + +-- cells a second the big banner moves at standard motion +local BANNER_RATE = 9 +-- cells a second the ticker moves +local TICKER_RATE = 7 +-- confetti falls this many pixels a second at most; slow, so it drifts rather than rains +local FALL_RATE = 4.5 +-- seconds for a piece of confetti to sway from side to side +local SWAY_PERIOD = 4 +-- seconds between a piece turning from flat to edge on, slowed by ctx.pace +local TUMBLE_PERIOD = 0.9 + +-- the roles the confetti and the pennants take in turn +local COLOURS = { "bright_green", "bright_yellow", "bright_cyan", "bright_magenta", "accent", "green" } + +-- a 5 by 7 pixel font: each glyph is its seven rows split by spaces, # for a lit pixel +local FONT = { + A = ".###. #...# #...# ##### #...# #...# #...#", + B = "####. #...# #...# ####. #...# #...# ####.", + C = ".###. #...# #.... #.... #.... #...# .###.", + D = "####. #...# #...# #...# #...# #...# ####.", + E = "##### #.... #.... ####. #.... #.... #####", + F = "##### #.... #.... ####. #.... #.... #....", + G = ".###. #...# #.... #.### #...# #...# .####", + H = "#...# #...# #...# ##### #...# #...# #...#", + I = "### .#. .#. .#. .#. .#. ###", + J = "..### ...#. ...#. ...#. ...#. #..#. .##..", + K = "#...# #..#. #.#.. ##... #.#.. #..#. #...#", + L = "#.... #.... #.... #.... #.... #.... #####", + M = "#...# ##.## #.#.# #.#.# #...# #...# #...#", + N = "#...# #...# ##..# #.#.# #..## #...# #...#", + O = ".###. #...# #...# #...# #...# #...# .###.", + P = "####. #...# #...# ####. #.... #.... #....", + Q = ".###. #...# #...# #...# #.#.# #..#. .##.#", + R = "####. #...# #...# ####. #.#.. #..#. #...#", + S = ".#### #.... #.... .###. ....# ....# ####.", + T = "##### ..#.. ..#.. ..#.. ..#.. ..#.. ..#..", + U = "#...# #...# #...# #...# #...# #...# .###.", + V = "#...# #...# #...# #...# #...# .#.#. ..#..", + W = "#...# #...# #...# #.#.# #.#.# #.#.# .#.#.", + X = "#...# #...# .#.#. ..#.. .#.#. #...# #...#", + Y = "#...# #...# .#.#. ..#.. ..#.. ..#.. ..#..", + Z = "##### ....# ...#. ..#.. .#... #.... #####", + ["0"] = ".###. #...# #..## #.#.# ##..# #...# .###.", + ["1"] = "..#.. .##.. ..#.. ..#.. ..#.. ..#.. .###.", + ["2"] = ".###. #...# ....# ...#. ..#.. .#... #####", + ["3"] = "####. ....# ....# .###. ....# ....# ####.", + ["4"] = "...#. ..##. .#.#. #..#. ##### ...#. ...#.", + ["5"] = "##### #.... ####. ....# ....# #...# .###.", + ["6"] = ".###. #.... #.... ####. #...# #...# .###.", + ["7"] = "##### ....# ...#. ..#.. .#... .#... .#...", + ["8"] = ".###. #...# #...# .###. #...# #...# .###.", + ["9"] = ".###. #...# #...# .#### ....# ....# .###.", + [" "] = "... ... ... ... ... ... ...", + ["."] = ".. .. .. .. .. ## ##", + [","] = ".. .. .. .. .# .# #.", + ["!"] = "# # # # # . #", + [":"] = ". # # . # # .", + ["'"] = "# # . . . . .", + ["-"] = "... ... ... ### ... ... ...", + ["·"] = ".. .. .. ## ## .. ..", + ["✓"] = "..... ....# ...## #.##. ###.. .#... .....", + ["?"] = ".###. #...# ....# ...#. ..#.. ..... ..#..", +} + +-- every glyph as its list of pixel rows, split once when the file loads +local glyphs = {} +for ch, rows in pairs(FONT) do + local grid = {} + for row in rows:gmatch("%S+") do + grid[#grid + 1] = row + end + glyphs[ch] = grid +end + +-- lays a message out as four rows of half-block cells, two pixel rows to a cell so each pixel is +-- about square. Returns the rows as lists of characters (false where nothing is lit) and the width +local function layout(message) + local cells = { {}, {}, {}, {} } + local width = 0 + for _, code in utf8.codes(message:upper()) do + local grid = glyphs[utf8.char(code)] or glyphs[" "] + local gw = #grid[1] + for col = 1, gw do + for r = 1, 4 do + local top = grid[r * 2 - 1]:sub(col, col) == "#" + local bottom = r * 2 <= #grid and grid[r * 2]:sub(col, col) == "#" + cells[r][width + col] = (top and bottom and "█") or (top and "▀") or (bottom and "▄") or false + end + end + -- one empty column between letters + width = width + gw + 1 + for r = 1, 4 do + cells[r][width] = false + end + end + return cells, width +end + +-- draws a laid out banner scrolled left by offset cells so it loops without a seam. With once set +-- it is drawn a single time at that offset instead. Only lit cells are drawn, which leaves the backdrop showing +-- through the gaps in the letters +local function draw_banner(cells, width, offset, y, w, role, once) + for r = 1, 4 do + local row = cells[r] + local run, start = {}, nil + for x = 0, w do + local col = x + offset + local ch = false + if x < w and (not once or (col >= 0 and col < width)) then + ch = row[col % width + 1] + end + if ch then + start = start or x + run[#run + 1] = ch + elseif start then + put(start, y + r - 1, table.concat(run), role) + run, start = {}, nil + end + end + end +end + +-- a string as a list of characters, so text with a middle dot slices by character, not byte +local function chars(s) + local list = {} + for _, code in utf8.codes(s) do + list[#list + 1] = utf8.char(code) + end + return list +end + +-- pixel drawing that runs on every version of Zacess Scenes: the program's own pixel canvas +-- where it has one. On an older version without it the same calls are drawn as half-block +-- characters, so the scene still shows its shapes. Call flush after the pixels and before any +-- text, since text is drawn over them +local function painter(ctx) + if ctx.rect then + return { + width = ctx.pixel_width, + height = ctx.pixel_height, + pixel = ctx.pixel, + rect = ctx.rect, + disc = ctx.disc, + line = ctx.line, + flush = function() end, + } + end + local w, h = ctx.width, ctx.height * 2 + local grid = {} + local function set(x, y, role, strength) + -- faint imagery drops away here, as it does on screen with colour turned off + if (strength or 1) < 0.3 then + return + end + x, y = math.floor(x), math.floor(y) + if x >= 0 and x < w and y >= 0 and y < h then + grid[y * w + x] = role or "text" + end + end + local p = { width = w, height = h } + p.pixel = set + p.rect = function(x, y, rw, rh, role, strength) + for yy = math.max(0, math.floor(y)), math.min(h, math.floor(y + rh)) - 1 do + for xx = math.max(0, math.floor(x)), math.min(w, math.floor(x + rw)) - 1 do + set(xx, yy, role, strength) + end + end + end + p.disc = function(cx, cy, r, role, strength) + for yy = math.floor(cy - r), math.ceil(cy + r) do + for xx = math.floor(cx - r), math.ceil(cx + r) do + if (xx - cx) ^ 2 + (yy - cy) ^ 2 <= r * r then + set(xx, yy, role, strength) + end + end + end + end + p.line = function(x1, y1, x2, y2, role, strength) + local n = math.max(math.abs(x2 - x1), math.abs(y2 - y1), 1) + for i = 0, n do + set(x1 + (x2 - x1) * i / n + 0.5, y1 + (y2 - y1) * i / n + 0.5, role, strength) + end + end + p.flush = function() + for cy = 0, ctx.height - 1 do + for x = 0, w - 1 do + local top, bottom = grid[cy * 2 * w + x], grid[(cy * 2 + 1) * w + x] + if top and bottom then + put(x, cy, top == bottom and "█" or "▀", top) + elseif top then + put(x, cy, "▀", top) + elseif bottom then + put(x, cy, "▄", bottom) + end + end + end + end + return p +end + +local banner, banner_width, banner_text +local scroll = 0 +local ticker_scroll = 0 +local confetti = {} +-- when the build went green, the clock time it did and how many passing runs in a row, all known +-- only once the watch mode has called a hook on this scene. A scene run on its own or one the +-- rotation has just swapped in never guesses a time it was not there for +local passed_at = nil +local passed_time = nil +local streak = 0 + +-- the words in the big banner, with the time of the result once it is known +local function banner_words() + if passed_time then + return "✓ build passed at " .. passed_time .. " · all green · " + end + return "✓ build passed · all green · " +end + +-- a garland of pennants on a sagging string from one side of the screen to the other, in pixels +local function bunting(px, top, sag) + local pw = px.width + local mid = (pw - 1) / 2 + local function rope(x) + local d = (x - mid) / mid + return top + math.floor(sag * (1 - d * d) + 0.5) + end + for x = 0, pw - 2 do + px.line(x, rope(x), x + 1, rope(x + 1), "grey", 0.7) + end + for x = 5, pw - 5, 11 do + local y = rope(x) + 1 + local role = COLOURS[(x // 11) % #COLOURS + 1] + px.rect(x - 3, y, 7, 1, role, 1) + px.rect(x - 2, y + 1, 5, 1, role, 1) + px.rect(x - 1, y + 2, 3, 1, role, 1) + px.pixel(x, y + 3, role, 1) + end +end + +local function scatter(ctx) + confetti = {} + local count = math.max(10, math.floor(ctx.width * ctx.height / 40 * ctx.busy)) + if ctx.reduced then + count = math.floor(count / 2) + end + for i = 1, count do + confetti[i] = { + x = ctx.random() * ctx.width, + y = ctx.random() * ctx.height * 2, + fall = (0.4 + ctx.random() * 0.6) * FALL_RATE, + phase = ctx.random() * 6.28, + role = COLOURS[ctx.random(#COLOURS)], + } + end +end + +-- minutes and seconds, padded so the ticker keeps its length as the clock counts up +local function stopwatch(seconds) + local s = math.floor(seconds) + return string.format("%2d:%02d", math.floor(s / 60), s % 60) +end + +return { + name = "build-passed", + kind = "pass", + summary = "BUILD PASSED in big letters with the time, bunting and tumbling pixel confetti", + captions = { + "Build passed. Nice work, Isaac.", + "All green. Ship it when ready.", + "Clean run. On to the next thing.", + }, + + init = function(ctx) + scatter(ctx) + end, + + resize = function(ctx) + scatter(ctx) + end, + + frame = function(ctx) + local w, h = ctx.width, ctx.height + local t = ctx.time + local px = painter(ctx) + local ph = px.height + + local words = banner_words() + if words ~= banner_text then + banner_text = words + banner, banner_width = layout(words) + end + local by = math.max(4, math.floor(h / 6) + 1) + + -- confetti behind everything, kept out of the banner's band and the ticker's, falling + -- slowly, swaying and turning between flat and edge on + for _, c in ipairs(confetti) do + c.y = c.y + c.fall * ctx.speed * ctx.dt + if c.y >= ph then + c.y = c.y - ph + c.x = ctx.random() * w + end + local sway = math.sin(t * 2 * math.pi / SWAY_PERIOD * ctx.pace + c.phase) * 1.5 + local x, y = math.floor(c.x + sway), math.floor(c.y) + local band = (y >= (by - 1) * 2 and y < (by + 5) * 2) or y >= (h - 4) * 2 + if not band then + local flat = ctx.reduced or math.floor(t / TUMBLE_PERIOD * ctx.pace + c.phase) % 2 == 0 + if flat then + px.rect(x, y, 2, 1, c.role, 1) + else + px.rect(x, y, 1, 2, c.role, 1) + end + end + end + + -- two garlands, one above the banner and one sagging lower across the middle + bunting(px, 1, 4) + bunting(px, math.floor(ph * 0.5), 6) + px.flush() + + scroll = scroll + ctx.dt * BANNER_RATE * ctx.speed + draw_banner(banner, banner_width, math.floor(scroll), by, w, "bright_green") + + -- the ticker two rows up from the bottom, so the watch mode's status bar never hides it + local parts = "build passed" + if passed_time then + parts = parts .. " at " .. passed_time + end + parts = parts .. " · " + if passed_at then + parts = parts .. "green for " .. stopwatch(t - passed_at) .. " · " + end + if streak > 1 then + parts = parts .. string.format("%d green runs in a row", streak) .. " · " + end + local text = chars(parts .. "all green · nice work, Isaac · ") + ticker_scroll = ticker_scroll + ctx.dt * TICKER_RATE * ctx.speed + local offset = math.floor(ticker_scroll) + local out = {} + for x = 1, w do + out[x] = text[(x - 1 + offset) % #text + 1] + end + put(0, h - 4, string.rep("─", w), "grey") + put(0, h - 3, table.concat(out), "green") + end, + + on_pass = function(ctx) + -- a pass after a pass keeps the build green, so the clock keeps running from the first + -- one, while the time shown is the latest result + passed_at = passed_at or ctx.time + passed_time = ctx.clock and ctx.clock.time or passed_time + streak = streak + 1 + if streak > 1 then + return string.format("Passed again. %d in a row.", streak) + end + end, + + on_recovered = function(ctx) + passed_at = ctx.time + passed_time = ctx.clock and ctx.clock.time or nil + streak = 1 + return "Fixed and green. Well done." + end, +} diff --git a/apps/zacess-scenes/scenes/football.lua b/apps/zacess-scenes/scenes/football.lua new file mode 100644 index 0000000..a32b349 --- /dev/null +++ b/apps/zacess-scenes/scenes/football.lua @@ -0,0 +1,501 @@ +-- football: BUILD FC against BUGS on a striped pixel pitch, with a goal and net, two teams of +-- small pixel players, a keeper and a crowd in the stand under the scoreboard. While nothing +-- happens the teams pass the ball about calmly. A passing build ends a short attacking move in a +-- goal: the net ripples, the scorer celebrates, the crowd does a slow wave and BUILD FC goes one +-- up. A failing build ends it off the post or in the keeper's hands: the players hold their +-- heads and the scoreboard gives one small next step. A ticker along the bottom keeps the match +-- report for the session. +-- +-- installed into the Zacess Scenes folder by apps/zacess-scenes/setup.sh or setup.ps1. Every +-- colour is a palette role, so the scene follows whichever Zacess theme zt last set. It reads the +-- time of each result from ctx.clock and paints with the pixel canvas; on an older Zacess Scenes +-- without them it leaves the times out and draws the same shapes in half-block characters. +-- +-- the score only carries over between a pass and a fail when the watch mode keeps this scene for +-- both, as with zw --scene football --fail-scene football + +-- seconds a pass takes at standard motion, then how long a player keeps the ball before the next +local PASS_TIME = 1.4 +local HOLD_TIME = 0.9 +-- seconds the move takes to reach the striker, then for the shot to arrive +local BUILD_UP = 1.2 +local SHOT_TIME = 0.8 +-- seconds the celebration or the disappointment lasts, then the length of the crowd's wave +local REACTION = 6 +local WAVE_LENGTH = 10 +-- pixels a second the crowd's wave travels along the stand +local WAVE_RATE = 18 +-- seconds for one ripple of the net to settle +local RIPPLE_TIME = 2.2 +-- steps a second a running player's legs change; slow, so they read as a jog +local STRIDE_RATE = 4 +-- cells a second the match report moves +local TICKER_RATE = 7 + +local TIPS = { + "read the first error", + "fix one thing, then save", + "check what changed", + "run that test alone", +} +-- the roles the crowd's shirts take, so the stand reads as many people +local CROWD = { "info", "magenta", "yellow", "cyan", "green", "accent", "text" } + +-- pixel drawing that runs on every version of Zacess Scenes: the program's own pixel canvas +-- where it has one. On an older version without it the same calls are drawn as half-block +-- characters, so the scene still shows its shapes. Call flush after the pixels and before any +-- text, since text is drawn over them +local function painter(ctx) + if ctx.rect then + return { + width = ctx.pixel_width, + height = ctx.pixel_height, + pixel = ctx.pixel, + rect = ctx.rect, + disc = ctx.disc, + line = ctx.line, + flush = function() end, + } + end + local w, h = ctx.width, ctx.height * 2 + local grid = {} + local function set(x, y, role, strength) + -- faint imagery drops away here, as it does on screen with colour turned off + if (strength or 1) < 0.3 then + return + end + x, y = math.floor(x), math.floor(y) + if x >= 0 and x < w and y >= 0 and y < h then + grid[y * w + x] = role or "text" + end + end + local p = { width = w, height = h } + p.pixel = set + p.rect = function(x, y, rw, rh, role, strength) + for yy = math.max(0, math.floor(y)), math.min(h, math.floor(y + rh)) - 1 do + for xx = math.max(0, math.floor(x)), math.min(w, math.floor(x + rw)) - 1 do + set(xx, yy, role, strength) + end + end + end + p.disc = function(cx, cy, r, role, strength) + for yy = math.floor(cy - r), math.ceil(cy + r) do + for xx = math.floor(cx - r), math.ceil(cx + r) do + if (xx - cx) ^ 2 + (yy - cy) ^ 2 <= r * r then + set(xx, yy, role, strength) + end + end + end + end + p.line = function(x1, y1, x2, y2, role, strength) + local n = math.max(math.abs(x2 - x1), math.abs(y2 - y1), 1) + for i = 0, n do + set(x1 + (x2 - x1) * i / n + 0.5, y1 + (y2 - y1) * i / n + 0.5, role, strength) + end + end + p.flush = function() + for cy = 0, ctx.height - 1 do + for x = 0, w - 1 do + local top, bottom = grid[cy * 2 * w + x], grid[(cy * 2 + 1) * w + x] + if top and bottom then + put(x, cy, top == bottom and "█" or "▀", top) + elseif top then + put(x, cy, "▀", top) + elseif bottom then + put(x, cy, "▄", bottom) + end + end + end + end + return p +end + +-- a string as a list of characters, so text with a middle dot slices by character, not byte +local function chars(s) + local list = {} + for _, code in utf8.codes(s) do + list[#list + 1] = utf8.char(code) + end + return list +end + +-- the session's match report, kept in the scene's own state +local passes, fails = 0, 0 +local streak, streak_kind = 0, nil +local last_time = nil +-- the moment playing out, if any: "goal", "post" or "save", when it started and its clock time +local event = nil +local note = nil +-- the small next step after a fail, shown under the result until the next pass +local tip = nil +-- the calm passing about between moments +local holder, target = 1, 2 +-- where the ball was when the last calm pass was drawn, so a move starts from there +local event_from = nil +local pass_clock = 0 +local passing = false +local ticker_scroll = 0 + +-- the pitch for the current size: the goal line, where the goal stands and the players' homes +local function pitch(ctx) + local pw, ph = ctx.width, ctx.height * 2 + local top = 19 + local bottom = (ctx.height - 4) * 2 + local depth = bottom - top + local gx = pw - 14 + return { + pw = pw, + top = top, + bottom = bottom, + gx = gx, + goal_foot = top + math.floor(depth * 0.7), + -- BUILD FC attacking to the right, BUGS defending in front of their goal + home = { + { x = pw * 0.14, y = top + depth * 0.55 }, + { x = pw * 0.3, y = top + depth * 0.25 }, + { x = pw * 0.36, y = top + depth * 0.8 }, + { x = pw * 0.52, y = top + depth * 0.5 }, + }, + away = { + { x = pw * 0.6, y = top + depth * 0.3 }, + { x = pw * 0.66, y = top + depth * 0.75 }, + { x = pw * 0.74, y = top + depth * 0.5 }, + }, + keeper = { x = gx - 3, y = top + depth * 0.6 }, + net = { x = gx + 6, y = top + depth * 0.62 - 4 }, + ph = ph, + } +end + +-- where a player stands now: their home with a slow wander, so the pitch never sits still +local function spot(home, i, t, ctx) + local drift = ctx.reduced and 0.5 or 1 + return home.x + 3 * drift * math.sin(t * 0.35 + i * 1.7), home.y + 2 * drift * math.sin(t * 0.27 + i) +end + +-- one small player, standing on (x, y): legs, shorts, a shirt in the kit (the away kit has a +-- stripe down it, so the teams differ in shape as well as colour), arms for the pose and a head +local function player(px, x, y, kit, striped, pose, stride) + x, y = math.floor(x), math.floor(y) + if stride % 2 == 0 then + px.pixel(x - 1, y, "text", 0.75) + px.pixel(x + 1, y, "text", 0.75) + else + px.pixel(x, y, "text", 0.75) + px.pixel(x, y - 1, "text", 0.75) + end + px.rect(x - 1, y - 2, 3, 1, "text", 0.5) + px.rect(x - 1, y - 5, 3, 3, kit, 1) + if striped then + px.line(x, y - 5, x, y - 3, "bright", 1) + end + if pose == "up" then + px.pixel(x - 2, y - 7, kit, 1) + px.pixel(x + 2, y - 7, kit, 1) + px.pixel(x - 2, y - 6, kit, 1) + px.pixel(x + 2, y - 6, kit, 1) + elseif pose == "head" then + px.pixel(x - 2, y - 6, kit, 1) + px.pixel(x + 2, y - 6, kit, 1) + px.pixel(x - 2, y - 7, "text", 0.85) + px.pixel(x + 2, y - 7, "text", 0.85) + else + px.pixel(x - 2, y - 4, kit, 0.8) + px.pixel(x + 2, y - 4, kit, 0.8) + end + -- a head with its top corners left off, so it reads round rather than square + px.pixel(x, y - 7, "text", 0.85) + px.rect(x - 1, y - 6, 3, 1, "text", 0.85) +end + +-- a straight line between two points, part of the way along +local function along(a, b, f) + f = math.max(0, math.min(1, f)) + return a[1] + (b[1] - a[1]) * f, a[2] + (b[2] - a[2]) * f +end + +local function record(kind, ctx) + local now = ctx.clock and ctx.clock.time or nil + if streak_kind == kind then + streak = streak + 1 + else + streak, streak_kind = 1, kind + end + last_time = now + return now +end + +return { + name = "football", + kind = "general", + summary = "BUILD FC on a pixel pitch: a goal for a pass, off the post for a fail, a match report", + captions = { + "BUILD FC in control. All good.", + "Clean build, tidy passing.", + "Keeping the ball. No errors.", + }, + + frame = function(ctx) + local w, h = ctx.width, ctx.height + local t = ctx.time + local px = painter(ctx) + local P = pitch(ctx) + local pw = P.pw + + -- the stand: a back wall, then four tiers of supporters, leaving room for the scoreboard + local board_w = 40 + local board_x = math.floor((w - board_w) / 2) + px.rect(0, 2, pw, 15, "grey", 0.18) + local waving = event and event.kind == "goal" and t - event.at < WAVE_LENGTH + local wave_x = waving and (t - event.at) * WAVE_RATE * ctx.speed - 10 or -100 + for tier = 0, 3 do + local hy = 5 + tier * 3 + for x = 1 + (tier % 2), pw - 2, 2 do + local under_board = x >= board_x - 1 and x <= board_x + board_w and hy <= 12 + if not under_board then + local up = math.abs(x - (wave_x - tier * 3)) < 5 + local role = CROWD[(x * 7 + tier * 3) % #CROWD + 1] + local y = up and hy - 1 or hy + px.pixel(x, y + 1, role, up and 0.8 or 0.45) + px.pixel(x, y, "text", up and 0.9 or 0.5) + if up then + px.pixel(x, y - 1, role, 0.8) + end + end + end + end + + -- the pitch: mown stripes, a touchline along the far side and the goal area markings + for x = 0, pw - 1, 10 do + px.rect(x, P.top, 5, P.bottom - P.top, "green", 0.42) + px.rect(x + 5, P.top, 5, P.bottom - P.top, "green", 0.3) + end + px.line(0, P.top, pw - 1, P.top, "text", 0.55) + px.line(P.gx - 16, P.top + 6, P.gx - 16, P.bottom - 2, "text", 0.4) + px.line(P.gx - 16, P.top + 6, P.gx, P.top + 6, "text", 0.4) + px.line(P.gx - 16, P.bottom - 2, P.gx, P.bottom - 2, "text", 0.4) + + -- the net behind the goal mouth, rippling outwards for a moment after a goal + local gx, foot = P.gx, P.goal_foot + local post_top = foot - 16 + local ripple = 0 + if event and event.kind == "goal" then + local since = t - event.at - BUILD_UP - SHOT_TIME + if since >= 0 and since < RIPPLE_TIME then + ripple = (1 - since / RIPPLE_TIME) * (ctx.reduced and 1 or 2) + end + end + for ny = post_top - 3, foot, 2 do + local bulge = math.floor(ripple * math.sin((ny - post_top) * 0.6 - t * 6 * ctx.pace) + 0.5) + for nx = gx + 2, gx + 9, 2 do + px.pixel(nx + bulge + (ny - post_top) % 4 // 2, ny, "muted", 0.5) + end + end + -- the near post, the crossbar running back to the far post, both in full strength + px.line(gx, post_top, gx, foot, "bright", 1) + px.line(gx, post_top, gx + 9, post_top - 4, "bright", 1) + px.line(gx + 9, post_top - 4, gx + 9, foot - 4, "bright", 0.6) + px.line(gx, foot, gx + 9, foot - 4, "text", 0.4) + + -- where everyone is + local home, away = {}, {} + for i, base in ipairs(P.home) do + home[i] = { spot(base, i, t, ctx) } + end + for i, base in ipairs(P.away) do + away[i] = { spot(base, i + 4, t, ctx) } + end + local striker = #home + local keeper = { P.keeper.x, P.keeper.y } + local ball + + if event and t - event.at > BUILD_UP + SHOT_TIME + REACTION then + event = nil + holder, target, pass_clock, passing = 1, 2, 0, false + end + + local scorer_pose, team_pose = nil, nil + if event then + local e = t - event.at + local strike = { home[striker][1] + 2, home[striker][2] } + if e < BUILD_UP then + -- the move: the ball goes from where it was to the striker, who closes in on goal + -- the striker runs into the box, clear of the watch mode's banner in the middle + home[striker][1] = home[striker][1] + (P.gx - 14 - home[striker][1]) * (e / BUILD_UP) + ball = { along(event.from, { home[striker][1] + 2, home[striker][2] }, e / BUILD_UP) } + else + home[striker][1] = P.gx - 14 + strike = { home[striker][1] + 2, home[striker][2] } + local shot = (e - BUILD_UP) / SHOT_TIME + local aim + if event.kind == "goal" then + aim = { P.net.x, P.net.y } + -- the keeper goes the wrong way + keeper[2] = keeper[2] + math.min(1, shot) * 6 + elseif event.kind == "post" then + aim = { gx, post_top + 6 } + else + aim = { gx - 3, keeper[2] - 4 } + keeper[2] = keeper[2] + (aim[2] + 4 - keeper[2]) * math.min(1, shot) + end + if shot <= 1 then + ball = { along(strike, aim, shot) } + elseif event.kind == "goal" then + ball = { aim[1] + 1, aim[2] + 2 } + elseif event.kind == "post" then + -- off the post and rolling back out of play, slowly + ball = { along(aim, { gx - 18, P.bottom - 4 }, (shot - 1) / 1.5) } + else + ball = { gx - 2, keeper[2] - 4 } + end + if shot > 1 then + if event.kind == "goal" then + scorer_pose = "up" + else + team_pose = "head" + end + end + end + else + -- calm passing about: hold the ball, then roll it to the next player + pass_clock = pass_clock + ctx.dt * ctx.speed + if passing then + if pass_clock >= PASS_TIME then + holder, passing, pass_clock = target, false, 0 + end + elseif pass_clock >= HOLD_TIME then + target = holder % (#home - 1) + 1 + if target == holder then + target = target % (#home - 1) + 1 + end + passing, pass_clock = true, 0 + end + local a = { home[holder][1] + 2, home[holder][2] } + if passing then + local b = { home[target][1] - 2, home[target][2] } + ball = { along(a, b, pass_clock / PASS_TIME) } + else + ball = a + end + event_from = ball + end + + -- the defenders and the keeper drift towards the ball, never quickly + for i, a in ipairs(away) do + a[1] = a[1] + (ball[1] - a[1]) * 0.12 + a[2] = a[2] + (ball[2] - a[2]) * 0.12 + end + if not event then + keeper[2] = keeper[2] + (ball[2] - keeper[2]) * 0.3 + end + + -- players nearer the far touchline are drawn first, so nearer ones stand in front + local stride = ctx.reduced and 0 or math.floor(t * STRIDE_RATE * ctx.pace) + local everyone = {} + for i, p in ipairs(home) do + local pose = (i == striker and scorer_pose) or team_pose + local hop = (pose == "up" and not ctx.reduced) and math.floor((math.sin(t * 4 * ctx.pace) + 1) / 1.5) or 0 + everyone[#everyone + 1] = { p[1], p[2] - hop, "info", false, pose, stride + i } + end + for i, p in ipairs(away) do + everyone[#everyone + 1] = { p[1], p[2], "magenta", true, nil, stride + i + 1 } + end + everyone[#everyone + 1] = { keeper[1], keeper[2], "yellow", false, nil, 0 } + table.sort(everyone, function(a, b) return a[2] < b[2] end) + for _, f in ipairs(everyone) do + player(px, f[1], f[2], f[3], f[4], f[5], f[6]) + end + -- the ball's shadow on the grass, then the ball + px.rect(math.floor(ball[1]), math.floor(ball[2]) + 1, 2, 1, "text", 0.25) + px.rect(math.floor(ball[1]), math.floor(ball[2]) - 1, 2, 2, "bright", 1) + px.flush() + + -- the scoreboard: the score, then what just happened and when + local status = "in play" + if event then + local done = t - event.at > BUILD_UP + SHOT_TIME + if not done then + status = "attack on goal" + else + status = note + end + elseif note then + status = note + end + local line1 = string.format("BUILD FC %d · BUGS %d", passes, fails) + put(board_x, 1, "┌" .. string.rep("─", board_w - 2) .. "┐", "grey") + put(board_x, 5, "└" .. string.rep("─", board_w - 2) .. "┘", "grey") + for y = 2, 4 do + put(board_x, y, "│" .. string.rep(" ", board_w - 2) .. "│", "grey") + end + local l1 = chars(line1) + put(board_x + math.floor((board_w - #l1) / 2), 2, line1, "bright") + local l2 = chars(status) + if #l2 > board_w - 4 then + status = table.concat(l2, "", 1, board_w - 4) + l2 = chars(status) + end + local status_role = "muted" + if event and t - event.at > BUILD_UP + SHOT_TIME then + status_role = event.kind == "goal" and "green" or "warning" + end + put(board_x + math.floor((board_w - #l2) / 2), 3, status, status_role) + if tip and not (event and t - event.at <= BUILD_UP + SHOT_TIME) then + local l3 = chars("next: " .. tip) + put(board_x + math.floor((board_w - #l3) / 2), 4, table.concat(l3), "text") + end + + -- the match report two rows up from the bottom, clear of the watch mode's status bar + local parts = { "match report", string.format("BUILD FC %d, BUGS %d", passes, fails) } + local function count(n, one, many) + return n .. " " .. (n == 1 and one or many) + end + parts[#parts + 1] = count(passes, "passing build", "passing builds") .. ", " .. count(fails, "failing", "failing") + if streak > 0 then + local word = streak_kind == "pass" and count(streak, "pass", "passes") or count(streak, "fail", "fails") + parts[#parts + 1] = "streak: " .. word .. (streak > 1 and " in a row" or "") + end + if last_time then + parts[#parts + 1] = "last result at " .. last_time + end + parts[#parts + 1] = "BUILD FC v BUGS, every save a match" + local text = chars(table.concat(parts, " · ") .. " · ") + ticker_scroll = ticker_scroll + ctx.dt * TICKER_RATE * ctx.speed + local offset = math.floor(ticker_scroll) + local out = {} + for x = 1, w do + out[x] = text[(x - 1 + offset) % #text + 1] + end + put(0, h - 3, table.concat(out), "syntax.function") + end, + + on_pass = function(ctx) + passes = passes + 1 + local at = record("pass", ctx) + event = { kind = "goal", at = ctx.time, from = event_from or { ctx.width * 0.2, 40 } } + note = at and ("GOAL AT " .. at) or "GOAL" + tip = nil + return at and ("Goal! Build passed at " .. at .. ".") or "Goal! Build passed." + end, + + on_recovered = function(ctx) + passes = passes + 1 + local at = record("pass", ctx) + event = { kind = "goal", at = ctx.time, from = event_from or { ctx.width * 0.2, 40 } } + note = at and ("EQUALISER AT " .. at) or "EQUALISER" + tip = nil + return "Back level. Fixed and green." + end, + + on_fail = function(ctx) + fails = fails + 1 + local at = record("fail", ctx) + -- alternate between the post and the keeper, so a run of fails does not look the same + local kind = fails % 2 == 1 and "post" or "save" + event = { kind = kind, at = ctx.time, from = event_from or { ctx.width * 0.2, 40 } } + tip = TIPS[(fails - 1) % #TIPS + 1] + local what = kind == "post" and "OFF THE POST" or "SAVED" + note = at and (what .. " AT " .. at) or what + return (kind == "post" and "Off the post. " or "Saved. ") .. tip:sub(1, 1):upper() .. tip:sub(2) .. "." + end, +} diff --git a/apps/zacess-scenes/scenes/hello-isaac.lua b/apps/zacess-scenes/scenes/hello-isaac.lua new file mode 100644 index 0000000..ec0edbc --- /dev/null +++ b/apps/zacess-scenes/scenes/hello-isaac.lua @@ -0,0 +1,447 @@ +-- hello-isaac: a big scrolling greeting for the time of day with the date, over a pixel sky with +-- soft clouds, the sun or the moon in its place and rolling hills with trees. A line under the +-- greeting turns over to a different project of mine every few seconds. +-- +-- installed into the Zacess Scenes folder by apps/zacess-scenes/setup.sh or setup.ps1. Every +-- colour is a palette role, so the scene follows whichever Zacess theme zt last set. It reads the +-- local time from ctx.clock and paints with the pixel canvas; on an older Zacess Scenes without +-- them it says a plain hello and draws the same shapes in half-block characters. + +-- cells a second the big banner moves at standard motion; ctx.speed slows it on calm and under +-- reduced motion, so it stays readable +local BANNER_RATE = 9 +-- seconds each project line stays before the next one is typed over it +local LINE_PERIOD = 9 +-- characters a second the next project line is typed over the last one +local TYPE_RATE = 24 +-- pixels a second the far hills, the near hills and the clouds drift +local FAR_RATE = 0.5 +local NEAR_RATE = 1.4 +local CLOUD_RATE = 0.8 + +local WHO = "Isaac Adjei · Electronic Engineering and Computer Science · Aston, Birmingham" +local PROJECTS = { + "Zacess: accessibility tools that follow your theme", + "Zacess Scenes: calm scenes for the terminal, written in Rust", + "Zacess Profile: one accessibility profile for every app", + "PHAEMOS: predictive maintenance for real machines", + "LidarSAT: drone navigation where GPS cannot reach", + "Footprints: a local ledger of every change, with undo", + "Vitafolio: one CV, tailored for every application", + "isaacadjei.me: the portfolio, the blog and the newsletter", +} + +-- each part of the day: its greeting, the sign-off after the date and the role that tints the sky +local PARTS = { + morning = { "Good morning", "keep building kind things", "yellow" }, + afternoon = { "Good afternoon", "keep building kind things", "cyan" }, + evening = { "Good evening", "nice work today", "magenta" }, + night = { "Late night", "time to rest soon", "blue" }, +} + +-- a 5 by 7 pixel font: each glyph is its seven rows split by spaces, # for a lit pixel +local FONT = { + A = ".###. #...# #...# ##### #...# #...# #...#", + B = "####. #...# #...# ####. #...# #...# ####.", + C = ".###. #...# #.... #.... #.... #...# .###.", + D = "####. #...# #...# #...# #...# #...# ####.", + E = "##### #.... #.... ####. #.... #.... #####", + F = "##### #.... #.... ####. #.... #.... #....", + G = ".###. #...# #.... #.### #...# #...# .####", + H = "#...# #...# #...# ##### #...# #...# #...#", + I = "### .#. .#. .#. .#. .#. ###", + J = "..### ...#. ...#. ...#. ...#. #..#. .##..", + K = "#...# #..#. #.#.. ##... #.#.. #..#. #...#", + L = "#.... #.... #.... #.... #.... #.... #####", + M = "#...# ##.## #.#.# #.#.# #...# #...# #...#", + N = "#...# #...# ##..# #.#.# #..## #...# #...#", + O = ".###. #...# #...# #...# #...# #...# .###.", + P = "####. #...# #...# ####. #.... #.... #....", + Q = ".###. #...# #...# #...# #.#.# #..#. .##.#", + R = "####. #...# #...# ####. #.#.. #..#. #...#", + S = ".#### #.... #.... .###. ....# ....# ####.", + T = "##### ..#.. ..#.. ..#.. ..#.. ..#.. ..#..", + U = "#...# #...# #...# #...# #...# #...# .###.", + V = "#...# #...# #...# #...# #...# .#.#. ..#..", + W = "#...# #...# #...# #.#.# #.#.# #.#.# .#.#.", + X = "#...# #...# .#.#. ..#.. .#.#. #...# #...#", + Y = "#...# #...# .#.#. ..#.. ..#.. ..#.. ..#..", + Z = "##### ....# ...#. ..#.. .#... #.... #####", + ["0"] = ".###. #...# #..## #.#.# ##..# #...# .###.", + ["1"] = "..#.. .##.. ..#.. ..#.. ..#.. ..#.. .###.", + ["2"] = ".###. #...# ....# ...#. ..#.. .#... #####", + ["3"] = "####. ....# ....# .###. ....# ....# ####.", + ["4"] = "...#. ..##. .#.#. #..#. ##### ...#. ...#.", + ["5"] = "##### #.... ####. ....# ....# #...# .###.", + ["6"] = ".###. #.... #.... ####. #...# #...# .###.", + ["7"] = "##### ....# ...#. ..#.. .#... .#... .#...", + ["8"] = ".###. #...# #...# .###. #...# #...# .###.", + ["9"] = ".###. #...# #...# .#### ....# ....# .###.", + [" "] = "... ... ... ... ... ... ...", + ["."] = ".. .. .. .. .. ## ##", + [","] = ".. .. .. .. .# .# #.", + ["!"] = "# # # # # . #", + [":"] = ". # # . # # .", + ["'"] = "# # . . . . .", + ["-"] = "... ... ... ### ... ... ...", + ["·"] = ".. .. .. ## ## .. ..", + ["✓"] = "..... ....# ...## #.##. ###.. .#... .....", + ["?"] = ".###. #...# ....# ...#. ..#.. ..... ..#..", +} + +-- every glyph as its list of pixel rows, split once when the file loads +local glyphs = {} +for ch, rows in pairs(FONT) do + local grid = {} + for row in rows:gmatch("%S+") do + grid[#grid + 1] = row + end + glyphs[ch] = grid +end + +-- lays a message out as four rows of half-block cells, two pixel rows to a cell so each pixel is +-- about square. Returns the rows as lists of characters (false where nothing is lit) and the width +local function layout(message) + local cells = { {}, {}, {}, {} } + local width = 0 + for _, code in utf8.codes(message:upper()) do + local grid = glyphs[utf8.char(code)] or glyphs[" "] + local gw = #grid[1] + for col = 1, gw do + for r = 1, 4 do + local top = grid[r * 2 - 1]:sub(col, col) == "#" + local bottom = r * 2 <= #grid and grid[r * 2]:sub(col, col) == "#" + cells[r][width + col] = (top and bottom and "█") or (top and "▀") or (bottom and "▄") or false + end + end + -- one empty column between letters + width = width + gw + 1 + for r = 1, 4 do + cells[r][width] = false + end + end + return cells, width +end + +-- draws a laid out banner scrolled left by offset cells so it loops without a seam. With once set +-- it is drawn a single time at that offset instead. Only lit cells are drawn, which leaves the backdrop showing +-- through the gaps in the letters +local function draw_banner(cells, width, offset, y, w, role, once) + for r = 1, 4 do + local row = cells[r] + local run, start = {}, nil + for x = 0, w do + local col = x + offset + local ch = false + if x < w and (not once or (col >= 0 and col < width)) then + ch = row[col % width + 1] + end + if ch then + start = start or x + run[#run + 1] = ch + elseif start then + put(start, y + r - 1, table.concat(run), role) + run, start = {}, nil + end + end + end +end + +-- a string as a list of characters, so text with a middle dot slices by character, not byte +local function chars(s) + local list = {} + for _, code in utf8.codes(s) do + list[#list + 1] = utf8.char(code) + end + return list +end + +-- pixel drawing that runs on every version of Zacess Scenes: the program's own pixel canvas +-- where it has one. On an older version without it the same calls are drawn as half-block +-- characters, so the scene still shows its shapes. Call flush after the pixels and before any +-- text, since text is drawn over them +local function painter(ctx) + if ctx.rect then + return { + width = ctx.pixel_width, + height = ctx.pixel_height, + pixel = ctx.pixel, + rect = ctx.rect, + disc = ctx.disc, + line = ctx.line, + flush = function() end, + } + end + local w, h = ctx.width, ctx.height * 2 + local grid = {} + local function set(x, y, role, strength) + -- faint imagery drops away here, as it does on screen with colour turned off + if (strength or 1) < 0.3 then + return + end + x, y = math.floor(x), math.floor(y) + if x >= 0 and x < w and y >= 0 and y < h then + grid[y * w + x] = role or "text" + end + end + local p = { width = w, height = h } + p.pixel = set + p.rect = function(x, y, rw, rh, role, strength) + for yy = math.max(0, math.floor(y)), math.min(h, math.floor(y + rh)) - 1 do + for xx = math.max(0, math.floor(x)), math.min(w, math.floor(x + rw)) - 1 do + set(xx, yy, role, strength) + end + end + end + p.disc = function(cx, cy, r, role, strength) + for yy = math.floor(cy - r), math.ceil(cy + r) do + for xx = math.floor(cx - r), math.ceil(cx + r) do + if (xx - cx) ^ 2 + (yy - cy) ^ 2 <= r * r then + set(xx, yy, role, strength) + end + end + end + end + p.line = function(x1, y1, x2, y2, role, strength) + local n = math.max(math.abs(x2 - x1), math.abs(y2 - y1), 1) + for i = 0, n do + set(x1 + (x2 - x1) * i / n + 0.5, y1 + (y2 - y1) * i / n + 0.5, role, strength) + end + end + p.flush = function() + for cy = 0, ctx.height - 1 do + for x = 0, w - 1 do + local top, bottom = grid[cy * 2 * w + x], grid[(cy * 2 + 1) * w + x] + if top and bottom then + put(x, cy, top == bottom and "█" or "▀", top) + elseif top then + put(x, cy, "▀", top) + elseif bottom then + put(x, cy, "▄", bottom) + end + end + end + end + return p +end + +-- the part of the day for an hour on the local clock +local function part_of_day(hour) + if hour >= 5 and hour < 12 then + return "morning" + elseif hour >= 12 and hour < 17 then + return "afternoon" + elseif hour >= 17 and hour < 22 then + return "evening" + end + return "night" +end + +-- the banner text for now: the greeting and the date when the clock is known, a plain hello +-- when it is not, so an older version never shows a guess +local function greeting(ctx) + local c = ctx.clock + if not c then + return "Hello, Isaac · zaccesss · keep building kind things · ", nil + end + local now = part_of_day(c.hour) + local words = PARTS[now] + local date = c.weekday_name .. " " .. c.day .. " " .. c.month_name + return words[1] .. ", Isaac · " .. date .. " · " .. words[2] .. " · ", now +end + +local banner, banner_width, banner_text +local part +local scroll = 0 +local clouds = {} +local line, line_from, line_typed = 1, 1, 0 +local line_clock = 0 + +-- each cloud is a few overlapping discs on a flat base, in pixels +local function place_clouds(ctx) + clouds = {} + local count = math.max(2, math.floor(ctx.width / 26 * ctx.busy)) + local gap = (ctx.width + 30) / count + for i = 1, count do + -- small discs come out as plus shapes in pixels, so every puff is at least three across + local size = 3 + (i % 3) + local puffs = {} + for k = 1, 3 + (i % 2) do + local middle = k == 2 or k == 3 + puffs[k] = { + dx = (k - 1) * size * 1.5, + dy = middle and -size * 0.6 or 0, + r = size + (k == 2 and 1.5 or 0), + } + end + clouds[i] = { + x = (i - 1) * gap + ctx.random() * gap * 0.3, + y = 5 + (i % 3) * 4, + puffs = puffs, + width = (#puffs - 1) * size * 1.5, + rate = CLOUD_RATE * (0.8 + (i % 3) * 0.15), + } + end +end + +-- the height of a hill layer in pixels at a point of the world, from a few slow waves +local function hill(x, base, swing, seed) + local wave = 0.55 * math.sin(x / 38 + seed) + 0.3 * math.sin(x / 17 + seed * 2) + + 0.15 * math.sin(x / 8 + seed * 3) + return base + swing * wave +end + +return { + name = "hello-isaac", + kind = "general", + summary = "A scrolling greeting for the time of day over a pixel sky, hills and my projects", + captions = { + "Hello, Isaac. All good here.", + "Clean build. Keep building kind things.", + "All green. On to the next idea.", + }, + + init = function(ctx) + place_clouds(ctx) + end, + + resize = function(ctx) + place_clouds(ctx) + end, + + frame = function(ctx) + local w, h = ctx.width, ctx.height + local t = ctx.time + local px = painter(ctx) + local pw, ph = px.width, px.height + + -- the greeting is laid out again only when its words change, which is rare + local text, now_part = greeting(ctx) + if text ~= banner_text then + banner_text = text + banner, banner_width = layout(text) + part = now_part + end + local tint = part and PARTS[part][3] or "cyan" + + -- the sky: a faint wash of the part of the day, strongest down by the hills + local hills = math.max(6, math.floor(ph / 5)) + local horizon = ph - hills * 2 + for y = 0, ph, 2 do + px.rect(0, y, pw, 2, tint, 0.13 * math.min(1, y / horizon) ^ 1.6) + end + + -- the sun across the sky by the hour or the moon at night, both well clear of the banner + local c = ctx.clock + if c then + local hour = c.hour + c.minute / 60 + local sky_top, sky_low = 6, math.max(10, math.floor(ph / 2) - 16) + if part == "night" then + local nx = pw * 0.8 + px.disc(nx, sky_top + 5, 8, "text", 0.1) + px.disc(nx, sky_top + 5, 5.5, "text", 0.85) + -- a second disc in the sky's own colour cuts the full moon to a fat crescent + px.disc(nx + 3, sky_top + 4, 4.5, tint, 0) + else + local day = math.min(1, math.max(0, (hour - 6) / 14)) + local sx = pw * (0.08 + 0.84 * day) + local sy = sky_low - (sky_low - sky_top) * math.sin(day * math.pi) + px.disc(sx, sy, 8, "yellow", 0.14) + px.disc(sx, sy, 6, "yellow", 0.3) + px.disc(sx, sy, 4, "bright_yellow", 1) + end + end + + -- clouds drift right to left and come back round on the right, keeping their spacing + for _, cloud in ipairs(clouds) do + cloud.x = cloud.x - cloud.rate * ctx.speed * ctx.dt + if cloud.x < -cloud.width - 12 then + cloud.x = cloud.x + pw + cloud.width + 24 + end + for _, puff in ipairs(cloud.puffs) do + px.disc(cloud.x + puff.dx, cloud.y + puff.dy, puff.r, "muted", 0.3) + end + -- the flat underside every cloud sits on + px.rect(cloud.x, cloud.y, cloud.width, 3, "muted", 0.3) + end + + -- two hill layers along the bottom, the far one fainter and slower, the near one with trees + local far_shift = t * FAR_RATE * ctx.speed + local near_shift = t * NEAR_RATE * ctx.speed + 80 + for x = 0, pw - 1 do + local hf = math.floor(hill(x + far_shift, hills * 1.5, hills * 0.7, 1.3)) + px.rect(x, ph - hf, 1, hf, "grey", 0.28) + px.pixel(x, ph - hf, "grey", 0.45) + end + for x = 0, pw - 1 do + local wx = math.floor(x + near_shift) + local hn = math.floor(hill(wx, hills * 0.85, hills * 0.5, 4.1)) + local top = ph - hn + px.rect(x, top, 1, hn, "green", 0.5) + px.rect(x, top, 1, 2, "green", 0.85) + -- a tree every so often, fixed to its place in the world + if wx % 29 == 0 and (wx // 29) % 3 ~= 1 then + px.rect(x, top - 2, 1, 2, "yellow", 0.55) + px.rect(x - 2, top - 4, 5, 2, "green", 1) + px.rect(x - 1, top - 6, 3, 2, "green", 1) + px.pixel(x, top - 7, "green", 1) + end + end + px.flush() + + -- who and where, centred above the banner, with the time at the top right when it is known + local banner_y = math.max(3, math.floor(h / 2) - 5) + local who = chars(WHO) + if #who > w - 10 then + who = chars("Isaac Adjei · zaccesss") + end + put(math.floor((w - #who) / 2), banner_y - 2, table.concat(who), "syntax.comment") + if c then + put(w - 7, 1, c.time, "muted") + end + + -- the big greeting, scrolling right to left in whole cells + scroll = scroll + ctx.dt * BANNER_RATE * ctx.speed + draw_banner(banner, banner_width, math.floor(scroll), banner_y, w, "accent") + + -- a rule, then the project line typed over the last one a few characters at a time + local line_y = banner_y + 6 + local rule = math.min(w - 4, 64) + local rx = math.floor((w - rule) / 2) + put(rx, line_y - 1, string.rep("─", rule), "grey") + put(rx, line_y + 1, string.rep("─", rule), "grey") + + line_clock = line_clock + ctx.dt * ctx.pace + if line_clock >= LINE_PERIOD then + line_clock = line_clock - LINE_PERIOD + line_from = line + line = line % #PROJECTS + 1 + line_typed = 0 + end + line_typed = line_typed + ctx.dt * TYPE_RATE * ctx.speed + local new, old = chars(PROJECTS[line]), chars(PROJECTS[line_from]) + local width = math.max(#new, #old) + local shown = {} + local k = math.floor(line_typed) + for i = 1, width do + shown[i] = (i <= k and (new[i] or " ")) or old[i] or " " + end + local label = "now " + local line_text = table.concat(shown) + local total = #label + width + local lx = math.max(0, math.floor((w - total) / 2)) + put(lx, line_y, label, "syntax.keyword") + -- the project name, before the colon, stands out from its tagline + local colon = line_text:find(":") + if colon then + put(lx + #label, line_y, line_text:sub(1, colon), "bright") + put(lx + #label + colon, line_y, line_text:sub(colon + 1), "text") + else + put(lx + #label, line_y, line_text, "text") + end + end, + + on_recovered = function(ctx) + return "Fixed. Hello again, Isaac." + end, +} diff --git a/apps/zacess-scenes/scenes/lidarsat.lua b/apps/zacess-scenes/scenes/lidarsat.lua new file mode 100644 index 0000000..b09008c --- /dev/null +++ b/apps/zacess-scenes/scenes/lidarsat.lua @@ -0,0 +1,339 @@ +-- lidarsat: a pixel quadcopter flying over shaded hills and rooftops without GPS, sweeping a fan +-- of lidar rays at the ground. Every return stays on the land as a point, so a point cloud grows +-- behind the drone: the land it has mapped, with the land ahead still unmapped. +-- +-- installed into the Zacess Scenes folder by apps/zacess-scenes/setup.sh or setup.ps1. Every +-- colour is a palette role, so the scene follows whichever Zacess theme zt last set. It paints +-- with the pixel canvas; an older Zacess Scenes without one draws the same shapes in half blocks. + +-- pixels a second the ground moves under the drone at standard motion +local GROUND_RATE = 7 +-- seconds for the fan to sweep from one side to the other and back +local SWEEP_PERIOD = 4 +-- the widest the fan's centre leans from straight down and half the fan's width, in radians +local SWEEP_REACH = 0.75 +local FAN_HALF = 0.32 +-- rays cast across the fan each frame; each one that lands adds a point to the map +local RAYS = 7 +-- seconds for one slow bob of the drone +local BOB_PERIOD = 5 +-- how often the bright mark on each rotor moves on, a few pixels at a time, so it reads as spin +local SPIN_RATE = 6 +-- seconds a return stays fresh, then seconds before it settles to the faintest shade +local FRESH = 1.5 +local SETTLED = 8 +-- the most points kept in the map +local MAX_POINTS = 4000 +-- cells a second the caption ticker moves +local TICKER_RATE = 7 + +local TICKER = "LidarSAT · GPS-denied drone navigation · terrain-relative positioning from lidar returns · ENGNERDS team project · no satellites, just the ground · " + +-- pixel drawing that runs on every version of Zacess Scenes: the program's own pixel canvas +-- where it has one. On an older version without it the same calls are drawn as half-block +-- characters, so the scene still shows its shapes. Call flush after the pixels and before any +-- text, since text is drawn over them +local function painter(ctx) + if ctx.rect then + return { + width = ctx.pixel_width, + height = ctx.pixel_height, + pixel = ctx.pixel, + rect = ctx.rect, + disc = ctx.disc, + line = ctx.line, + flush = function() end, + } + end + local w, h = ctx.width, ctx.height * 2 + local grid = {} + local function set(x, y, role, strength) + -- faint imagery drops away here, as it does on screen with colour turned off + if (strength or 1) < 0.3 then + return + end + x, y = math.floor(x), math.floor(y) + if x >= 0 and x < w and y >= 0 and y < h then + grid[y * w + x] = role or "text" + end + end + local p = { width = w, height = h } + p.pixel = set + p.rect = function(x, y, rw, rh, role, strength) + for yy = math.max(0, math.floor(y)), math.min(h, math.floor(y + rh)) - 1 do + for xx = math.max(0, math.floor(x)), math.min(w, math.floor(x + rw)) - 1 do + set(xx, yy, role, strength) + end + end + end + p.disc = function(cx, cy, r, role, strength) + for yy = math.floor(cy - r), math.ceil(cy + r) do + for xx = math.floor(cx - r), math.ceil(cx + r) do + if (xx - cx) ^ 2 + (yy - cy) ^ 2 <= r * r then + set(xx, yy, role, strength) + end + end + end + end + p.line = function(x1, y1, x2, y2, role, strength) + local n = math.max(math.abs(x2 - x1), math.abs(y2 - y1), 1) + for i = 0, n do + set(x1 + (x2 - x1) * i / n + 0.5, y1 + (y2 - y1) * i / n + 0.5, role, strength) + end + end + p.flush = function() + for cy = 0, ctx.height - 1 do + for x = 0, w - 1 do + local top, bottom = grid[cy * 2 * w + x], grid[(cy * 2 + 1) * w + x] + if top and bottom then + put(x, cy, top == bottom and "█" or "▀", top) + elseif top then + put(x, cy, "▀", top) + elseif bottom then + put(x, cy, "▄", bottom) + end + end + end + end + return p +end + +local scroll = 0 +local ticker_scroll = 0 +local points = {} +local total_points = 0 +local hud_clock = 0 +local hud = {} + +-- a string as a list of characters, so text with a middle dot slices by character, not byte +local function chars(s) + local list = {} + for _, code in utf8.codes(s) do + list[#list + 1] = utf8.char(code) + end + return list +end + +local ticker = chars(TICKER) + +-- the ground's height in pixels above the bottom at a column of the world +local function ground(wx, base) + return math.floor(base + 5 * math.sin(wx / 34) + 3 * math.sin(wx / 15) + 1.5 * math.sin(wx / 6.5)) +end + +-- a building at a column of the world: its height in pixels and where the column falls in the +-- block or nothing. A street of them passes every so often, like the urban canyon where GPS +-- drops out +local function building(wx) + if math.floor(wx / 150) % 3 ~= 1 then + return nil + end + local block = math.floor(wx / 13) + local part = wx % 13 + if part >= 10 then + return nil + end + local k = (block * 37 + 11) % 23 + if k >= 17 then + return nil + end + return 10 + (k * 7) % 15, part +end + +-- the top pixel the lidar can hit at a column of the world, roof or ground +local function surface(ph, wx, base) + local top = ph - ground(wx, base) + local tall = building(wx) + if tall then + top = top - tall + end + return top +end + +-- the quadcopter, centred on a point in pixels. The far pair of rotors sits higher and fainter, +-- as seen from a little above, so all four arms read +local function draw_drone(px, x, y, t, ctx) + local spin = ctx.reduced and 0 or math.floor(t * SPIN_RATE * ctx.pace) + local rotors = { + { -9, -6, 0.55 }, + { 9, -6, 0.55 }, + { -12, -3, 1 }, + { 12, -3, 1 }, + } + -- arms from the body out to each rotor's motor + for _, r in ipairs(rotors) do + px.line(x + (r[1] < 0 and -3 or 3), y - 1, x + r[1], y + r[2] + 1, "grey", r[3]) + px.pixel(x + r[1], y + r[2] + 1, "grey", 1) + end + -- the rotors as flat blurred discs with one brighter blade mark moving round + for i, r in ipairs(rotors) do + local rx, ry = x + r[1], y + r[2] + px.line(rx - 4, ry, rx + 4, ry, "info", r[3] * 0.75) + local mark = (spin + i * 2) % 9 - 4 + px.pixel(rx + mark, ry, "bright", r[3]) + px.pixel(rx, ry, "text", r[3]) + end + -- the body with its canopy, a light at the front and the lidar head underneath + px.rect(x - 4, y - 2, 9, 3, "text", 0.9) + px.rect(x - 2, y - 3, 5, 1, "text", 0.65) + px.pixel(x + 4, y - 1, "accent", 1) + px.rect(x - 1, y + 1, 3, 2, "grey", 1) + px.pixel(x, y + 2, "bright_cyan", 1) + -- landing skids + px.pixel(x - 4, y + 1, "grey", 1) + px.pixel(x + 4, y + 1, "grey", 1) + px.line(x - 6, y + 2, x - 2, y + 2, "grey", 0.8) + px.line(x + 2, y + 2, x + 6, y + 2, "grey", 0.8) +end + +return { + name = "lidarsat", + kind = "general", + summary = "A pixel quadcopter mapping hills and rooftops with a lidar fan, no GPS needed", + captions = { + "Position held. Build clean.", + "Mapped and green. No satellites needed.", + "Steady flight, steady build.", + }, + + resize = function(ctx) + points = {} + end, + + frame = function(ctx) + local w, h = ctx.width, ctx.height + local t = ctx.time + local px = painter(ctx) + local pw, ph = px.width, px.height + local base = math.max(8, math.floor(ph * 0.2)) + scroll = scroll + ctx.dt * GROUND_RATE * ctx.speed + local left = math.floor(scroll) + + -- far ridges, faint and slow, for depth + local far = math.floor(scroll * 0.3) + for x = 0, pw - 1 do + local wx = x + far + local hf = math.floor(base * 1.35 + 5 * math.sin(wx / 23) + 3 * math.sin(wx / 9.7)) + px.rect(x, ph - hf, 1, hf, "grey", 0.12) + end + + -- the ground and the rooftops, column by column, shaded darker with depth + for x = 0, pw - 1 do + local wx = x + left + local g = ground(wx, base) + local top = ph - g + px.rect(x, top, 1, 2, "green", 0.9) + px.rect(x, top + 2, 1, 4, "green", 0.5) + px.rect(x, top + 6, 1, g, "grey", 0.3) + local tall, part = building(wx) + if tall then + local roof = top - tall + local wall = part == 0 or part == 9 + px.rect(x, roof, 1, tall, "syntax.type", wall and 0.5 or 0.28) + px.pixel(x, roof, "syntax.type", 1) + -- a grid of windows, some lit, fixed to the building + if part % 3 == 2 then + for wy = roof + 3, top - 3, 3 do + if ((wx * 7 + wy * 13) % 5) < 3 then + px.pixel(x, wy, "yellow", 0.9) + end + end + end + end + end + + -- the drone, bobbing gently a little left of centre, clear of the readout + local bob = math.sin(t * 2 * math.pi / BOB_PERIOD * ctx.pace) + local dx = math.max(math.floor(pw * 0.42), 50) + local dy = math.max(20, math.floor(ph * 0.34) + math.floor(bob * 1.5 + 0.5)) + local sx, sy = dx, dy + 3 + + -- the fan: faint rays across it, its two edges a little stronger and every landing ray + -- added to the map as a return + local centre = math.sin(t * 2 * math.pi / SWEEP_PERIOD * ctx.pace) * SWEEP_REACH + for i = 0, RAYS - 1 do + local a = centre - FAN_HALF + 2 * FAN_HALF * i / (RAYS - 1) + local stepx, stepy = math.sin(a), math.cos(a) + local rx, ry = sx + 0.5, sy + local hit + for _ = 1, ph * 2 do + rx, ry = rx + stepx, ry + stepy + local cx = math.floor(rx) + if cx < 0 or cx >= pw or ry >= ph then + break + end + if ry >= surface(ph, cx + left, base) then + hit = { cx, math.floor(ry) } + break + end + end + local edge = i == 0 or i == RAYS - 1 + if hit then + px.line(sx, sy, hit[1], hit[2], "cyan", edge and 0.6 or 0.2) + points[#points + 1] = { wx = hit[1] + left, y = hit[2], born = t } + total_points = total_points + 1 + end + end + while #points > MAX_POINTS do + table.remove(points, 1) + end + + -- the map so far: fresh returns bright, older ones settling to a quieter shade + local kept = {} + for _, p in ipairs(points) do + local x = p.wx - left + if x >= 0 then + local age = t - p.born + if age < FRESH then + px.pixel(x, p.y, "bright_cyan", 1) + else + px.pixel(x, p.y, "cyan", math.max(0.5, 0.85 - (age - FRESH) / SETTLED * 0.35)) + end + kept[#kept + 1] = p + end + end + points = kept + + draw_drone(px, dx, dy, t, ctx) + px.flush() + + -- a readout, refreshed twice a second so the digits never churn + hud_clock = hud_clock - ctx.dt + if hud_clock <= 0 then + hud_clock = 0.5 + local below = surface(ph, sx + left, base) - sy + hud = { + string.format("ALT %5.1f m above ground", below * 0.4), + string.format("SPD %5.1f m/s", GROUND_RATE * ctx.speed * 0.45), + string.format("PTS %5d returns mapped", total_points), + "GPS denied, lidar only", + } + end + local bx, by = 2, 3 + put(bx, by - 1, "┌─ nav ──────────────────────────┐", "grey") + for i, line in ipairs(hud) do + put(bx, by + i - 1, "│", "grey") + put(bx + 2, by + i - 1, line:sub(1, 4), "syntax.keyword") + put(bx + 6, by + i - 1, line:sub(5), "text") + put(bx + 33, by + i - 1, "│", "grey") + end + put(bx, by + #hud, "└────────────────────────────────┘", "grey") + + -- the caption ticker along the top row + ticker_scroll = ticker_scroll + ctx.dt * TICKER_RATE * ctx.speed + local offset = math.floor(ticker_scroll) + local out = {} + for x = 1, w do + out[x] = ticker[(x - 1 + offset) % #ticker + 1] + end + put(0, 0, table.concat(out), "syntax.function") + end, + + on_fail = function(ctx) + return "Lost the ground for a moment. Re-scanning." + end, + + on_recovered = function(ctx) + return "Position fixed again. Back on track." + end, +} diff --git a/apps/zacess-scenes/scenes/now-building.lua b/apps/zacess-scenes/scenes/now-building.lua new file mode 100644 index 0000000..c38fce8 --- /dev/null +++ b/apps/zacess-scenes/scenes/now-building.lua @@ -0,0 +1,377 @@ +-- now-building: a station departure board for my projects. The rows turn over like split flaps +-- every few seconds and a ticker along the bottom scrolls each project with its tagline. +-- +-- installed into the Zacess Scenes folder by apps/zacess-scenes/setup.sh or setup.ps1. Every +-- colour is a palette role, so the scene follows whichever Zacess theme zt last set. + +-- seconds between board updates +local BOARD_PERIOD = 10 +-- seconds between one column settling and the next, so an update sweeps left to right +local SWEEP = 0.012 +-- flap changes a second while a cell turns over; ctx.pace keeps it slow on calm motion +local FLAP_RATE = 12 +-- cells a second the ticker moves at standard motion +local TICKER_RATE = 8 + +-- each project: platform, name, where it is heading and how it stands, with the role for the +-- status. The status word carries the meaning, so the colour is never the only signal +local PROJECTS = { + { "1", "ZACESS", "accessibility tools that follow your theme", "ON TIME", "green" }, + { "2", "PHAEMOS", "predictive maintenance for IoT machines", "IN BUILD", "info" }, + { "3", "LIDARSAT", "drone navigation where GPS cannot reach", "TESTING", "warning" }, + { "4", "FOOTPRINTS", "every change on your machine, with undo", "SHIPPED", "accent" }, + { "5", "VITAFOLIO", "one CV, tailored for every application", "IN BUILD", "info" }, + { "6", "ZACESS SCENES", "calm scenes for the terminal", "ON TIME", "green" }, + { "7", "ZACESS PROFILE", "one accessibility profile for every app", "IN REVIEW", "warning" }, + { "8", "ISAACADJEI.ME", "the portfolio, the blog and the newsletter", "LIVE", "green" }, +} + +-- what a cell shows while it turns over, in the case of the letter it is turning to, so a row +-- keeps its shape while it changes +local FLAPS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +local FLAPS_LOWER = FLAPS:lower() + +-- a 5 by 7 pixel font: each glyph is its seven rows split by spaces, # for a lit pixel +local FONT = { + A = ".###. #...# #...# ##### #...# #...# #...#", + B = "####. #...# #...# ####. #...# #...# ####.", + C = ".###. #...# #.... #.... #.... #...# .###.", + D = "####. #...# #...# #...# #...# #...# ####.", + E = "##### #.... #.... ####. #.... #.... #####", + F = "##### #.... #.... ####. #.... #.... #....", + G = ".###. #...# #.... #.### #...# #...# .####", + H = "#...# #...# #...# ##### #...# #...# #...#", + I = "### .#. .#. .#. .#. .#. ###", + J = "..### ...#. ...#. ...#. ...#. #..#. .##..", + K = "#...# #..#. #.#.. ##... #.#.. #..#. #...#", + L = "#.... #.... #.... #.... #.... #.... #####", + M = "#...# ##.## #.#.# #.#.# #...# #...# #...#", + N = "#...# #...# ##..# #.#.# #..## #...# #...#", + O = ".###. #...# #...# #...# #...# #...# .###.", + P = "####. #...# #...# ####. #.... #.... #....", + Q = ".###. #...# #...# #...# #.#.# #..#. .##.#", + R = "####. #...# #...# ####. #.#.. #..#. #...#", + S = ".#### #.... #.... .###. ....# ....# ####.", + T = "##### ..#.. ..#.. ..#.. ..#.. ..#.. ..#..", + U = "#...# #...# #...# #...# #...# #...# .###.", + V = "#...# #...# #...# #...# #...# .#.#. ..#..", + W = "#...# #...# #...# #.#.# #.#.# #.#.# .#.#.", + X = "#...# #...# .#.#. ..#.. .#.#. #...# #...#", + Y = "#...# #...# .#.#. ..#.. ..#.. ..#.. ..#..", + Z = "##### ....# ...#. ..#.. .#... #.... #####", + ["0"] = ".###. #...# #..## #.#.# ##..# #...# .###.", + ["1"] = "..#.. .##.. ..#.. ..#.. ..#.. ..#.. .###.", + ["2"] = ".###. #...# ....# ...#. ..#.. .#... #####", + ["3"] = "####. ....# ....# .###. ....# ....# ####.", + ["4"] = "...#. ..##. .#.#. #..#. ##### ...#. ...#.", + ["5"] = "##### #.... ####. ....# ....# #...# .###.", + ["6"] = ".###. #.... #.... ####. #...# #...# .###.", + ["7"] = "##### ....# ...#. ..#.. .#... .#... .#...", + ["8"] = ".###. #...# #...# .###. #...# #...# .###.", + ["9"] = ".###. #...# #...# .#### ....# ....# .###.", + [" "] = "... ... ... ... ... ... ...", + ["."] = ".. .. .. .. .. ## ##", + [","] = ".. .. .. .. .# .# #.", + ["!"] = "# # # # # . #", + [":"] = ". # # . # # .", + ["'"] = "# # . . . . .", + ["-"] = "... ... ... ### ... ... ...", + ["·"] = ".. .. .. ## ## .. ..", + ["✓"] = "..... ....# ...## #.##. ###.. .#... .....", + ["?"] = ".###. #...# ....# ...#. ..#.. ..... ..#..", +} + +-- every glyph as its list of pixel rows, split once when the file loads +local glyphs = {} +for ch, rows in pairs(FONT) do + local grid = {} + for row in rows:gmatch("%S+") do + grid[#grid + 1] = row + end + glyphs[ch] = grid +end + +-- lays a message out as four rows of half-block cells, two pixel rows to a cell so each pixel is +-- about square. Returns the rows as lists of characters (false where nothing is lit) and the width +local function layout(message) + local cells = { {}, {}, {}, {} } + local width = 0 + for _, code in utf8.codes(message:upper()) do + local grid = glyphs[utf8.char(code)] or glyphs[" "] + local gw = #grid[1] + for col = 1, gw do + for r = 1, 4 do + local top = grid[r * 2 - 1]:sub(col, col) == "#" + local bottom = r * 2 <= #grid and grid[r * 2]:sub(col, col) == "#" + cells[r][width + col] = (top and bottom and "█") or (top and "▀") or (bottom and "▄") or false + end + end + -- one empty column between letters + width = width + gw + 1 + for r = 1, 4 do + cells[r][width] = false + end + end + return cells, width +end + +-- draws a laid out banner scrolled left by offset cells so it loops without a seam. With once set +-- it is drawn a single time at that offset instead. Only lit cells are drawn, which leaves the backdrop showing +-- through the gaps in the letters +local function draw_banner(cells, width, offset, y, w, role, once) + for r = 1, 4 do + local row = cells[r] + local run, start = {}, nil + for x = 0, w do + local col = x + offset + local ch = false + if x < w and (not once or (col >= 0 and col < width)) then + ch = row[col % width + 1] + end + if ch then + start = start or x + run[#run + 1] = ch + elseif start then + put(start, y + r - 1, table.concat(run), role) + run, start = {}, nil + end + end + end +end + +-- a string as a list of characters, so text with a middle dot slices by character, not byte +local function chars(s) + local list = {} + for _, code in utf8.codes(s) do + list[#list + 1] = utf8.char(code) + end + return list +end + +local title, title_width +local rows = {} +local first = 1 +local board_clock = 0 +local scroll = 0 +local ticker, ticker_roles + +-- the board's columns for the current width: where each field starts and how wide it is +local function columns(w) + local inner = w - 4 + local plat, name, status = 4, 16, 11 + local dest = inner - plat - name - status - 4 + if dest < 12 then + -- too narrow for the taglines: platform, name and status only + return { plat = plat, name = math.max(8, inner - plat - status - 3), dest = 0, status = status } + end + return { plat = plat, name = name, dest = dest, status = status } +end + +-- pads or cuts a list of characters to an exact width +local function fit(list, width) + local out = {} + for i = 1, width do + out[i] = list[i] or " " + end + return out +end + +-- one board row as characters with a role for each, ready to be turned over into place +local function row_cells(project, cols) + local cells, roles = {}, {} + local function add(text, width, role) + for _, ch in ipairs(fit(chars(text), width)) do + cells[#cells + 1] = ch + roles[#roles + 1] = role + end + cells[#cells + 1] = " " + roles[#roles + 1] = role + end + add(" " .. project[1], cols.plat, "muted") + add(project[2], cols.name, "bright") + if cols.dest > 0 then + -- a tagline too long for its column is cut at a word and marked, never mid-word + local dest = project[3] + if #dest > cols.dest then + dest = dest:sub(1, cols.dest - 3):match("^(.*%S)%s") or dest:sub(1, cols.dest - 3) + dest = dest .. "..." + end + add(dest, cols.dest, "text") + end + add(project[4], cols.status, project[5]) + return cells, roles +end + +-- sets every row's target to the projects from first onwards; cells that differ start to turn +local function retarget(ctx, now, instant) + local cols = columns(ctx.width) + local count = math.max(1, math.min(#PROJECTS, math.floor((ctx.height - 13) / 2))) + for i = 1, count do + local project = PROJECTS[(first + i - 2) % #PROJECTS + 1] + local cells, roles = row_cells(project, cols) + local row = rows[i] + if not row or instant or #row.shown ~= #cells then + row = { shown = {}, settle = {} } + for c = 1, #cells do + row.shown[c] = instant and cells[c] or " " + row.settle[c] = now + c * SWEEP + end + rows[i] = row + else + for c = 1, #cells do + if row.shown[c] ~= cells[c] then + -- a little delay per row too, so the board ripples downwards + row.settle[c] = now + c * SWEEP + i * 0.08 + ctx.random() * 0.15 + end + end + end + row.target, row.roles = cells, roles + end + for i = count + 1, #rows do + rows[i] = nil + end +end + +local function build_ticker() + ticker, ticker_roles = {}, {} + local function add(text, role) + for _, ch in ipairs(chars(text)) do + ticker[#ticker + 1] = ch + ticker_roles[#ticker_roles + 1] = role + end + end + for _, project in ipairs(PROJECTS) do + add(project[2], "bright") + add(" " .. project[3], "text") + add(" · ", "grey") + end +end + +-- draws a list of characters with a role each as runs of one role, so a frame stays small +local function draw_runs(x0, y, list, roles) + local start, role = 1, roles[1] + for i = 2, #list + 1 do + if i > #list or roles[i] ~= role then + put(x0 + start - 1, y, table.concat(list, "", start, i - 1), role) + start, role = i, roles[i] + end + end +end + +return { + name = "now-building", + kind = "general", + summary = "A split-flap departure board of my projects with a scrolling ticker of taglines", + captions = { + "All services running on time.", + "Clean build. Next stop, the next feature.", + "Every platform green.", + }, + + init = function(ctx) + title, title_width = layout("NOW BUILDING") + build_ticker() + retarget(ctx, 0, true) + end, + + resize = function(ctx) + retarget(ctx, ctx.time, true) + end, + + frame = function(ctx) + local w, h = ctx.width, ctx.height + local now = ctx.time + + -- the board moves on one project at a time + board_clock = board_clock + ctx.dt + if board_clock >= BOARD_PERIOD then + board_clock = board_clock - BOARD_PERIOD + first = first % #PROJECTS + 1 + retarget(ctx, now, false) + end + + -- the title in the big font, centred when it fits and scrolling slowly when it does not + local tx = math.floor((w - title_width) / 2) + if tx >= 0 then + draw_banner(title, title_width, -tx, 1, w, "warning", true) + else + draw_banner(title, title_width, math.floor(now * 4 * ctx.speed), 1, w, "warning") + end + + -- the board's frame + local top = 6 + local bottom = h - 4 + local cols = columns(w) + put(1, top, "┌" .. string.rep("─", w - 4) .. "┐", "grey") + put(1, bottom, "└" .. string.rep("─", w - 4) .. "┘", "grey") + for y = top + 1, bottom - 1 do + put(1, y, "│", "grey") + put(w - 2, y, "│", "grey") + end + + -- the column headings and a rule under them + local head = { " PL", "PROJECT", "DESTINATION", "STATUS" } + local hx = 2 + put(hx, top + 1, head[1], "muted") + hx = hx + cols.plat + 1 + put(hx, top + 1, head[2], "muted") + hx = hx + cols.name + 1 + if cols.dest > 0 then + put(hx, top + 1, head[3], "muted") + hx = hx + cols.dest + 1 + end + put(hx, top + 1, head[4], "muted") + put(2, top + 2, string.rep("─", w - 4), "grey") + + -- the rows: a cell past its settle time shows its letter, one before it turns over through + -- the flap letters. Under reduced motion it simply waits and then appears in its place + for i, row in ipairs(rows) do + local y = top + 2 + i * 2 - 1 + if y >= bottom then + break + end + for c = 1, #row.target do + if now >= row.settle[c] then + row.shown[c] = row.target[c] + end + end + local list = {} + for c = 1, #row.target do + if row.shown[c] ~= row.target[c] and not ctx.reduced and row.target[c] ~= " " then + local set = row.target[c]:match("%l") and FLAPS_LOWER or FLAPS + local k = math.floor(now * FLAP_RATE * ctx.pace + c * 7) % #set + 1 + list[c] = set:sub(k, k) + else + list[c] = row.shown[c] + end + end + draw_runs(2, y, list, row.roles) + end + + -- the time to the next update, counted down honestly from the board's own clock + local left = math.ceil(BOARD_PERIOD - board_clock) + local note = string.format("next update in %2d s", left) + put(w - 3 - #note, bottom - 1, note, "muted") + put(3, bottom - 1, "zaccesss · all platforms", "muted") + + -- the ticker under the board, a calling-at list of every project + scroll = scroll + ctx.dt * TICKER_RATE * ctx.speed + local offset = math.floor(scroll) + local list, roles = {}, {} + local n = #ticker + for x = 1, w - 4 do + local k = (x - 1 + offset) % n + 1 + list[x], roles[x] = ticker[k], ticker_roles[k] + end + put(2, h - 2, "calling at", "syntax.keyword") + draw_runs(14, h - 2, { table.unpack(list, 1, math.max(1, w - 16)) }, roles) + end, + + on_fail = function(ctx) + return "A delay on one line. Check the board." + end, + + on_recovered = function(ctx) + return "Services restored. Back on time." + end, +} diff --git a/apps/zacess-scenes/scenes/phaemos.lua b/apps/zacess-scenes/scenes/phaemos.lua new file mode 100644 index 0000000..df171aa --- /dev/null +++ b/apps/zacess-scenes/scenes/phaemos.lua @@ -0,0 +1,485 @@ +-- phaemos: a pixel motor and pump on a test bed with four PHAEMOS sensor nodes on them. Readings +-- travel along the bus to the gateway and a panel beside it draws each node's vibration as a +-- scrolling chart. One bearing slowly wears, turns to WATCH and gets a service estimate, then is +-- serviced and starts again: predictive maintenance in one loop. +-- +-- installed into the Zacess Scenes folder by apps/zacess-scenes/setup.sh or setup.ps1. Every +-- colour is a palette role, so the scene follows whichever Zacess theme zt last set. It paints +-- with the pixel canvas; an older Zacess Scenes without one draws the same shapes in half blocks. + +-- seconds between readings on every node +local SAMPLE_PERIOD = 0.5 +-- seconds between one node sending a packet and sending the next +local SEND_PERIOD = 2.4 +-- cells a second a packet travels along the bus +local PACKET_RATE = 14 +-- steps a second the stripe on the coupling moves, so the shaft reads as turning without blinking +local SPIN_RATE = 4 +-- seconds for the worn bearing to go from serviced to due and be serviced again +local WEAR_CYCLE = 150 +-- vibration in mm/s where a node turns to WATCH and where it is due for service +local WATCH_LEVEL = 4.5 +local SERVICE_LEVEL = 7.1 +-- cells a second the ticker moves +local TICKER_RATE = 7 + +local TICKER = "PHAEMOS · predictive maintenance for IoT machines · four sensor nodes on one bus · vibration, temperature and current · catch the fault before the breakdown · " + +-- each node: label, where it sits, its usual vibration and the role its packets take +local NODES = { + { name = "N1", where = "motor, drive end", base = 1.8, role = "cyan" }, + { name = "N2", where = "motor, free end", base = 1.4, role = "green" }, + { name = "N3", where = "pump bearing", base = 2.0, role = "magenta" }, + { name = "N4", where = "pump casing", base = 1.6, role = "blue" }, +} + +-- pixel drawing that runs on every version of Zacess Scenes: the program's own pixel canvas +-- where it has one. On an older version without it the same calls are drawn as half-block +-- characters, so the scene still shows its shapes. Call flush after the pixels and before any +-- text, since text is drawn over them +local function painter(ctx) + if ctx.rect then + return { + width = ctx.pixel_width, + height = ctx.pixel_height, + pixel = ctx.pixel, + rect = ctx.rect, + disc = ctx.disc, + line = ctx.line, + flush = function() end, + } + end + local w, h = ctx.width, ctx.height * 2 + local grid = {} + local function set(x, y, role, strength) + -- faint imagery drops away here, as it does on screen with colour turned off + if (strength or 1) < 0.3 then + return + end + x, y = math.floor(x), math.floor(y) + if x >= 0 and x < w and y >= 0 and y < h then + grid[y * w + x] = role or "text" + end + end + local p = { width = w, height = h } + p.pixel = set + p.rect = function(x, y, rw, rh, role, strength) + for yy = math.max(0, math.floor(y)), math.min(h, math.floor(y + rh)) - 1 do + for xx = math.max(0, math.floor(x)), math.min(w, math.floor(x + rw)) - 1 do + set(xx, yy, role, strength) + end + end + end + p.disc = function(cx, cy, r, role, strength) + for yy = math.floor(cy - r), math.ceil(cy + r) do + for xx = math.floor(cx - r), math.ceil(cx + r) do + if (xx - cx) ^ 2 + (yy - cy) ^ 2 <= r * r then + set(xx, yy, role, strength) + end + end + end + end + p.line = function(x1, y1, x2, y2, role, strength) + local n = math.max(math.abs(x2 - x1), math.abs(y2 - y1), 1) + for i = 0, n do + set(x1 + (x2 - x1) * i / n + 0.5, y1 + (y2 - y1) * i / n + 0.5, role, strength) + end + end + p.flush = function() + for cy = 0, ctx.height - 1 do + for x = 0, w - 1 do + local top, bottom = grid[cy * 2 * w + x], grid[(cy * 2 + 1) * w + x] + if top and bottom then + put(x, cy, top == bottom and "█" or "▀", top) + elseif top then + put(x, cy, "▀", top) + elseif bottom then + put(x, cy, "▄", bottom) + end + end + end + end + return p +end + +-- a 5 by 7 pixel font: each glyph is its seven rows split by spaces, # for a lit pixel +local FONT = { + A = ".###. #...# #...# ##### #...# #...# #...#", + B = "####. #...# #...# ####. #...# #...# ####.", + C = ".###. #...# #.... #.... #.... #...# .###.", + D = "####. #...# #...# #...# #...# #...# ####.", + E = "##### #.... #.... ####. #.... #.... #####", + F = "##### #.... #.... ####. #.... #.... #....", + G = ".###. #...# #.... #.### #...# #...# .####", + H = "#...# #...# #...# ##### #...# #...# #...#", + I = "### .#. .#. .#. .#. .#. ###", + J = "..### ...#. ...#. ...#. ...#. #..#. .##..", + K = "#...# #..#. #.#.. ##... #.#.. #..#. #...#", + L = "#.... #.... #.... #.... #.... #.... #####", + M = "#...# ##.## #.#.# #.#.# #...# #...# #...#", + N = "#...# #...# ##..# #.#.# #..## #...# #...#", + O = ".###. #...# #...# #...# #...# #...# .###.", + P = "####. #...# #...# ####. #.... #.... #....", + Q = ".###. #...# #...# #...# #.#.# #..#. .##.#", + R = "####. #...# #...# ####. #.#.. #..#. #...#", + S = ".#### #.... #.... .###. ....# ....# ####.", + T = "##### ..#.. ..#.. ..#.. ..#.. ..#.. ..#..", + U = "#...# #...# #...# #...# #...# #...# .###.", + V = "#...# #...# #...# #...# #...# .#.#. ..#..", + W = "#...# #...# #...# #.#.# #.#.# #.#.# .#.#.", + X = "#...# #...# .#.#. ..#.. .#.#. #...# #...#", + Y = "#...# #...# .#.#. ..#.. ..#.. ..#.. ..#..", + Z = "##### ....# ...#. ..#.. .#... #.... #####", + ["0"] = ".###. #...# #..## #.#.# ##..# #...# .###.", + ["1"] = "..#.. .##.. ..#.. ..#.. ..#.. ..#.. .###.", + ["2"] = ".###. #...# ....# ...#. ..#.. .#... #####", + ["3"] = "####. ....# ....# .###. ....# ....# ####.", + ["4"] = "...#. ..##. .#.#. #..#. ##### ...#. ...#.", + ["5"] = "##### #.... ####. ....# ....# #...# .###.", + ["6"] = ".###. #.... #.... ####. #...# #...# .###.", + ["7"] = "##### ....# ...#. ..#.. .#... .#... .#...", + ["8"] = ".###. #...# #...# .###. #...# #...# .###.", + ["9"] = ".###. #...# #...# .#### ....# ....# .###.", + [" "] = "... ... ... ... ... ... ...", + ["."] = ".. .. .. .. .. ## ##", + [","] = ".. .. .. .. .# .# #.", + ["!"] = "# # # # # . #", + [":"] = ". # # . # # .", + ["'"] = "# # . . . . .", + ["-"] = "... ... ... ### ... ... ...", + ["·"] = ".. .. .. ## ## .. ..", + ["✓"] = "..... ....# ...## #.##. ###.. .#... .....", + ["?"] = ".###. #...# ....# ...#. ..#.. ..... ..#..", +} + +-- every glyph as its list of pixel rows, split once when the file loads +local glyphs = {} +for ch, rows in pairs(FONT) do + local grid = {} + for row in rows:gmatch("%S+") do + grid[#grid + 1] = row + end + glyphs[ch] = grid +end + +-- lays a message out as four rows of half-block cells, two pixel rows to a cell so each pixel is +-- about square. Returns the rows as lists of characters (false where nothing is lit) and the width +local function layout_text(message) + local cells = { {}, {}, {}, {} } + local width = 0 + for _, code in utf8.codes(message:upper()) do + local grid = glyphs[utf8.char(code)] or glyphs[" "] + local gw = #grid[1] + for col = 1, gw do + for r = 1, 4 do + local top = grid[r * 2 - 1]:sub(col, col) == "#" + local bottom = r * 2 <= #grid and grid[r * 2]:sub(col, col) == "#" + cells[r][width + col] = (top and bottom and "█") or (top and "▀") or (bottom and "▄") or false + end + end + -- one empty column between letters + width = width + gw + 1 + for r = 1, 4 do + cells[r][width] = false + end + end + return cells, width +end + +-- draws a laid out banner scrolled left by offset cells so it loops without a seam. With once set +-- it is drawn a single time at that offset instead. Only lit cells are drawn, which leaves the backdrop showing +-- through the gaps in the letters +local function draw_banner(cells, width, offset, y, w, role, once) + for r = 1, 4 do + local row = cells[r] + local run, start = {}, nil + for x = 0, w do + local col = x + offset + local ch = false + if x < w and (not once or (col >= 0 and col < width)) then + ch = row[col % width + 1] + end + if ch then + start = start or x + run[#run + 1] = ch + elseif start then + put(start, y + r - 1, table.concat(run), role) + run, start = {}, nil + end + end + end +end + +-- a string as a list of characters, so text with a middle dot slices by character, not byte +local function chars(s) + local list = {} + for _, code in utf8.codes(s) do + list[#list + 1] = utf8.char(code) + end + return list +end + +local title, title_width +local history = {} +local sample_clock = 0 +local packets = {} +local send_clock = {} +local ticker_scroll = 0 + +-- a string as a list of characters, so text with a middle dot slices by character, not byte +local function chars(s) + local list = {} + for _, code in utf8.codes(s) do + list[#list + 1] = utf8.char(code) + end + return list +end + +local ticker = chars(TICKER) + +-- how worn the bearing is, from 0 just after a service to 1 when it is due +local function wear(t) + return (t % WEAR_CYCLE) / WEAR_CYCLE +end + +-- a node's vibration now: its usual level, a little noise and, on the bearing, the wear +local function reading(ctx, i, t) + local node = NODES[i] + local v = node.base + 0.5 * math.sin(t * 0.9 + i) + 0.3 * math.sin(t * 2.3 + i * 2) + (ctx.random() - 0.5) * 0.7 + -- the history filled in before the scene starts is from just after the last service + if i == 3 and t >= 0 then + v = v + 5.5 * wear(t) ^ 2 + end + return math.max(0.2, v) +end + +local function fill_history(ctx) + for i = 1, #NODES do + history[i] = history[i] or {} + send_clock[i] = send_clock[i] or (i - 1) * SEND_PERIOD / #NODES + while #history[i] < 200 do + table.insert(history[i], 1, reading(ctx, i, -#history[i] * SAMPLE_PERIOD)) + end + end +end + +-- the diagram's layout for the current size: where the machine, the nodes, the bus and the +-- gateway sit +local function layout(ctx) + local top = 4 + local mx = 3 + local motor_w = 22 + local pump_x = mx + motor_w + 7 + local pump_w = 14 + local gx = pump_x + pump_w + 3 + return { + bus = top, + node_y = top + 2, + box = top + 4, + mx = mx, + motor_w = motor_w, + pump_x = pump_x, + pump_w = pump_w, + gx = gx, + node_x = { mx + 4, mx + motor_w - 7, pump_x + 1, pump_x + pump_w - 5 }, + panel = gx + 14, + } +end + +return { + name = "phaemos", + kind = "general", + summary = "PHAEMOS nodes on a motor and pump, sending vibration readings to a live panel", + captions = { + "All nodes healthy. Build healthy.", + "No faults predicted.", + "Every reading in range.", + }, + + init = function(ctx) + title, title_width = layout_text("PHAEMOS") + fill_history(ctx) + end, + + frame = function(ctx) + local w, h = ctx.width, ctx.height + local t = ctx.time + local L = layout(ctx) + + -- a new reading on every node, on a steady clock + sample_clock = sample_clock + ctx.dt * ctx.speed + while sample_clock >= SAMPLE_PERIOD do + sample_clock = sample_clock - SAMPLE_PERIOD + for i = 1, #NODES do + table.insert(history[i], reading(ctx, i, t)) + if #history[i] > 200 then + table.remove(history[i], 1) + end + end + end + + -- the motor, the coupling and the pump on a base plate, in pixels + local paint = painter(ctx) + local by = L.box + local mx, mw = L.mx, L.motor_w + local top, body = by * 2, 9 + paint.rect(mx, top, mw, body, "syntax.type", 0.5) + paint.rect(mx, top, 3, body, "syntax.type", 0.8) + -- cooling fins along the body, every other pixel + for x = mx + 4, mx + mw - 2, 2 do + paint.line(x, top + 1, x, top + body - 2, "syntax.type", 0.85) + end + paint.line(mx, top, mx + mw - 1, top, "syntax.type", 1) + local shaft_y = top + 4 + local pump_x, pump_w = L.pump_x, L.pump_w + paint.line(mx + mw, shaft_y, pump_x, shaft_y, "grey", 1) + -- the coupling with a stripe that steps round it, so the shaft reads as turning + local cx = mx + mw + 2 + paint.rect(cx, shaft_y - 2, 3, 5, "text", 0.7) + if not ctx.reduced then + local turn = math.floor(t * SPIN_RATE * ctx.pace) % 5 + paint.line(cx, shaft_y - 2 + turn, cx + 2, shaft_y - 2 + turn, "bright", 1) + end + -- the pump: a round volute with its outlet on the far side + local vx, vy = pump_x + math.floor(pump_w / 2), shaft_y + paint.disc(vx, vy, 5, "syntax.type", 0.5) + paint.disc(vx, vy, 2, "syntax.type", 0.9) + paint.rect(pump_x + pump_w - 2, vy - 1, 3, 3, "syntax.type", 0.7) + -- the base plate and its feet + local base_y = top + body + 1 + paint.rect(mx - 1, base_y, pump_x + pump_w - mx + 2, 2, "grey", 0.75) + paint.rect(mx + 1, top + body, 2, 1, "grey", 0.75) + paint.rect(mx + mw - 3, top + body, 2, 1, "grey", 0.75) + paint.rect(vx - 1, vy + 5, 3, base_y - vy - 5, "grey", 0.75) + + -- the nodes on the machine, each wired up to the bus + for i, node in ipairs(NODES) do + local nx = L.node_x[i] + put(nx, L.node_y, "[" .. node.name .. "]", node.role) + put(nx + 1, L.node_y + 1, "│", "grey") + put(nx + 1, L.node_y - 1, "│", "grey") + end + put(L.node_x[1] + 1, L.bus, string.rep("─", L.gx - L.node_x[1] - 1), "grey") + for i = 1, #NODES do + put(L.node_x[i] + 1, L.bus, i == 1 and "┌" or "┬", "grey") + end + + -- the gateway the bus runs into + local gx = L.gx + put(gx, L.bus - 1, "┌─────────┐", "syntax.function") + put(gx, L.bus, "┤ GATEWAY │", "syntax.function") + put(gx, L.bus + 1, "└────┬────┘", "syntax.function") + put(gx + 5, L.bus + 2, "│", "grey") + put(gx + 2, L.bus + 3, "to cloud", "muted") + + -- packets: up from each node to the bus, then along it into the gateway + for i = 1, #NODES do + send_clock[i] = send_clock[i] - ctx.dt * ctx.speed + if send_clock[i] <= 0 then + send_clock[i] = send_clock[i] + SEND_PERIOD + packets[#packets + 1] = { node = i, s = 0 } + end + end + local kept = {} + for _, p in ipairs(packets) do + p.s = p.s + ctx.dt * PACKET_RATE * ctx.speed + local nx = L.node_x[p.node] + 1 + local x, y + if p.s < 1 then + x, y = nx, L.node_y - 1 + else + x, y = nx + math.floor(p.s - 1), L.bus + end + if x < gx then + put(x, y, "o", NODES[p.node].role) + kept[#kept + 1] = p + end + end + packets = kept + + -- the panel: a heading, then each node's level, status and sparkline + local panel = L.panel + local pwid = w - panel - 2 + -- each chart is three rows of eighth blocks, so a reading has 24 steps of height + local chart, gap, row = 3, 3, 4 + local stacked = pwid < 30 + if stacked then + -- too narrow to sit beside the machine: the panel goes under it with one-row charts + panel, pwid = L.mx, w - L.mx - 2 + chart, gap, row = 1, 1, L.box + 7 + end + if pwid >= 20 then + if not stacked then + put(panel, 2, "vibration mm/s RMS", "muted") + end + for i, node in ipairs(NODES) do + if row + chart >= h - 3 then + break + end + local hist = history[i] + local now = hist[#hist] + local status, role = "OK", "green" + if now >= SERVICE_LEVEL then + status, role = "SERVICE", "error" + elseif now >= WATCH_LEVEL then + status, role = "WATCH", "warning" + end + put(panel, row, node.name, node.role) + put(panel + 4, row, node.where, "text") + local value = string.format("%4.1f %s", now, status) + put(panel + pwid - #value, row, string.format("%4.1f", now), "bright") + put(panel + pwid - #status, row, status, role) + -- the chart in pixels: a filled area with a firmer top edge, two pixels to a row + local start = #hist - pwid + 1 + local ch = chart * 2 + local base = (row + 1 + chart) * 2 + local fill = status == "OK" and "syntax.string" or role + for k = 1, pwid do + local v = hist[start + k - 1] or 0 + -- a square root scale keeps the small everyday wobble visible beside a worn bearing + local tall = math.max(1, math.min(ch, math.floor(math.sqrt(v / 8) * ch + 0.5))) + paint.rect(panel + k - 1, base - tall, 1, tall, fill, 0.45) + paint.pixel(panel + k - 1, base - tall, fill, 1) + end + row = row + chart + gap + end + -- the prediction for the worn bearing, from how fast it is climbing + local left = (1 - wear(t)) * WEAR_CYCLE + local note + if wear(t) < 0.35 then + note = "all nodes healthy, no service due" + else + note = string.format("N3 service due in about %d days", math.max(1, math.floor(left / 6))) + end + if row < h - 3 then + put(panel, row, note, wear(t) < 0.35 and "muted" or "warning") + end + end + + paint.flush() + + -- the name in the big font in the space under the machine + local ty = L.box + 8 + if not stacked and ty + 6 < h - 3 then + draw_banner(title, title_width, -L.mx, ty, L.panel - 2, "accent", true) + put(L.mx, ty + 5, "predictive maintenance, one node at a time", "syntax.comment") + end + + -- the ticker on the bottom row but one + ticker_scroll = ticker_scroll + ctx.dt * TICKER_RATE * ctx.speed + local offset = math.floor(ticker_scroll) + local out = {} + for x = 1, w - 4 do + out[x] = ticker[(x - 1 + offset) % #ticker + 1] + end + put(2, h - 2, table.concat(out), "syntax.function") + end, + + on_fail = function(ctx) + return "A fault on the line. Time for maintenance." + end, + + on_recovered = function(ctx) + return "Serviced and running sweetly again." + end, +} diff --git a/apps/zacess-scenes/scenes/scope.lua b/apps/zacess-scenes/scenes/scope.lua new file mode 100644 index 0000000..7c2ae28 --- /dev/null +++ b/apps/zacess-scenes/scenes/scope.lua @@ -0,0 +1,247 @@ +-- scope: an oscilloscope in roll mode on my bench, painted in pixels. Two channels scroll across +-- a graticule with a faint phosphor glow, a sine with a little harmonic on channel 1 and a PWM +-- square wave on channel 2, with readouts and a caption ticker under the screen. +-- +-- installed into the Zacess Scenes folder by apps/zacess-scenes/setup.sh or setup.ps1. Every +-- colour is a palette role, so the scene follows whichever Zacess theme zt last set. It paints +-- with the pixel canvas; an older Zacess Scenes without one draws the same shapes in half blocks. + +-- pixels a second the traces roll across at standard motion +local ROLL_RATE = 10 +-- pixels for one cycle of each channel +local CH1_CYCLE = 34 +local CH2_CYCLE = 24 +-- seconds for the PWM duty cycle to drift from low to high and back, slow enough to watch +local DUTY_PERIOD = 16 +-- cells a second the caption ticker moves +local TICKER_RATE = 7 +-- seconds between readout refreshes, so the digits never churn +local READOUT_PERIOD = 0.75 + +local TICKER = "on the bench · Electronic Engineering and Computer Science · probe, measure, then change one thing · ADC at 12 bits · PWM into a motor driver · I2C at 400 kHz · PHAEMOS vibration node · " + +-- pixel drawing that runs on every version of Zacess Scenes: the program's own pixel canvas +-- where it has one. On an older version without it the same calls are drawn as half-block +-- characters, so the scene still shows its shapes. Call flush after the pixels and before any +-- text, since text is drawn over them +local function painter(ctx) + if ctx.rect then + return { + width = ctx.pixel_width, + height = ctx.pixel_height, + pixel = ctx.pixel, + rect = ctx.rect, + disc = ctx.disc, + line = ctx.line, + flush = function() end, + } + end + local w, h = ctx.width, ctx.height * 2 + local grid = {} + local function set(x, y, role, strength) + -- faint imagery drops away here, as it does on screen with colour turned off + if (strength or 1) < 0.3 then + return + end + x, y = math.floor(x), math.floor(y) + if x >= 0 and x < w and y >= 0 and y < h then + grid[y * w + x] = role or "text" + end + end + local p = { width = w, height = h } + p.pixel = set + p.rect = function(x, y, rw, rh, role, strength) + for yy = math.max(0, math.floor(y)), math.min(h, math.floor(y + rh)) - 1 do + for xx = math.max(0, math.floor(x)), math.min(w, math.floor(x + rw)) - 1 do + set(xx, yy, role, strength) + end + end + end + p.disc = function(cx, cy, r, role, strength) + for yy = math.floor(cy - r), math.ceil(cy + r) do + for xx = math.floor(cx - r), math.ceil(cx + r) do + if (xx - cx) ^ 2 + (yy - cy) ^ 2 <= r * r then + set(xx, yy, role, strength) + end + end + end + end + p.line = function(x1, y1, x2, y2, role, strength) + local n = math.max(math.abs(x2 - x1), math.abs(y2 - y1), 1) + for i = 0, n do + set(x1 + (x2 - x1) * i / n + 0.5, y1 + (y2 - y1) * i / n + 0.5, role, strength) + end + end + p.flush = function() + for cy = 0, ctx.height - 1 do + for x = 0, w - 1 do + local top, bottom = grid[cy * 2 * w + x], grid[(cy * 2 + 1) * w + x] + if top and bottom then + put(x, cy, top == bottom and "█" or "▀", top) + elseif top then + put(x, cy, "▀", top) + elseif bottom then + put(x, cy, "▄", bottom) + end + end + end + end + return p +end + +local roll = 0 +local ticker_scroll = 0 +local readout_clock = 0 +local readout = {} + +-- a string as a list of characters, so text with a middle dot slices by character, not byte +local function chars(s) + local list = {} + for _, code in utf8.codes(s) do + list[#list + 1] = utf8.char(code) + end + return list +end + +local ticker = chars(TICKER) + +-- channel 1 from -1 to 1 before scaling +local function ch1(u) + local a = u / CH1_CYCLE * 2 * math.pi + return 0.88 * math.sin(a) + 0.1 * math.sin(3 * a) +end + +-- channel 2 as high or low for a duty cycle between 0 and 1 +local function ch2(u, duty) + return (u / CH2_CYCLE) % 1 < duty +end + +-- a trace through one y per column, joined column to column so steep parts never break, with +-- a faint glow above and below like phosphor +local function trace(px, x0, ys, role, glow) + for i = 1, #ys - 1 do + local x = x0 + i - 1 + px.line(x, ys[i] - 1, x + 1, ys[i + 1] - 1, glow, 0.3) + px.line(x, ys[i] + 1, x + 1, ys[i + 1] + 1, glow, 0.3) + end + for i = 1, #ys - 1 do + local x = x0 + i - 1 + px.line(x, ys[i], x + 1, ys[i + 1], role, 1) + end +end + +return { + name = "scope", + kind = "general", + summary = "A pixel oscilloscope in roll mode with a sine and a PWM trace and a bench ticker", + captions = { + "Clean signal, clean build.", + "Everything in spec.", + "No noise on the line.", + }, + + frame = function(ctx) + local w, h = ctx.width, ctx.height + local t = ctx.time + local px = painter(ctx) + roll = roll + ctx.dt * ROLL_RATE * ctx.speed + + -- the screen in cells: a frame with ten divisions across and eight down + local sx, sy = 2, 2 + local sw = math.max(20, w - 4) + local sh = math.max(8, h - 7) + local iw = sw - 2 + -- the same screen in pixels, inside the frame + local left, top = sx + 1, sy * 2 + local pwid, phei = iw, sh * 2 + local cx = left + math.floor(pwid / 2) + local cy = top + math.floor(phei / 2) + + -- a faint glass tint, then the graticule as dotted lines and the centre axes with ticks + px.rect(left, top, pwid, phei, "info", 0.06) + for d = 1, 9 do + local gx = left + math.floor(pwid * d / 10) + for y = top, top + phei - 1, 2 do + px.pixel(gx, y, "muted", 0.4) + end + end + for d = 1, 7 do + local gy = top + math.floor(phei * d / 8) + for x = left, left + pwid - 1, 3 do + px.pixel(x, gy, "muted", 0.4) + end + end + px.line(left, cy, left + pwid - 1, cy, "grey", 0.6) + px.line(cx, top, cx, top + phei - 1, "grey", 0.6) + for x = left, left + pwid - 1, 5 do + px.line(x, cy - 1, x, cy + 1, "grey", 0.8) + end + for y = top, top + phei - 1, 4 do + px.line(cx - 1, y, cx + 1, y, "grey", 0.8) + end + + -- channel 1 in the upper half and channel 2 in the lower half, the newest sample arriving + -- at the right edge + local upper = top + math.floor(phei / 4) + local lower = top + math.floor(phei * 3 / 4) + local amp = math.max(3, math.floor(phei / 4) - 3) + local duty = 0.5 + 0.3 * math.sin(t * 2 * math.pi / DUTY_PERIOD * ctx.pace) + local y1, y2 = {}, {} + for i = 1, pwid do + local u = i + roll + y1[i] = math.floor(upper - ch1(u) * amp + 0.5) + y2[i] = ch2(u, duty) and lower - amp or lower + amp + end + trace(px, left, y1, "bright_yellow", "yellow") + trace(px, left, y2, "bright_cyan", "cyan") + px.flush() + + -- the frame around the screen, with each channel's number on the left edge at its centre + put(sx, sy - 1, "┌" .. string.rep("─", sw - 2) .. "┐", "grey") + put(sx, sy + sh, "└" .. string.rep("─", sw - 2) .. "┘", "grey") + for y = sy, sy + sh - 1 do + put(sx, y, "│", "grey") + put(sx + sw - 1, y, "│", "grey") + end + put(sx, math.floor(upper / 2), "1", "yellow") + put(sx, math.floor(lower / 2), "2", "cyan") + + -- the readouts under the screen, refreshed on their own slow clock + readout_clock = readout_clock - ctx.dt + if readout_clock <= 0 then + readout_clock = READOUT_PERIOD + local wobble = 0.004 * math.sin(t * 0.7) + readout = { + { "CH1", string.format("1.00 V/div f %.3f kHz Vpp 3.30 V", 1.000 + wobble), "yellow" }, + { "CH2", string.format("5.00 V/div PWM duty %2d%%", math.floor(duty * 100 + 0.5)), "cyan" }, + { "ROLL", "2 ms/div", "accent" }, + } + end + local rx = sx + for _, r in ipairs(readout) do + put(rx, sy + sh + 1, r[1], r[3]) + put(rx + #r[1] + 1, sy + sh + 1, r[2], "text") + rx = rx + #r[1] + #r[2] + 5 + if rx >= w - 10 then + break + end + end + + -- the caption ticker on the bottom row + ticker_scroll = ticker_scroll + ctx.dt * TICKER_RATE * ctx.speed + local offset = math.floor(ticker_scroll) + local out = {} + for x = 1, w - 4 do + out[x] = ticker[(x - 1 + offset) % #ticker + 1] + end + put(2, h - 2, table.concat(out), "syntax.function") + end, + + on_fail = function(ctx) + return "Something is out of spec. Probe it." + end, + + on_recovered = function(ctx) + return "Back in spec. Clean signal." + end, +} diff --git a/apps/zacess-scenes/setup.ps1 b/apps/zacess-scenes/setup.ps1 index 8f1b447..a18502b 100644 --- a/apps/zacess-scenes/setup.ps1 +++ b/apps/zacess-scenes/setup.ps1 @@ -1,9 +1,9 @@ # sets up Zacess Scenes on Windows: puts the newest release binary in ~\.local\bin after checking it -# against its published checksum, installs bacon for watch mode with cargo and links scenes.toml into -# %APPDATA%\zacess. Safe to run again. +# against its published checksum, installs bacon for watch mode with cargo and links scenes.toml and +# my Lua scenes into %APPDATA%\zacess. Safe to run again. # -# & apps\zacess-scenes\setup.ps1 install or update, then link the config -# & apps\zacess-scenes\setup.ps1 -Link only link the config +# & apps\zacess-scenes\setup.ps1 install or update, then link the config and scenes +# & apps\zacess-scenes\setup.ps1 -Link only link the config and scenes # # the bootstrap passes -Theme to every app script; Scenes follows the theme zt last set instead param([switch]$Link, [string]$Theme) @@ -38,6 +38,34 @@ function Set-ScenesConfig { } } +# each of my Lua scenes is linked on its own, so a scene started with zs new stays in the folder +# beside them. Without Developer Mode they are copied, so run this again after changing one +function Set-LuaScenes { + $dir = Join-Path $ConfigDir 'scenes' + New-Item -ItemType Directory -Force -Path $dir | Out-Null + $linked = $true + foreach ($scene in Get-ChildItem (Join-Path $PSScriptRoot 'scenes') -Filter *.lua -ErrorAction SilentlyContinue) { + $target = Join-Path $dir $scene.Name + $item = Get-Item $target -ErrorAction SilentlyContinue + if ($item -and -not $item.LinkType) { + # a scene of the same name made by hand goes to the Recycle Bin rather than being overwritten + Add-Type -AssemblyName Microsoft.VisualBasic + [Microsoft.VisualBasic.FileIO.FileSystem]::DeleteFile($target, 'OnlyErrorDialogs', 'SendToRecycleBin') + "Moved the old $target to the Recycle Bin." + } elseif ($item) { + Remove-Item $target + } + try { + New-Item -ItemType SymbolicLink -Path $target -Target $scene.FullName -ErrorAction Stop | Out-Null + } catch { + Copy-Item $scene.FullName $target + $linked = $false + } + } + if ($linked) { "Linked the Lua scenes into $dir" } + else { "Copied the Lua scenes to $dir (turn on Developer Mode to link them instead)" } +} + function Install-Scenes { if ($env:PROCESSOR_ARCHITECTURE -ne 'AMD64') { "No Zacess Scenes build for $env:PROCESSOR_ARCHITECTURE, skipped." @@ -82,3 +110,4 @@ if (-not $Link) { Install-Bacon } Set-ScenesConfig +Set-LuaScenes diff --git a/apps/zacess-scenes/setup.sh b/apps/zacess-scenes/setup.sh index dae8ddd..91a5a32 100644 --- a/apps/zacess-scenes/setup.sh +++ b/apps/zacess-scenes/setup.sh @@ -3,11 +3,11 @@ set -euo pipefail # sets up Zacess Scenes on macOS and Linux: puts the newest release binary in ~/.local/bin after # checking it against its published checksum, installs bacon for watch mode with cargo and links -# scenes.toml into the config folder. Safe to run again. The theme needs nothing here: Scenes reads -# the one zt last set. +# scenes.toml and my Lua scenes into the config folder. Safe to run again. The theme needs nothing +# here: Scenes reads the one zt last set. # -# bash apps/zacess-scenes/setup.sh install or update, then link the config -# bash apps/zacess-scenes/setup.sh --link only link the config +# bash apps/zacess-scenes/setup.sh install or update, then link the config and scenes +# bash apps/zacess-scenes/setup.sh --link only link the config and scenes HERE="$(cd "$(dirname "$0")" && pwd)" REPO="zacesshq/scenes" @@ -30,6 +30,27 @@ link_config() { printf 'Linked %s\n' "$target" } +# each of my Lua scenes is linked on its own, so a scene started with zs new stays in the folder +# beside them and an edit here shows up at the next start without running this again +link_scenes() { + local scene name target bin + for scene in "$HERE"/scenes/*.lua; do + [ -e "$scene" ] || continue + name="$(basename "$scene")" + target="$CONFIG_DIR/scenes/$name" + if [ -e "$target" ] && [ ! -L "$target" ]; then + # a scene of the same name made by hand goes to the Bin rather than being overwritten + bin="$HOME/.Trash" + [ -d "$bin" ] || bin="${XDG_DATA_HOME:-$HOME/.local/share}/Trash/files" + mkdir -p "$bin" + mv "$target" "$bin/$name.$(date +%Y%m%d%H%M%S)" + printf 'Moved the old %s to the Bin.\n' "$target" + fi + ln -sfn "$scene" "$target" + done + printf 'Linked the Lua scenes into %s\n' "$CONFIG_DIR/scenes" +} + # the release target for this machine, as the release files name it target_triple() { local arch @@ -100,3 +121,4 @@ if [ "${1:-}" != "--link" ]; then install_bacon fi link_config +link_scenes diff --git a/apps/zotero/README.md b/apps/zotero/README.md index 93a01ec..80505af 100644 --- a/apps/zotero/README.md +++ b/apps/zotero/README.md @@ -9,10 +9,10 @@ Zotero 7 has no custom interface colours, so each Zacess theme maps to Zotero's | Zacess theme | Zotero mode | Reader theme | | --- | --- | --- | | Deep Contrast Dark, High Contrast Dark, Yellow on Black | Dark | Black | -| Dark | Dark | Dark | +| Dark, Warm Dark | Dark | Dark | | Deep Contrast Light, High Contrast Light | Light | Original (white) | | Light | Light | Snow | -| Cream | Light | Sepia | +| Cream, Warm Light | Light | Sepia | [`shared/prefs.json`](shared/prefs.json) adds a larger interface font (`extensions.zotero.fontSize` 1.15) and 16-point notes. @@ -55,4 +55,4 @@ Zotero's custom reader themes live in its synced database, not in prefs, so a Za ## Validation -[`scripts/validate.py`](scripts/validate.py) runs in CI on Linux. It checks all eight themes map to a mode and one built-in reader theme and the apply script parses. +[`scripts/validate.py`](scripts/validate.py) runs in CI on Linux. It checks all ten themes map to a mode and one built-in reader theme and the apply script parses. diff --git a/apps/zotero/linux/apply.sh b/apps/zotero/linux/apply.sh index 0503dce..81a67fe 100644 --- a/apps/zotero/linux/apply.sh +++ b/apps/zotero/linux/apply.sh @@ -3,8 +3,9 @@ # usage: apply.sh [--theme ] [profile folder] # (the profile defaults to the one under ~/.zotero/zotero or in the Flatpak's copy) # -# --theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# --theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. the work is done by ../shared/apply.py; nothing is backed up. set -euo pipefail @@ -30,12 +31,14 @@ theme_name() { light) echo "Zacess Light" ;; cream) echo "Zacess Cream" ;; yellow|yellow-on-black) echo "Zacess Yellow on Black" ;; + warm-dark) echo "Zacess Warm Dark" ;; + warm-light) echo "Zacess Warm Light" ;; *) return 1 ;; esac } if ! name="$(theme_name "$theme")"; then echo "Unknown theme: $theme" >&2 - echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow." >&2 + echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light." >&2 exit 1 fi diff --git a/apps/zotero/mac/apply.sh b/apps/zotero/mac/apply.sh index df4adae..6a7a504 100755 --- a/apps/zotero/mac/apply.sh +++ b/apps/zotero/mac/apply.sh @@ -3,8 +3,9 @@ # usage: apply.sh [--theme ] [profile folder] # (the profile defaults to the one under ~/Library/Application Support/Zotero/Profiles) # -# --theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# --theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. the work is done by ../shared/apply.py; nothing is backed up. set -euo pipefail @@ -30,12 +31,14 @@ theme_name() { light) echo "Zacess Light" ;; cream) echo "Zacess Cream" ;; yellow|yellow-on-black) echo "Zacess Yellow on Black" ;; + warm-dark) echo "Zacess Warm Dark" ;; + warm-light) echo "Zacess Warm Light" ;; *) return 1 ;; esac } if ! name="$(theme_name "$theme")"; then echo "Unknown theme: $theme" >&2 - echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow." >&2 + echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light." >&2 exit 1 fi diff --git a/apps/zotero/scripts/validate.py b/apps/zotero/scripts/validate.py index b24f3c2..73cfbb8 100644 --- a/apps/zotero/scripts/validate.py +++ b/apps/zotero/scripts/validate.py @@ -1,6 +1,6 @@ """Checks the Zotero folder without Zotero: run from anywhere, exits non-zero on a problem. -- shared/themes.json maps all eight Zacess themes to Zotero's dark (0) or light (1) mode and one +- shared/themes.json maps all ten Zacess themes to Zotero's dark (0) or light (1) mode and one built-in reader theme - shared/prefs.json parses and shared/apply.py parses as Python """ @@ -11,14 +11,15 @@ import sys NAMES = ["Zacess Deep Contrast Dark", "Zacess Deep Contrast Light", "Zacess High Contrast Dark", - "Zacess High Contrast Light", "Zacess Dark", "Zacess Light", "Zacess Cream", "Zacess Yellow on Black"] + "Zacess High Contrast Light", "Zacess Dark", "Zacess Light", "Zacess Cream", "Zacess Yellow on Black", + "Zacess Warm Dark", "Zacess Warm Light"] READER = {"", "black", "dark", "snow", "sepia"} root = pathlib.Path(__file__).resolve().parent.parent problems = [] themes = json.loads((root / "shared" / "themes.json").read_text(encoding="utf-8")) if sorted(themes) != sorted(NAMES): - problems.append("themes.json: does not hold exactly the eight Zacess themes") + problems.append("themes.json: does not hold exactly the ten Zacess themes") for name, prefs in themes.items(): if prefs.get("browser.theme.toolbar-theme") not in (0, 1): problems.append(f"themes.json: {name} has no dark or light mode") diff --git a/apps/zotero/shared/themes.json b/apps/zotero/shared/themes.json index 5c43ddf..3d17c7d 100644 --- a/apps/zotero/shared/themes.json +++ b/apps/zotero/shared/themes.json @@ -6,5 +6,7 @@ "Zacess Dark": { "browser.theme.toolbar-theme": 0, "extensions.zotero.reader.darkTheme": "dark" }, "Zacess Light": { "browser.theme.toolbar-theme": 1, "extensions.zotero.reader.lightTheme": "snow" }, "Zacess Cream": { "browser.theme.toolbar-theme": 1, "extensions.zotero.reader.lightTheme": "sepia" }, - "Zacess Yellow on Black": { "browser.theme.toolbar-theme": 0, "extensions.zotero.reader.darkTheme": "black" } + "Zacess Yellow on Black": { "browser.theme.toolbar-theme": 0, "extensions.zotero.reader.darkTheme": "black" }, + "Zacess Warm Dark": { "browser.theme.toolbar-theme": 0, "extensions.zotero.reader.darkTheme": "dark" }, + "Zacess Warm Light": { "browser.theme.toolbar-theme": 1, "extensions.zotero.reader.lightTheme": "sepia" } } diff --git a/apps/zotero/windows/apply.ps1 b/apps/zotero/windows/apply.ps1 index 82ccf97..2aa0c42 100644 --- a/apps/zotero/windows/apply.ps1 +++ b/apps/zotero/windows/apply.ps1 @@ -2,8 +2,9 @@ # usage: .\apply.ps1 [-Theme ] [-ProfileDir ] # (the profile defaults to the one under %APPDATA%\Zotero\Zotero\Profiles) # -# -Theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# -Theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # Zotero has no custom interface colours, so each Zacess theme maps to Zotero's dark or light mode @@ -24,12 +25,13 @@ $themeNames = [ordered]@{ 'hc-light' = 'Zacess High Contrast Light'; 'high-contrast-light' = 'Zacess High Contrast Light' 'dark' = 'Zacess Dark'; 'light' = 'Zacess Light'; 'cream' = 'Zacess Cream' 'yellow' = 'Zacess Yellow on Black'; 'yellow-on-black' = 'Zacess Yellow on Black' + 'warm-dark' = 'Zacess Warm Dark'; 'warm-light' = 'Zacess Warm Light' } $key = ($Theme.ToLowerInvariant() -replace '^zacess[ -]', '') -replace ' ', '-' $name = $themeNames[$key] if (-not $name) { [Console]::Error.WriteLine("Unknown theme: $Theme") - [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow.') + [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light.') exit 1 } diff --git a/editors/README.md b/editors/README.md index 90c1b51..d1f5855 100644 --- a/editors/README.md +++ b/editors/README.md @@ -21,6 +21,6 @@ Every editor and IDE I use, set up with the same Zacess themes, Geist Mono and o | [matlab](matlab) | The Zacess desktop and syntax colours and Geist Mono, set through MATLAB's settings API | macOS, Linux and Windows | | [ltspice](ltspice) | The Zacess colours for LTspice's schematics, waveforms and netlists | macOS, Linux and Windows | | [proteus](proteus) | The Zacess colours for Proteus's schematic templates, PCB layout and graphs, with Proteus's own colours one command away | Windows | -| [xcode](xcode) | The eight Zacess themes, the recorded editor settings and the key bindings file, installed by one script | macOS | +| [xcode](xcode) | The ten Zacess themes, the recorded editor settings and the key bindings file, installed by one script | macOS | | [neovim](neovim) | Pure Lua config with lazy.nvim, LSP through Mason, treesitter, Telescope and completion | macOS, Linux and Windows | -| [nano](nano) | One shared nanorc for GNU nano everywhere, VS Code's keys where nano takes them and the eight Zacess themes; `zt` writes nano's rc file per machine | macOS (Homebrew's nano), Linux and Windows (Git for Windows) | +| [nano](nano) | One shared nanorc for GNU nano everywhere, VS Code's keys where nano takes them and the ten Zacess themes; `zt` writes nano's rc file per machine | macOS (Homebrew's nano), Linux and Windows (Git for Windows) | diff --git a/editors/arduino/ACCESSIBILITY.md b/editors/arduino/ACCESSIBILITY.md index 4490bdc..d0346c2 100644 --- a/editors/arduino/ACCESSIBILITY.md +++ b/editors/arduino/ACCESSIBILITY.md @@ -5,7 +5,7 @@ Larger text, a high contrast theme and saving that never depends on memory, so A ## Vision - Editor text is GeistMono Nerd Font at 16 points, larger than the default 14. **File > Preferences** also has **Interface scale**, which grows the whole window. -- The theme is Zacess Deep Contrast Dark from [Zacess Themes](https://github.com/zacesshq/themes) 0.5.0: white on pure black with deep, fully saturated colours. All eight Zacess themes install together and any of them can be picked with `--theme` or under **Theme** in the preferences. Measured contrast is in the [Zacess Themes accessibility statement](https://github.com/zacesshq/themes/blob/main/ACCESSIBILITY.md). +- The theme is Zacess Deep Contrast Dark from [Zacess Themes](https://github.com/zacesshq/themes) 1.0.0: white on pure black with deep, fully saturated colours. All ten Zacess themes install together and any of them can be picked with `--theme` or under **Theme** in the preferences. Measured contrast is in the [Zacess Themes accessibility statement](https://github.com/zacesshq/themes/blob/main/ACCESSIBILITY.md). - Colour is never the only signal: keywords are also bold in every Zacess theme. ## Reading and writing diff --git a/editors/arduino/README.md b/editors/arduino/README.md index 0608cc9..ea49b4b 100644 --- a/editors/arduino/README.md +++ b/editors/arduino/README.md @@ -8,7 +8,7 @@ Arduino IDE 2 is built on Eclipse Theia, the same editor parts as VS Code. It ke | Setting | Value | Why | | --- | --- | --- | -| `workbench.colorTheme` | `Zacess Deep Contrast Dark` | The default theme. `--theme` (`-Theme` on Windows) picks any of the eight | +| `workbench.colorTheme` | `Zacess Deep Contrast Dark` | The default theme. `--theme` (`-Theme` on Windows) picks any of the ten | | `editor.fontFamily` | `'GeistMono Nerd Font', 'GeistMono NF', monospace` | Geist Mono's Nerd Font build, the font every editor uses. The second name is the one Windows' older font lookup knows, as a fallback | | `editor.fontSize` | `16` | Larger than the default 14 | | `files.autoSave` | `afterDelay` | Sketches save themselves, so nothing depends on saving before an upload | @@ -19,7 +19,7 @@ Every key lives in [`shared/settings.json`](shared/settings.json). The scripts m ## The themes -[`shared/theme-package.json`](shared/theme-package.json) pins Zacess Themes 0.12.0 by its release URL and SHA-256 digest. The apply script downloads it, checks the digest and puts `zacess-themes-0.12.0.vsix` in the `plugins` folder. Arduino IDE unpacks it into `deployedPlugins` on its next start. An older `zacess-themes-*.vsix` in the folder is removed, so the themes never load twice. To move to a new release, change the version, URL and digest together. +[`shared/theme-package.json`](shared/theme-package.json) pins Zacess Themes 1.0.0 by its release URL and SHA-256 digest. The apply script downloads it, checks the digest and puts `zacess-themes-0.12.0.vsix` in the `plugins` folder. Arduino IDE unpacks it into `deployedPlugins` on its next start. An older `zacess-themes-*.vsix` in the folder is removed, so the themes never load twice. To move to a new release, change the version, URL and digest together. ## Where the settings live diff --git a/editors/arduino/linux/apply.sh b/editors/arduino/linux/apply.sh index bf52d61..9caaeb1 100755 --- a/editors/arduino/linux/apply.sh +++ b/editors/arduino/linux/apply.sh @@ -3,8 +3,9 @@ # usage: apply.sh [--theme ] [--config-dir ] # (the config folder defaults to ~/.arduinoIDE; Linux also checks the Flatpak's copy) # -# --theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# --theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # the themes come from the pinned Zacess Themes .vsix in ../shared/theme-package.json, checked @@ -41,13 +42,15 @@ theme_name() { light) echo "Zacess Light" ;; cream) echo "Zacess Cream" ;; yellow|yellow-on-black) echo "Zacess Yellow on Black" ;; + warm-dark) echo "Zacess Warm Dark" ;; + warm-light) echo "Zacess Warm Light" ;; *) return 1 ;; esac } if ! name="$(theme_name "$theme")"; then echo "Unknown theme: $theme" >&2 - echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow." >&2 + echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light." >&2 exit 1 fi diff --git a/editors/arduino/mac/apply.sh b/editors/arduino/mac/apply.sh index bf52d61..9caaeb1 100755 --- a/editors/arduino/mac/apply.sh +++ b/editors/arduino/mac/apply.sh @@ -3,8 +3,9 @@ # usage: apply.sh [--theme ] [--config-dir ] # (the config folder defaults to ~/.arduinoIDE; Linux also checks the Flatpak's copy) # -# --theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# --theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # the themes come from the pinned Zacess Themes .vsix in ../shared/theme-package.json, checked @@ -41,13 +42,15 @@ theme_name() { light) echo "Zacess Light" ;; cream) echo "Zacess Cream" ;; yellow|yellow-on-black) echo "Zacess Yellow on Black" ;; + warm-dark) echo "Zacess Warm Dark" ;; + warm-light) echo "Zacess Warm Light" ;; *) return 1 ;; esac } if ! name="$(theme_name "$theme")"; then echo "Unknown theme: $theme" >&2 - echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow." >&2 + echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light." >&2 exit 1 fi diff --git a/editors/arduino/scripts/validate.py b/editors/arduino/scripts/validate.py index 9c76ab0..78f6ca2 100644 --- a/editors/arduino/scripts/validate.py +++ b/editors/arduino/scripts/validate.py @@ -1,6 +1,6 @@ """Checks the Arduino IDE folder without the IDE: run from anywhere, exits non-zero on a problem. -- shared/settings.json parses and names one of the eight Zacess themes and a Geist Mono font +- shared/settings.json parses and names one of the ten Zacess themes and a Geist Mono font - shared/theme-package.json pins a release .vsix by version and a 64-character SHA-256 digest - mac/apply.sh and linux/apply.sh are the same file """ @@ -20,8 +20,8 @@ problems.append("settings.json: workbench.colorTheme is not one of the packaged Zacess themes") if "GeistMono Nerd Font" not in settings.get("editor.fontFamily", ""): problems.append("settings.json: editor.fontFamily does not name GeistMono Nerd Font") -if len(package["themes"]) != 8: - problems.append("theme-package.json: expected the eight Zacess themes") +if len(package["themes"]) != 10: + problems.append("theme-package.json: expected the ten Zacess themes") if not re.fullmatch(r"[0-9a-f]{64}", package["sha256"]): problems.append("theme-package.json: sha256 is not a 64-character lowercase hex digest") expected = f"/releases/download/v{package['version']}/{package['name']}-{package['version']}.vsix" diff --git a/editors/arduino/shared/theme-package.json b/editors/arduino/shared/theme-package.json index 3fa75d9..b8c3266 100644 --- a/editors/arduino/shared/theme-package.json +++ b/editors/arduino/shared/theme-package.json @@ -1,8 +1,8 @@ { "name": "zacess-themes", - "version": "0.12.0", - "url": "https://github.com/zacesshq/themes/releases/download/v0.12.0/zacess-themes-0.12.0.vsix", - "sha256": "4607c720a8727b224c0a13b58031272b2a1c22f6982a436cd105c88ddd25672a", + "version": "1.0.0", + "url": "https://github.com/zacesshq/themes/releases/download/v1.0.0/zacess-themes-1.0.0.vsix", + "sha256": "0d2bbad473385913034fd8a85f7634ef4ec0da64f1abefc0efe4ebcdbefe9cfa", "themes": [ "Zacess Deep Contrast Dark", "Zacess Deep Contrast Light", @@ -11,6 +11,8 @@ "Zacess Dark", "Zacess Light", "Zacess Cream", - "Zacess Yellow on Black" + "Zacess Yellow on Black", + "Zacess Warm Dark", + "Zacess Warm Light" ] } diff --git a/editors/arduino/windows/apply.ps1 b/editors/arduino/windows/apply.ps1 index b451bf8..683bd7d 100644 --- a/editors/arduino/windows/apply.ps1 +++ b/editors/arduino/windows/apply.ps1 @@ -2,8 +2,9 @@ # usage: .\apply.ps1 [-Theme ] [-ConfigDir ] # (the config folder defaults to %USERPROFILE%\.arduinoIDE) # -# -Theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# -Theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # the themes come from the pinned Zacess Themes .vsix in ..\shared\theme-package.json, checked @@ -25,12 +26,13 @@ $themeNames = [ordered]@{ 'hc-light' = 'Zacess High Contrast Light'; 'high-contrast-light' = 'Zacess High Contrast Light' 'dark' = 'Zacess Dark'; 'light' = 'Zacess Light'; 'cream' = 'Zacess Cream' 'yellow' = 'Zacess Yellow on Black'; 'yellow-on-black' = 'Zacess Yellow on Black' + 'warm-dark' = 'Zacess Warm Dark'; 'warm-light' = 'Zacess Warm Light' } $key = ($Theme.ToLowerInvariant() -replace '^zacess[ -]', '') -replace ' ', '-' $name = $themeNames[$key] if (-not $name) { [Console]::Error.WriteLine("Unknown theme: $Theme") - [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow.') + [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light.') exit 1 } diff --git a/editors/eclipse/ACCESSIBILITY.md b/editors/eclipse/ACCESSIBILITY.md index b602141..0b30765 100644 --- a/editors/eclipse/ACCESSIBILITY.md +++ b/editors/eclipse/ACCESSIBILITY.md @@ -18,7 +18,7 @@ reads and behaves like the other editors. `Ctrl+-` on Windows and Linux) zoom the editor text. - The editor and Terminal view use Zacess Deep Contrast Dark from [Zacess Themes](https://github.com/zacesshq/themes) with Eclipse's own **Dark** workbench theme: - white on pure black with deep, fully saturated colours. All eight Zacess themes are in `theme/` + white on pure black with deep, fully saturated colours. All ten Zacess themes are in `theme/` and the scripts import any of them. Measured contrast is in the [Zacess Themes accessibility statement](https://github.com/zacesshq/themes/blob/main/ACCESSIBILITY.md). - Eclipse cannot follow the system light and dark setting, so the theme stays fixed until another diff --git a/editors/eclipse/README.md b/editors/eclipse/README.md index b586803..2289220 100644 --- a/editors/eclipse/README.md +++ b/editors/eclipse/README.md @@ -15,16 +15,17 @@ all of that, so this folder holds only the chosen keys and merges them in. - [`apply.sh`](apply.sh) (macOS and Linux) and [`apply.ps1`](apply.ps1) (Windows) - merge the fragments and the chosen theme in key by key and print what changed, with no backup. The Windows script also lists PowerShell 7 in the Terminal view. Both refuse to run while Eclipse is open. -- [`theme/`](theme/) - the eight Zacess Eclipse themes from - [Zacess Themes](https://github.com/zacesshq/themes) 0.12.0 (editor and Terminal view colours), tab - outlines for the two Deep Contrast themes and an outline stylesheet for the Dark theme on macOS. +- [`theme/`](theme/) - the ten Zacess Eclipse themes from + [Zacess Themes](https://github.com/zacesshq/themes) (all ten from 1.0.0; editor and Terminal view + colours), tab outlines for the two Deep Contrast + themes and an outline stylesheet for the Dark theme on macOS. The scripts import Zacess Deep Contrast Dark by default. `--theme ` (`-Theme` on Windows) picks another and `--no-theme` (`-NoTheme`) skips it. - [`plugins.txt`](plugins.txt) - suggested plugins with their update sites. ## In action -Eclipse IDE in each of the eight Zacess themes, with the same file open. +Eclipse IDE in each of the ten Zacess themes, with the same file open. | Deep Contrast Dark | Deep Contrast Light | | --- | --- | diff --git a/editors/eclipse/apply.ps1 b/editors/eclipse/apply.ps1 index 555a3f6..ba45f5f 100644 --- a/editors/eclipse/apply.ps1 +++ b/editors/eclipse/apply.ps1 @@ -6,10 +6,11 @@ # written out in more than one place. nothing is backed up: the repo holds # every value it writes. every key it does not track is left as it was. # -# -Theme imports one of the eight Zacess themes from theme\ (editor +# -Theme imports one of the ten Zacess themes from theme\ (editor # and Terminal view colours, plus the tab outlines for the two Deep Contrast # themes) and sets the matching Light or Dark workbench theme. It takes a short -# name (deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow), +# name (deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, +# warm-dark, warm-light), # an id (deep-contrast-dark) or the full name. the default is deep-dark. # # it also adds PowerShell 7 to the Terminal view's list of local shells. @@ -31,6 +32,7 @@ $themeNames = [ordered]@{ 'hc-light' = @('Zacess High Contrast Light', 'light'); 'high-contrast-light' = @('Zacess High Contrast Light', 'light') 'dark' = @('Zacess Dark', 'dark'); 'light' = @('Zacess Light', 'light'); 'cream' = @('Zacess Cream', 'light') 'yellow' = @('Zacess Yellow on Black', 'dark'); 'yellow-on-black' = @('Zacess Yellow on Black', 'dark') + 'warm-dark' = @('Zacess Warm Dark', 'dark'); 'warm-light' = @('Zacess Warm Light', 'light') } $picked = $null if (-not $NoTheme) { @@ -38,7 +40,7 @@ if (-not $NoTheme) { $picked = $themeNames[$key] if (-not $picked) { [Console]::Error.WriteLine("Unknown theme: $Theme") - [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow.') + [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light.') exit 1 } } diff --git a/editors/eclipse/apply.sh b/editors/eclipse/apply.sh index 7dde796..cf42033 100755 --- a/editors/eclipse/apply.sh +++ b/editors/eclipse/apply.sh @@ -2,10 +2,11 @@ # merges the tracked Eclipse preferences into one workspace's instance scope. # usage: apply.sh [--theme | --no-theme] [workspace] (defaults to ~/eclipse-workspace) # -# --theme imports one of the eight Zacess themes from theme/ (editor +# --theme imports one of the ten Zacess themes from theme/ (editor # and Terminal view colours, plus the tab outlines for the two Deep Contrast # themes) and sets the matching Light or Dark workbench theme. It takes a short -# name (deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow), +# name (deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, +# warm-dark, warm-light), # an id (deep-contrast-dark) or the full name. the default is deep-dark. # # the values live in prefs/, which apply.ps1 reads too, so no value is written @@ -41,6 +42,8 @@ theme_name() { light) echo "Zacess Light|light" ;; cream) echo "Zacess Cream|light" ;; yellow|yellow-on-black) echo "Zacess Yellow on Black|dark" ;; + warm-dark) echo "Zacess Warm Dark|dark" ;; + warm-light) echo "Zacess Warm Light|light" ;; *) return 1 ;; esac } @@ -48,7 +51,7 @@ theme_name() { if [ -n "$theme" ]; then if ! picked="$(theme_name "$theme")"; then echo "Unknown theme: $theme" >&2 - echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow." >&2 + echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light." >&2 exit 1 fi fi diff --git a/editors/eclipse/guides/reference.md b/editors/eclipse/guides/reference.md index 0f37c5a..4a06bd1 100644 --- a/editors/eclipse/guides/reference.md +++ b/editors/eclipse/guides/reference.md @@ -89,7 +89,7 @@ Eclipse Temurin 25, installed with the lines in [setup.md](setup.md#1-install-th ## Colours -`theme/` holds the eight Zacess Eclipse files from [Zacess Themes](https://github.com/zacesshq/themes) 0.5.0 (`Zacess .epf`, editor and Terminal view colours), the tab outline files for the two Deep Contrast themes and `e4-dark_mac.css`. +`theme/` holds the ten Zacess Eclipse files from [Zacess Themes](https://github.com/zacesshq/themes), all ten released in 1.0.0 (`Zacess .epf`, editor and Terminal view colours), the tab outline files for the two Deep Contrast themes and `e4-dark_mac.css`. The scripts import a theme after merging the preferences: each `/instance//=` line of the `.epf` merges into that plugin's `.prefs` file the same way. `org.eclipse.e4.ui.css.swt.theme.prefs` gets the matching workbench theme (`e4_dark` for the dark themes, `e4_default` for the light ones). Zacess Deep Contrast Dark is the default. @@ -103,6 +103,8 @@ The scripts import a theme after merging the preferences: each `/instance/ Import > General > Preferences** imports any `.epf`, then **General > Appearance** picks Light or Dark and Eclipse restarts. diff --git a/editors/eclipse/theme/Zacess Cream.epf b/editors/eclipse/theme/Zacess Cream.epf index 93e25b9..bb00744 100644 --- a/editors/eclipse/theme/Zacess Cream.epf +++ b/editors/eclipse/theme/Zacess Cream.epf @@ -254,7 +254,7 @@ file_export_version=3.0 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionBackground.SystemDefault=false /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground=253,246,227 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground.SystemDefault=false -/instance/org.eclipse.ui.editors/currentLineColor=243,234,210 +/instance/org.eclipse.ui.editors/currentLineColor=200,218,221 /instance/org.eclipse.ui.editors/lineNumberColor=74,67,55 /instance/org.eclipse.ui.editors/printMarginColor=133,123,105 /instance/org.eclipse.ui.editors/hyperlinkColor=0,68,152 @@ -273,7 +273,7 @@ file_export_version=3.0 /instance/org.eclipse.ui.editors/searchResultHighlighting=false /instance/org.eclipse.ui.editors/searchResultTextStyle=BOX /instance/org.eclipse.ui.editors/errorIndicationColor=119,0,4 -/instance/org.eclipse.ui.editors/warningIndicationColor=81,49,0 +/instance/org.eclipse.ui.editors/warningIndicationColor=128,50,0 /instance/org.eclipse.ui.editors/infoIndicationColor=0,53,122 /instance/org.eclipse.ui.editors/spellingIndicationColor=0,53,122 /instance/org.eclipse.ui.editors/changeIndicationColor=0,21,56 diff --git a/editors/eclipse/theme/Zacess Dark.epf b/editors/eclipse/theme/Zacess Dark.epf index 719d1f8..d4ff517 100644 --- a/editors/eclipse/theme/Zacess Dark.epf +++ b/editors/eclipse/theme/Zacess Dark.epf @@ -254,7 +254,7 @@ file_export_version=3.0 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionBackground.SystemDefault=false /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground=18,18,18 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground.SystemDefault=false -/instance/org.eclipse.ui.editors/currentLineColor=31,31,31 +/instance/org.eclipse.ui.editors/currentLineColor=47,47,47 /instance/org.eclipse.ui.editors/lineNumberColor=184,184,184 /instance/org.eclipse.ui.editors/printMarginColor=107,107,107 /instance/org.eclipse.ui.editors/hyperlinkColor=140,188,255 @@ -273,7 +273,7 @@ file_export_version=3.0 /instance/org.eclipse.ui.editors/searchResultHighlighting=false /instance/org.eclipse.ui.editors/searchResultTextStyle=BOX /instance/org.eclipse.ui.editors/errorIndicationColor=255,204,196 -/instance/org.eclipse.ui.editors/warningIndicationColor=255,209,130 +/instance/org.eclipse.ui.editors/warningIndicationColor=237,192,113 /instance/org.eclipse.ui.editors/infoIndicationColor=189,218,255 /instance/org.eclipse.ui.editors/spellingIndicationColor=189,218,255 /instance/org.eclipse.ui.editors/changeIndicationColor=201,224,255 diff --git a/editors/eclipse/theme/Zacess Deep Contrast Dark.epf b/editors/eclipse/theme/Zacess Deep Contrast Dark.epf index 02a7368..517901f 100644 --- a/editors/eclipse/theme/Zacess Deep Contrast Dark.epf +++ b/editors/eclipse/theme/Zacess Deep Contrast Dark.epf @@ -254,7 +254,7 @@ file_export_version=3.0 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionBackground.SystemDefault=false /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground=0,0,0 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground.SystemDefault=false -/instance/org.eclipse.ui.editors/currentLineColor=20,20,20 +/instance/org.eclipse.ui.editors/currentLineColor=38,38,38 /instance/org.eclipse.ui.editors/lineNumberColor=255,255,255 /instance/org.eclipse.ui.editors/printMarginColor=140,140,140 /instance/org.eclipse.ui.editors/hyperlinkColor=29,180,255 diff --git a/editors/eclipse/theme/Zacess Deep Contrast Light.epf b/editors/eclipse/theme/Zacess Deep Contrast Light.epf index d4c3f90..53d9d2a 100644 --- a/editors/eclipse/theme/Zacess Deep Contrast Light.epf +++ b/editors/eclipse/theme/Zacess Deep Contrast Light.epf @@ -254,7 +254,7 @@ file_export_version=3.0 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionBackground.SystemDefault=false /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground=255,255,255 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground.SystemDefault=false -/instance/org.eclipse.ui.editors/currentLineColor=245,245,245 +/instance/org.eclipse.ui.editors/currentLineColor=200,222,189 /instance/org.eclipse.ui.editors/lineNumberColor=0,0,0 /instance/org.eclipse.ui.editors/printMarginColor=110,110,110 /instance/org.eclipse.ui.editors/hyperlinkColor=0,61,246 @@ -273,7 +273,7 @@ file_export_version=3.0 /instance/org.eclipse.ui.editors/searchResultHighlighting=false /instance/org.eclipse.ui.editors/searchResultTextStyle=BOX /instance/org.eclipse.ui.editors/errorIndicationColor=170,0,0 -/instance/org.eclipse.ui.editors/warningIndicationColor=103,65,0 +/instance/org.eclipse.ui.editors/warningIndicationColor=100,38,0 /instance/org.eclipse.ui.editors/infoIndicationColor=0,46,194 /instance/org.eclipse.ui.editors/spellingIndicationColor=0,46,194 /instance/org.eclipse.ui.editors/changeIndicationColor=0,46,194 diff --git a/editors/eclipse/theme/Zacess High Contrast Dark.epf b/editors/eclipse/theme/Zacess High Contrast Dark.epf index 13a5c7b..04a97ab 100644 --- a/editors/eclipse/theme/Zacess High Contrast Dark.epf +++ b/editors/eclipse/theme/Zacess High Contrast Dark.epf @@ -237,7 +237,7 @@ file_export_version=3.0 /instance/org.eclipse.jdt.ui/semanticHighlighting.deprecatedMember.enabled=true /instance/org.eclipse.jdt.ui/semanticHighlighting.autoboxing.color=255,255,255 /instance/org.eclipse.jdt.ui/semanticHighlighting.autoboxing.enabled=false -/instance/org.eclipse.jdt.ui/matchingBracketsColor=245,196,0 +/instance/org.eclipse.jdt.ui/matchingBracketsColor=143,208,255 /instance/org.eclipse.jdt.ui/sourceHoverBackgroundColor=0,0,0 /instance/org.eclipse.jdt.ui/sourceHoverBackgroundColor.SystemDefault=false /instance/org.eclipse.jdt.ui/content_assist_proposals_background=0,0,0 @@ -254,7 +254,7 @@ file_export_version=3.0 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionBackground.SystemDefault=false /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground=0,0,0 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground.SystemDefault=false -/instance/org.eclipse.ui.editors/currentLineColor=26,26,26 +/instance/org.eclipse.ui.editors/currentLineColor=38,38,38 /instance/org.eclipse.ui.editors/lineNumberColor=230,230,230 /instance/org.eclipse.ui.editors/printMarginColor=140,140,140 /instance/org.eclipse.ui.editors/hyperlinkColor=143,208,255 diff --git a/editors/eclipse/theme/Zacess High Contrast Light.epf b/editors/eclipse/theme/Zacess High Contrast Light.epf index 9003407..aea08a8 100644 --- a/editors/eclipse/theme/Zacess High Contrast Light.epf +++ b/editors/eclipse/theme/Zacess High Contrast Light.epf @@ -254,7 +254,7 @@ file_export_version=3.0 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionBackground.SystemDefault=false /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground=255,255,255 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground.SystemDefault=false -/instance/org.eclipse.ui.editors/currentLineColor=242,242,242 +/instance/org.eclipse.ui.editors/currentLineColor=195,229,254 /instance/org.eclipse.ui.editors/lineNumberColor=38,38,38 /instance/org.eclipse.ui.editors/printMarginColor=110,110,110 /instance/org.eclipse.ui.editors/hyperlinkColor=0,61,153 @@ -273,7 +273,7 @@ file_export_version=3.0 /instance/org.eclipse.ui.editors/searchResultHighlighting=false /instance/org.eclipse.ui.editors/searchResultTextStyle=BOX /instance/org.eclipse.ui.editors/errorIndicationColor=139,0,0 -/instance/org.eclipse.ui.editors/warningIndicationColor=90,58,0 +/instance/org.eclipse.ui.editors/warningIndicationColor=78,28,0 /instance/org.eclipse.ui.editors/infoIndicationColor=0,51,127 /instance/org.eclipse.ui.editors/spellingIndicationColor=0,51,127 /instance/org.eclipse.ui.editors/changeIndicationColor=0,48,122 diff --git a/editors/eclipse/theme/Zacess Light.epf b/editors/eclipse/theme/Zacess Light.epf index ef4e4c5..d40848d 100644 --- a/editors/eclipse/theme/Zacess Light.epf +++ b/editors/eclipse/theme/Zacess Light.epf @@ -254,7 +254,7 @@ file_export_version=3.0 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionBackground.SystemDefault=false /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground=255,255,255 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground.SystemDefault=false -/instance/org.eclipse.ui.editors/currentLineColor=240,240,240 +/instance/org.eclipse.ui.editors/currentLineColor=214,221,232 /instance/org.eclipse.ui.editors/lineNumberColor=77,77,77 /instance/org.eclipse.ui.editors/printMarginColor=138,138,138 /instance/org.eclipse.ui.editors/hyperlinkColor=0,73,163 @@ -273,7 +273,7 @@ file_export_version=3.0 /instance/org.eclipse.ui.editors/searchResultHighlighting=false /instance/org.eclipse.ui.editors/searchResultTextStyle=BOX /instance/org.eclipse.ui.editors/errorIndicationColor=129,0,5 -/instance/org.eclipse.ui.editors/warningIndicationColor=88,54,0 +/instance/org.eclipse.ui.editors/warningIndicationColor=132,56,0 /instance/org.eclipse.ui.editors/infoIndicationColor=0,58,132 /instance/org.eclipse.ui.editors/spellingIndicationColor=0,58,132 /instance/org.eclipse.ui.editors/changeIndicationColor=0,25,64 diff --git a/editors/eclipse/theme/Zacess Warm Dark.epf b/editors/eclipse/theme/Zacess Warm Dark.epf new file mode 100644 index 0000000..ff75476 --- /dev/null +++ b/editors/eclipse/theme/Zacess Warm Dark.epf @@ -0,0 +1,304 @@ +# Zacess Warm Dark for Eclipse, generated by scripts/build.mjs from palette/zacess.json, do not edit by hand +# editor and Terminal view colours; import with File > Import > General > Preferences, then restart Eclipse +file_export_version=3.0 +/instance/org.eclipse.jdt.ui/java_default=229,213,182 +/instance/org.eclipse.jdt.ui/java_default_bold=false +/instance/org.eclipse.jdt.ui/java_default_italic=false +/instance/org.eclipse.jdt.ui/java_default_underline=false +/instance/org.eclipse.jdt.ui/java_default_strikethrough=false +/instance/org.eclipse.jdt.ui/java_keyword=246,157,116 +/instance/org.eclipse.jdt.ui/java_keyword_bold=true +/instance/org.eclipse.jdt.ui/java_keyword_italic=false +/instance/org.eclipse.jdt.ui/java_keyword_underline=false +/instance/org.eclipse.jdt.ui/java_keyword_strikethrough=false +/instance/org.eclipse.jdt.ui/java_keyword_return=255,175,192 +/instance/org.eclipse.jdt.ui/java_keyword_return_bold=true +/instance/org.eclipse.jdt.ui/java_keyword_return_italic=false +/instance/org.eclipse.jdt.ui/java_keyword_return_underline=false +/instance/org.eclipse.jdt.ui/java_keyword_return_strikethrough=false +/instance/org.eclipse.jdt.ui/java_operator=229,213,182 +/instance/org.eclipse.jdt.ui/java_operator_bold=false +/instance/org.eclipse.jdt.ui/java_operator_italic=false +/instance/org.eclipse.jdt.ui/java_operator_underline=false +/instance/org.eclipse.jdt.ui/java_operator_strikethrough=false +/instance/org.eclipse.jdt.ui/java_bracket=229,213,182 +/instance/org.eclipse.jdt.ui/java_bracket_bold=false +/instance/org.eclipse.jdt.ui/java_bracket_italic=false +/instance/org.eclipse.jdt.ui/java_bracket_underline=false +/instance/org.eclipse.jdt.ui/java_bracket_strikethrough=false +/instance/org.eclipse.jdt.ui/java_string=171,186,111 +/instance/org.eclipse.jdt.ui/java_string_bold=false +/instance/org.eclipse.jdt.ui/java_string_italic=false +/instance/org.eclipse.jdt.ui/java_string_underline=false +/instance/org.eclipse.jdt.ui/java_string_strikethrough=false +/instance/org.eclipse.jdt.ui/java_single_line_comment=190,177,158 +/instance/org.eclipse.jdt.ui/java_single_line_comment_bold=false +/instance/org.eclipse.jdt.ui/java_single_line_comment_italic=true +/instance/org.eclipse.jdt.ui/java_single_line_comment_underline=false +/instance/org.eclipse.jdt.ui/java_single_line_comment_strikethrough=false +/instance/org.eclipse.jdt.ui/java_multi_line_comment=190,177,158 +/instance/org.eclipse.jdt.ui/java_multi_line_comment_bold=false +/instance/org.eclipse.jdt.ui/java_multi_line_comment_italic=true +/instance/org.eclipse.jdt.ui/java_multi_line_comment_underline=false +/instance/org.eclipse.jdt.ui/java_multi_line_comment_strikethrough=false +/instance/org.eclipse.jdt.ui/java_doc_default=190,177,158 +/instance/org.eclipse.jdt.ui/java_doc_default_bold=false +/instance/org.eclipse.jdt.ui/java_doc_default_italic=true +/instance/org.eclipse.jdt.ui/java_doc_default_underline=false +/instance/org.eclipse.jdt.ui/java_doc_default_strikethrough=false +/instance/org.eclipse.jdt.ui/java_doc_tag=190,177,158 +/instance/org.eclipse.jdt.ui/java_doc_tag_bold=false +/instance/org.eclipse.jdt.ui/java_doc_tag_italic=true +/instance/org.eclipse.jdt.ui/java_doc_tag_underline=false +/instance/org.eclipse.jdt.ui/java_doc_tag_strikethrough=false +/instance/org.eclipse.jdt.ui/java_doc_keyword=190,177,158 +/instance/org.eclipse.jdt.ui/java_doc_keyword_bold=true +/instance/org.eclipse.jdt.ui/java_doc_keyword_italic=true +/instance/org.eclipse.jdt.ui/java_doc_keyword_underline=false +/instance/org.eclipse.jdt.ui/java_doc_keyword_strikethrough=false +/instance/org.eclipse.jdt.ui/java_comment_task_tag=255,175,192 +/instance/org.eclipse.jdt.ui/java_comment_task_tag_bold=true +/instance/org.eclipse.jdt.ui/java_comment_task_tag_italic=true +/instance/org.eclipse.jdt.ui/java_comment_task_tag_underline=false +/instance/org.eclipse.jdt.ui/java_comment_task_tag_strikethrough=false +/instance/org.eclipse.jdt.ui/java_doc_link=255,232,161 +/instance/org.eclipse.jdt.ui/java_doc_link_bold=false +/instance/org.eclipse.jdt.ui/java_doc_link_italic=false +/instance/org.eclipse.jdt.ui/java_doc_link_underline=true +/instance/org.eclipse.jdt.ui/java_doc_link_strikethrough=false +/instance/org.eclipse.jdt.ui/pf_coloring_key=164,201,233 +/instance/org.eclipse.jdt.ui/pf_coloring_key_bold=false +/instance/org.eclipse.jdt.ui/pf_coloring_key_italic=false +/instance/org.eclipse.jdt.ui/pf_coloring_key_underline=false +/instance/org.eclipse.jdt.ui/pf_coloring_key_strikethrough=false +/instance/org.eclipse.jdt.ui/pf_coloring_value=171,186,111 +/instance/org.eclipse.jdt.ui/pf_coloring_value_bold=false +/instance/org.eclipse.jdt.ui/pf_coloring_value_italic=false +/instance/org.eclipse.jdt.ui/pf_coloring_value_underline=false +/instance/org.eclipse.jdt.ui/pf_coloring_value_strikethrough=false +/instance/org.eclipse.jdt.ui/pf_coloring_assignment=229,213,182 +/instance/org.eclipse.jdt.ui/pf_coloring_assignment_bold=false +/instance/org.eclipse.jdt.ui/pf_coloring_assignment_italic=false +/instance/org.eclipse.jdt.ui/pf_coloring_assignment_underline=false +/instance/org.eclipse.jdt.ui/pf_coloring_assignment_strikethrough=false +/instance/org.eclipse.jdt.ui/pf_coloring_argument=255,209,173 +/instance/org.eclipse.jdt.ui/pf_coloring_argument_bold=false +/instance/org.eclipse.jdt.ui/pf_coloring_argument_italic=true +/instance/org.eclipse.jdt.ui/pf_coloring_argument_underline=false +/instance/org.eclipse.jdt.ui/pf_coloring_argument_strikethrough=false +/instance/org.eclipse.jdt.ui/pf_coloring_comment=190,177,158 +/instance/org.eclipse.jdt.ui/pf_coloring_comment_bold=false +/instance/org.eclipse.jdt.ui/pf_coloring_comment_italic=true +/instance/org.eclipse.jdt.ui/pf_coloring_comment_underline=false +/instance/org.eclipse.jdt.ui/pf_coloring_comment_strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticFinalField.color=236,180,216 +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticFinalField.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticFinalField.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticFinalField.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticFinalField.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticFinalField.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticField.color=164,201,233 +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticField.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticField.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticField.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticField.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticField.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.field.color=164,201,233 +/instance/org.eclipse.jdt.ui/semanticHighlighting.field.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.field.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.field.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.field.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.field.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.inheritedField.color=164,201,233 +/instance/org.eclipse.jdt.ui/semanticHighlighting.inheritedField.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.inheritedField.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.inheritedField.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.inheritedField.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.inheritedField.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.annotationElementReference.color=164,201,233 +/instance/org.eclipse.jdt.ui/semanticHighlighting.annotationElementReference.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.annotationElementReference.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.annotationElementReference.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.annotationElementReference.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.annotationElementReference.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.methodDeclarationName.color=255,232,161 +/instance/org.eclipse.jdt.ui/semanticHighlighting.methodDeclarationName.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.methodDeclarationName.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.methodDeclarationName.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.methodDeclarationName.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.methodDeclarationName.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.method.color=255,232,161 +/instance/org.eclipse.jdt.ui/semanticHighlighting.method.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.method.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.method.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.method.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.method.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticMethodInvocation.color=255,232,161 +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticMethodInvocation.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticMethodInvocation.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticMethodInvocation.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticMethodInvocation.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticMethodInvocation.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.inheritedMethodInvocation.color=255,232,161 +/instance/org.eclipse.jdt.ui/semanticHighlighting.inheritedMethodInvocation.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.inheritedMethodInvocation.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.inheritedMethodInvocation.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.inheritedMethodInvocation.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.inheritedMethodInvocation.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.abstractMethodInvocation.color=255,232,161 +/instance/org.eclipse.jdt.ui/semanticHighlighting.abstractMethodInvocation.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.abstractMethodInvocation.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.abstractMethodInvocation.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.abstractMethodInvocation.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.abstractMethodInvocation.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.annotation.color=255,232,161 +/instance/org.eclipse.jdt.ui/semanticHighlighting.annotation.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.annotation.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.annotation.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.annotation.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.annotation.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.localVariableDeclaration.color=229,213,182 +/instance/org.eclipse.jdt.ui/semanticHighlighting.localVariableDeclaration.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.localVariableDeclaration.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.localVariableDeclaration.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.localVariableDeclaration.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.localVariableDeclaration.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.localVariable.color=229,213,182 +/instance/org.eclipse.jdt.ui/semanticHighlighting.localVariable.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.localVariable.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.localVariable.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.localVariable.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.localVariable.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.parameterVariable.color=255,209,173 +/instance/org.eclipse.jdt.ui/semanticHighlighting.parameterVariable.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.parameterVariable.italic=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.parameterVariable.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.parameterVariable.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.parameterVariable.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.class.color=113,192,182 +/instance/org.eclipse.jdt.ui/semanticHighlighting.class.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.class.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.class.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.class.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.class.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.abstractClass.color=113,192,182 +/instance/org.eclipse.jdt.ui/semanticHighlighting.abstractClass.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.abstractClass.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.abstractClass.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.abstractClass.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.abstractClass.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.interface.color=113,192,182 +/instance/org.eclipse.jdt.ui/semanticHighlighting.interface.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.interface.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.interface.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.interface.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.interface.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.enum.color=113,192,182 +/instance/org.eclipse.jdt.ui/semanticHighlighting.enum.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.enum.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.enum.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.enum.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.enum.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.record.color=113,192,182 +/instance/org.eclipse.jdt.ui/semanticHighlighting.record.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.record.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.record.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.record.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.record.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.typeParameter.color=113,192,182 +/instance/org.eclipse.jdt.ui/semanticHighlighting.typeParameter.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.typeParameter.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.typeParameter.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.typeParameter.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.typeParameter.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.typeArgument.color=113,192,182 +/instance/org.eclipse.jdt.ui/semanticHighlighting.typeArgument.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.typeArgument.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.typeArgument.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.typeArgument.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.typeArgument.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.number.color=236,180,216 +/instance/org.eclipse.jdt.ui/semanticHighlighting.number.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.number.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.number.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.number.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.number.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.restrictedKeywords.color=246,157,116 +/instance/org.eclipse.jdt.ui/semanticHighlighting.restrictedKeywords.bold=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.restrictedKeywords.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.restrictedKeywords.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.restrictedKeywords.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.restrictedKeywords.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.deprecatedMember.color=229,213,182 +/instance/org.eclipse.jdt.ui/semanticHighlighting.deprecatedMember.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.deprecatedMember.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.deprecatedMember.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.deprecatedMember.strikethrough=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.deprecatedMember.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.autoboxing.color=229,213,182 +/instance/org.eclipse.jdt.ui/semanticHighlighting.autoboxing.enabled=false +/instance/org.eclipse.jdt.ui/matchingBracketsColor=233,181,106 +/instance/org.eclipse.jdt.ui/sourceHoverBackgroundColor=26,21,18 +/instance/org.eclipse.jdt.ui/sourceHoverBackgroundColor.SystemDefault=false +/instance/org.eclipse.jdt.ui/content_assist_proposals_background=26,21,18 +/instance/org.eclipse.jdt.ui/content_assist_proposals_foreground=229,213,182 +/instance/org.eclipse.jdt.ui/content_assist_parameters_background=26,21,18 +/instance/org.eclipse.jdt.ui/content_assist_parameters_foreground=229,213,182 +/instance/org.eclipse.jdt.ui/content_assist_completion_replacement_background=63,51,40 +/instance/org.eclipse.jdt.ui/content_assist_completion_replacement_foreground=229,213,182 +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.Background=33,27,23 +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.Background.SystemDefault=false +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.Foreground=229,213,182 +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.Foreground.SystemDefault=false +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionBackground=122,186,211 +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionBackground.SystemDefault=false +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground=33,27,23 +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground.SystemDefault=false +/instance/org.eclipse.ui.editors/currentLineColor=54,50,45 +/instance/org.eclipse.ui.editors/lineNumberColor=187,175,160 +/instance/org.eclipse.ui.editors/printMarginColor=125,115,104 +/instance/org.eclipse.ui.editors/hyperlinkColor=233,181,106 +/instance/org.eclipse.ui.editors/hyperlinkColor.SystemDefault=false +/instance/org.eclipse.ui.editors/org.eclipse.ui.editors.stickyLinesSeparatorColor=152,140,126 +/instance/org.eclipse.ui.editors/occurrenceIndicationColor=245,233,163 +/instance/org.eclipse.ui.editors/occurrenceIndication=true +/instance/org.eclipse.ui.editors/occurrenceHighlighting=false +/instance/org.eclipse.ui.editors/occurrenceTextStyle=BOX +/instance/org.eclipse.ui.editors/writeOccurrenceIndicationColor=245,233,163 +/instance/org.eclipse.ui.editors/writeOccurrenceIndication=true +/instance/org.eclipse.ui.editors/writeOccurrenceHighlighting=false +/instance/org.eclipse.ui.editors/writeOccurrenceTextStyle=BOX +/instance/org.eclipse.ui.editors/searchResultIndicationColor=245,233,163 +/instance/org.eclipse.ui.editors/searchResultIndication=true +/instance/org.eclipse.ui.editors/searchResultHighlighting=false +/instance/org.eclipse.ui.editors/searchResultTextStyle=BOX +/instance/org.eclipse.ui.editors/errorIndicationColor=252,168,161 +/instance/org.eclipse.ui.editors/warningIndicationColor=250,201,124 +/instance/org.eclipse.ui.editors/infoIndicationColor=170,211,241 +/instance/org.eclipse.ui.editors/spellingIndicationColor=170,211,241 +/instance/org.eclipse.ui.editors/changeIndicationColor=182,219,252 +/instance/org.eclipse.ui.editors/additionIndicationColor=148,190,125 +/instance/org.eclipse.ui.editors/deletionIndicationColor=255,177,170 +/instance/org.eclipse.ui.editors/linked.slave.color=63,51,40 +/instance/org.eclipse.ui.editors/jdt.linked.slave.color=63,51,40 +/instance/org.eclipse.ui.workbench/org.eclipse.ui.editors.inlineAnnotationColor=202,188,169 +/instance/org.eclipse.terminal.control/BLACK=173,163,152 +/instance/org.eclipse.terminal.control/RED=252,154,141 +/instance/org.eclipse.terminal.control/GREEN=162,190,111 +/instance/org.eclipse.terminal.control/YELLOW=228,179,91 +/instance/org.eclipse.terminal.control/BLUE=136,185,227 +/instance/org.eclipse.terminal.control/MAGENTA=223,161,202 +/instance/org.eclipse.terminal.control/CYAN=115,194,184 +/instance/org.eclipse.terminal.control/WHITE=203,193,177 +/instance/org.eclipse.terminal.control/BRIGHT_BLACK=185,177,169 +/instance/org.eclipse.terminal.control/BRIGHT_RED=254,228,224 +/instance/org.eclipse.terminal.control/BRIGHT_GREEN=217,242,176 +/instance/org.eclipse.terminal.control/BRIGHT_YELLOW=255,233,182 +/instance/org.eclipse.terminal.control/BRIGHT_BLUE=215,236,255 +/instance/org.eclipse.terminal.control/BRIGHT_MAGENTA=255,225,244 +/instance/org.eclipse.terminal.control/BRIGHT_CYAN=177,247,237 +/instance/org.eclipse.terminal.control/BRIGHT_WHITE=251,241,220 +/instance/org.eclipse.terminal.control/FOREGROUND=229,213,182 +/instance/org.eclipse.terminal.control/BACKGROUND=33,27,23 +/instance/org.eclipse.terminal.control/SELECTION_FOREGROUND=33,27,23 +/instance/org.eclipse.terminal.control/SELECTION_BACKGROUND=122,186,211 diff --git a/editors/eclipse/theme/Zacess Warm Light.epf b/editors/eclipse/theme/Zacess Warm Light.epf new file mode 100644 index 0000000..31c30d3 --- /dev/null +++ b/editors/eclipse/theme/Zacess Warm Light.epf @@ -0,0 +1,304 @@ +# Zacess Warm Light for Eclipse, generated by scripts/build.mjs from palette/zacess.json, do not edit by hand +# editor and Terminal view colours; import with File > Import > General > Preferences, then restart Eclipse +file_export_version=3.0 +/instance/org.eclipse.jdt.ui/java_default=52,36,16 +/instance/org.eclipse.jdt.ui/java_default_bold=false +/instance/org.eclipse.jdt.ui/java_default_italic=false +/instance/org.eclipse.jdt.ui/java_default_underline=false +/instance/org.eclipse.jdt.ui/java_default_strikethrough=false +/instance/org.eclipse.jdt.ui/java_keyword=131,42,1 +/instance/org.eclipse.jdt.ui/java_keyword_bold=true +/instance/org.eclipse.jdt.ui/java_keyword_italic=false +/instance/org.eclipse.jdt.ui/java_keyword_underline=false +/instance/org.eclipse.jdt.ui/java_keyword_strikethrough=false +/instance/org.eclipse.jdt.ui/java_keyword_return=118,2,68 +/instance/org.eclipse.jdt.ui/java_keyword_return_bold=true +/instance/org.eclipse.jdt.ui/java_keyword_return_italic=false +/instance/org.eclipse.jdt.ui/java_keyword_return_underline=false +/instance/org.eclipse.jdt.ui/java_keyword_return_strikethrough=false +/instance/org.eclipse.jdt.ui/java_operator=52,36,16 +/instance/org.eclipse.jdt.ui/java_operator_bold=false +/instance/org.eclipse.jdt.ui/java_operator_italic=false +/instance/org.eclipse.jdt.ui/java_operator_underline=false +/instance/org.eclipse.jdt.ui/java_operator_strikethrough=false +/instance/org.eclipse.jdt.ui/java_bracket=52,36,16 +/instance/org.eclipse.jdt.ui/java_bracket_bold=false +/instance/org.eclipse.jdt.ui/java_bracket_italic=false +/instance/org.eclipse.jdt.ui/java_bracket_underline=false +/instance/org.eclipse.jdt.ui/java_bracket_strikethrough=false +/instance/org.eclipse.jdt.ui/java_string=4,82,58 +/instance/org.eclipse.jdt.ui/java_string_bold=false +/instance/org.eclipse.jdt.ui/java_string_italic=false +/instance/org.eclipse.jdt.ui/java_string_underline=false +/instance/org.eclipse.jdt.ui/java_string_strikethrough=false +/instance/org.eclipse.jdt.ui/java_single_line_comment=98,82,64 +/instance/org.eclipse.jdt.ui/java_single_line_comment_bold=false +/instance/org.eclipse.jdt.ui/java_single_line_comment_italic=true +/instance/org.eclipse.jdt.ui/java_single_line_comment_underline=false +/instance/org.eclipse.jdt.ui/java_single_line_comment_strikethrough=false +/instance/org.eclipse.jdt.ui/java_multi_line_comment=98,82,64 +/instance/org.eclipse.jdt.ui/java_multi_line_comment_bold=false +/instance/org.eclipse.jdt.ui/java_multi_line_comment_italic=true +/instance/org.eclipse.jdt.ui/java_multi_line_comment_underline=false +/instance/org.eclipse.jdt.ui/java_multi_line_comment_strikethrough=false +/instance/org.eclipse.jdt.ui/java_doc_default=98,82,64 +/instance/org.eclipse.jdt.ui/java_doc_default_bold=false +/instance/org.eclipse.jdt.ui/java_doc_default_italic=true +/instance/org.eclipse.jdt.ui/java_doc_default_underline=false +/instance/org.eclipse.jdt.ui/java_doc_default_strikethrough=false +/instance/org.eclipse.jdt.ui/java_doc_tag=98,82,64 +/instance/org.eclipse.jdt.ui/java_doc_tag_bold=false +/instance/org.eclipse.jdt.ui/java_doc_tag_italic=true +/instance/org.eclipse.jdt.ui/java_doc_tag_underline=false +/instance/org.eclipse.jdt.ui/java_doc_tag_strikethrough=false +/instance/org.eclipse.jdt.ui/java_doc_keyword=98,82,64 +/instance/org.eclipse.jdt.ui/java_doc_keyword_bold=true +/instance/org.eclipse.jdt.ui/java_doc_keyword_italic=true +/instance/org.eclipse.jdt.ui/java_doc_keyword_underline=false +/instance/org.eclipse.jdt.ui/java_doc_keyword_strikethrough=false +/instance/org.eclipse.jdt.ui/java_comment_task_tag=118,2,68 +/instance/org.eclipse.jdt.ui/java_comment_task_tag_bold=true +/instance/org.eclipse.jdt.ui/java_comment_task_tag_italic=true +/instance/org.eclipse.jdt.ui/java_comment_task_tag_underline=false +/instance/org.eclipse.jdt.ui/java_comment_task_tag_strikethrough=false +/instance/org.eclipse.jdt.ui/java_doc_link=116,79,1 +/instance/org.eclipse.jdt.ui/java_doc_link_bold=false +/instance/org.eclipse.jdt.ui/java_doc_link_italic=false +/instance/org.eclipse.jdt.ui/java_doc_link_underline=true +/instance/org.eclipse.jdt.ui/java_doc_link_strikethrough=false +/instance/org.eclipse.jdt.ui/pf_coloring_key=2,49,141 +/instance/org.eclipse.jdt.ui/pf_coloring_key_bold=false +/instance/org.eclipse.jdt.ui/pf_coloring_key_italic=false +/instance/org.eclipse.jdt.ui/pf_coloring_key_underline=false +/instance/org.eclipse.jdt.ui/pf_coloring_key_strikethrough=false +/instance/org.eclipse.jdt.ui/pf_coloring_value=4,82,58 +/instance/org.eclipse.jdt.ui/pf_coloring_value_bold=false +/instance/org.eclipse.jdt.ui/pf_coloring_value_italic=false +/instance/org.eclipse.jdt.ui/pf_coloring_value_underline=false +/instance/org.eclipse.jdt.ui/pf_coloring_value_strikethrough=false +/instance/org.eclipse.jdt.ui/pf_coloring_assignment=52,36,16 +/instance/org.eclipse.jdt.ui/pf_coloring_assignment_bold=false +/instance/org.eclipse.jdt.ui/pf_coloring_assignment_italic=false +/instance/org.eclipse.jdt.ui/pf_coloring_assignment_underline=false +/instance/org.eclipse.jdt.ui/pf_coloring_assignment_strikethrough=false +/instance/org.eclipse.jdt.ui/pf_coloring_argument=114,57,2 +/instance/org.eclipse.jdt.ui/pf_coloring_argument_bold=false +/instance/org.eclipse.jdt.ui/pf_coloring_argument_italic=true +/instance/org.eclipse.jdt.ui/pf_coloring_argument_underline=false +/instance/org.eclipse.jdt.ui/pf_coloring_argument_strikethrough=false +/instance/org.eclipse.jdt.ui/pf_coloring_comment=98,82,64 +/instance/org.eclipse.jdt.ui/pf_coloring_comment_bold=false +/instance/org.eclipse.jdt.ui/pf_coloring_comment_italic=true +/instance/org.eclipse.jdt.ui/pf_coloring_comment_underline=false +/instance/org.eclipse.jdt.ui/pf_coloring_comment_strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticFinalField.color=150,43,112 +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticFinalField.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticFinalField.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticFinalField.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticFinalField.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticFinalField.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticField.color=2,49,141 +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticField.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticField.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticField.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticField.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticField.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.field.color=2,49,141 +/instance/org.eclipse.jdt.ui/semanticHighlighting.field.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.field.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.field.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.field.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.field.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.inheritedField.color=2,49,141 +/instance/org.eclipse.jdt.ui/semanticHighlighting.inheritedField.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.inheritedField.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.inheritedField.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.inheritedField.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.inheritedField.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.annotationElementReference.color=2,49,141 +/instance/org.eclipse.jdt.ui/semanticHighlighting.annotationElementReference.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.annotationElementReference.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.annotationElementReference.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.annotationElementReference.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.annotationElementReference.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.methodDeclarationName.color=116,79,1 +/instance/org.eclipse.jdt.ui/semanticHighlighting.methodDeclarationName.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.methodDeclarationName.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.methodDeclarationName.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.methodDeclarationName.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.methodDeclarationName.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.method.color=116,79,1 +/instance/org.eclipse.jdt.ui/semanticHighlighting.method.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.method.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.method.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.method.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.method.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticMethodInvocation.color=116,79,1 +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticMethodInvocation.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticMethodInvocation.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticMethodInvocation.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticMethodInvocation.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.staticMethodInvocation.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.inheritedMethodInvocation.color=116,79,1 +/instance/org.eclipse.jdt.ui/semanticHighlighting.inheritedMethodInvocation.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.inheritedMethodInvocation.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.inheritedMethodInvocation.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.inheritedMethodInvocation.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.inheritedMethodInvocation.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.abstractMethodInvocation.color=116,79,1 +/instance/org.eclipse.jdt.ui/semanticHighlighting.abstractMethodInvocation.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.abstractMethodInvocation.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.abstractMethodInvocation.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.abstractMethodInvocation.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.abstractMethodInvocation.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.annotation.color=116,79,1 +/instance/org.eclipse.jdt.ui/semanticHighlighting.annotation.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.annotation.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.annotation.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.annotation.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.annotation.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.localVariableDeclaration.color=52,36,16 +/instance/org.eclipse.jdt.ui/semanticHighlighting.localVariableDeclaration.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.localVariableDeclaration.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.localVariableDeclaration.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.localVariableDeclaration.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.localVariableDeclaration.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.localVariable.color=52,36,16 +/instance/org.eclipse.jdt.ui/semanticHighlighting.localVariable.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.localVariable.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.localVariable.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.localVariable.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.localVariable.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.parameterVariable.color=114,57,2 +/instance/org.eclipse.jdt.ui/semanticHighlighting.parameterVariable.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.parameterVariable.italic=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.parameterVariable.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.parameterVariable.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.parameterVariable.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.class.color=4,82,71 +/instance/org.eclipse.jdt.ui/semanticHighlighting.class.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.class.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.class.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.class.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.class.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.abstractClass.color=4,82,71 +/instance/org.eclipse.jdt.ui/semanticHighlighting.abstractClass.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.abstractClass.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.abstractClass.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.abstractClass.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.abstractClass.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.interface.color=4,82,71 +/instance/org.eclipse.jdt.ui/semanticHighlighting.interface.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.interface.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.interface.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.interface.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.interface.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.enum.color=4,82,71 +/instance/org.eclipse.jdt.ui/semanticHighlighting.enum.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.enum.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.enum.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.enum.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.enum.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.record.color=4,82,71 +/instance/org.eclipse.jdt.ui/semanticHighlighting.record.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.record.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.record.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.record.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.record.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.typeParameter.color=4,82,71 +/instance/org.eclipse.jdt.ui/semanticHighlighting.typeParameter.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.typeParameter.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.typeParameter.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.typeParameter.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.typeParameter.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.typeArgument.color=4,82,71 +/instance/org.eclipse.jdt.ui/semanticHighlighting.typeArgument.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.typeArgument.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.typeArgument.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.typeArgument.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.typeArgument.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.number.color=150,43,112 +/instance/org.eclipse.jdt.ui/semanticHighlighting.number.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.number.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.number.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.number.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.number.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.restrictedKeywords.color=131,42,1 +/instance/org.eclipse.jdt.ui/semanticHighlighting.restrictedKeywords.bold=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.restrictedKeywords.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.restrictedKeywords.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.restrictedKeywords.strikethrough=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.restrictedKeywords.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.deprecatedMember.color=52,36,16 +/instance/org.eclipse.jdt.ui/semanticHighlighting.deprecatedMember.bold=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.deprecatedMember.italic=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.deprecatedMember.underline=false +/instance/org.eclipse.jdt.ui/semanticHighlighting.deprecatedMember.strikethrough=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.deprecatedMember.enabled=true +/instance/org.eclipse.jdt.ui/semanticHighlighting.autoboxing.color=52,36,16 +/instance/org.eclipse.jdt.ui/semanticHighlighting.autoboxing.enabled=false +/instance/org.eclipse.jdt.ui/matchingBracketsColor=109,59,2 +/instance/org.eclipse.jdt.ui/sourceHoverBackgroundColor=236,225,202 +/instance/org.eclipse.jdt.ui/sourceHoverBackgroundColor.SystemDefault=false +/instance/org.eclipse.jdt.ui/content_assist_proposals_background=236,225,202 +/instance/org.eclipse.jdt.ui/content_assist_proposals_foreground=52,36,16 +/instance/org.eclipse.jdt.ui/content_assist_parameters_background=236,225,202 +/instance/org.eclipse.jdt.ui/content_assist_parameters_foreground=52,36,16 +/instance/org.eclipse.jdt.ui/content_assist_completion_replacement_background=231,214,179 +/instance/org.eclipse.jdt.ui/content_assist_completion_replacement_foreground=52,36,16 +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.Background=244,234,213 +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.Background.SystemDefault=false +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.Foreground=52,36,16 +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.Foreground.SystemDefault=false +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionBackground=33,87,121 +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionBackground.SystemDefault=false +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground=244,234,213 +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground.SystemDefault=false +/instance/org.eclipse.ui.editors/currentLineColor=208,206,192 +/instance/org.eclipse.ui.editors/lineNumberColor=81,70,57 +/instance/org.eclipse.ui.editors/printMarginColor=138,126,113 +/instance/org.eclipse.ui.editors/hyperlinkColor=109,59,2 +/instance/org.eclipse.ui.editors/hyperlinkColor.SystemDefault=false +/instance/org.eclipse.ui.editors/org.eclipse.ui.editors.stickyLinesSeparatorColor=126,111,95 +/instance/org.eclipse.ui.editors/occurrenceIndicationColor=44,21,1 +/instance/org.eclipse.ui.editors/occurrenceIndication=true +/instance/org.eclipse.ui.editors/occurrenceHighlighting=false +/instance/org.eclipse.ui.editors/occurrenceTextStyle=BOX +/instance/org.eclipse.ui.editors/writeOccurrenceIndicationColor=44,21,1 +/instance/org.eclipse.ui.editors/writeOccurrenceIndication=true +/instance/org.eclipse.ui.editors/writeOccurrenceHighlighting=false +/instance/org.eclipse.ui.editors/writeOccurrenceTextStyle=BOX +/instance/org.eclipse.ui.editors/searchResultIndicationColor=44,21,1 +/instance/org.eclipse.ui.editors/searchResultIndication=true +/instance/org.eclipse.ui.editors/searchResultHighlighting=false +/instance/org.eclipse.ui.editors/searchResultTextStyle=BOX +/instance/org.eclipse.ui.editors/errorIndicationColor=113,2,5 +/instance/org.eclipse.ui.editors/warningIndicationColor=98,61,2 +/instance/org.eclipse.ui.editors/infoIndicationColor=1,56,92 +/instance/org.eclipse.ui.editors/spellingIndicationColor=1,56,92 +/instance/org.eclipse.ui.editors/changeIndicationColor=4,72,141 +/instance/org.eclipse.ui.editors/additionIndicationColor=8,101,27 +/instance/org.eclipse.ui.editors/deletionIndicationColor=121,4,17 +/instance/org.eclipse.ui.editors/linked.slave.color=231,214,179 +/instance/org.eclipse.ui.editors/jdt.linked.slave.color=231,214,179 +/instance/org.eclipse.ui.workbench/org.eclipse.ui.editors.inlineAnnotationColor=72,59,44 +/instance/org.eclipse.terminal.control/BLACK=52,36,16 +/instance/org.eclipse.terminal.control/RED=140,26,22 +/instance/org.eclipse.terminal.control/GREEN=39,82,0 +/instance/org.eclipse.terminal.control/YELLOW=106,70,3 +/instance/org.eclipse.terminal.control/BLUE=1,75,121 +/instance/org.eclipse.terminal.control/MAGENTA=116,44,96 +/instance/org.eclipse.terminal.control/CYAN=5,81,77 +/instance/org.eclipse.terminal.control/WHITE=87,78,68 +/instance/org.eclipse.terminal.control/BRIGHT_BLACK=96,87,76 +/instance/org.eclipse.terminal.control/BRIGHT_RED=164,51,43 +/instance/org.eclipse.terminal.control/BRIGHT_GREEN=56,102,22 +/instance/org.eclipse.terminal.control/BRIGHT_YELLOW=132,87,1 +/instance/org.eclipse.terminal.control/BRIGHT_BLUE=17,95,147 +/instance/org.eclipse.terminal.control/BRIGHT_MAGENTA=138,64,116 +/instance/org.eclipse.terminal.control/BRIGHT_CYAN=6,102,98 +/instance/org.eclipse.terminal.control/BRIGHT_WHITE=52,36,16 +/instance/org.eclipse.terminal.control/FOREGROUND=52,36,16 +/instance/org.eclipse.terminal.control/BACKGROUND=244,234,213 +/instance/org.eclipse.terminal.control/SELECTION_FOREGROUND=244,234,213 +/instance/org.eclipse.terminal.control/SELECTION_BACKGROUND=33,87,121 diff --git a/editors/eclipse/theme/Zacess Yellow on Black.epf b/editors/eclipse/theme/Zacess Yellow on Black.epf index ac900be..b1fdec4 100644 --- a/editors/eclipse/theme/Zacess Yellow on Black.epf +++ b/editors/eclipse/theme/Zacess Yellow on Black.epf @@ -254,7 +254,7 @@ file_export_version=3.0 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionBackground.SystemDefault=false /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground=0,0,0 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground.SystemDefault=false -/instance/org.eclipse.ui.editors/currentLineColor=20,20,20 +/instance/org.eclipse.ui.editors/currentLineColor=38,38,38 /instance/org.eclipse.ui.editors/lineNumberColor=217,217,217 /instance/org.eclipse.ui.editors/printMarginColor=140,140,140 /instance/org.eclipse.ui.editors/hyperlinkColor=27,228,237 @@ -298,7 +298,7 @@ file_export_version=3.0 /instance/org.eclipse.terminal.control/BRIGHT_MAGENTA=255,208,250 /instance/org.eclipse.terminal.control/BRIGHT_CYAN=0,247,245 /instance/org.eclipse.terminal.control/BRIGHT_WHITE=255,255,255 -/instance/org.eclipse.terminal.control/FOREGROUND=255,255,255 +/instance/org.eclipse.terminal.control/FOREGROUND=255,235,59 /instance/org.eclipse.terminal.control/BACKGROUND=0,0,0 /instance/org.eclipse.terminal.control/SELECTION_FOREGROUND=0,0,0 /instance/org.eclipse.terminal.control/SELECTION_BACKGROUND=9,188,196 diff --git a/editors/jetbrains/ACCESSIBILITY.md b/editors/jetbrains/ACCESSIBILITY.md index 3f86290..349accb 100644 --- a/editors/jetbrains/ACCESSIBILITY.md +++ b/editors/jetbrains/ACCESSIBILITY.md @@ -15,7 +15,7 @@ The keymap is built so one set of muscle memory covers JetBrains IDEs and VS Cod ## Vision -- The IDE theme and editor colour scheme are Zacess Deep Contrast Dark from the Zacess Themes plugin, which the apply scripts install into every IDE and set with `--theme` (`-Theme` on Windows): white on pure black with deep, fully saturated colours and yellow and cyan outlines. It stays fixed whatever the system appearance; **Sync with OS** switches to Zacess Deep Contrast Light in light mode. All eight Zacess themes come with the plugin. +- The IDE theme and editor colour scheme are Zacess Deep Contrast Dark from the Zacess Themes plugin, which the apply scripts install into every IDE and set with `--theme` (`-Theme` on Windows): white on pure black with deep, fully saturated colours and yellow and cyan outlines. It stays fixed whatever the system appearance; **Sync with OS** switches to Zacess Deep Contrast Light in light mode. All ten Zacess themes come with the plugin. - The console and terminal take their colours from the theme. The earlier High Contrast schemes in `colors/` stay available. - The editor and the built-in terminal use GeistMono Nerd Font, the font every editor and terminal here uses, set by the two font files the apply scripts copy in. The size stays each IDE's own. A screen reader option sits under Settings > Appearance & Behavior > Appearance. diff --git a/editors/jetbrains/README.md b/editors/jetbrains/README.md index f146751..64a905a 100644 --- a/editors/jetbrains/README.md +++ b/editors/jetbrains/README.md @@ -30,7 +30,7 @@ the same setup instead of drifting on its own defaults. ## In action -IntelliJ IDEA and PyCharm in each of the eight Zacess themes, each IDE with one file open throughout. +IntelliJ IDEA and PyCharm in each of the ten Zacess themes, each IDE with one file open throughout. ### IntelliJ IDEA diff --git a/editors/jetbrains/guides/plugins.md b/editors/jetbrains/guides/plugins.md index 0681b77..4ae4da5 100644 --- a/editors/jetbrains/guides/plugins.md +++ b/editors/jetbrains/guides/plugins.md @@ -41,7 +41,7 @@ PyCharm, WS for WebStorm, CL for CLion and DS for DataSpell. | --- | --- | --- | | `com.intellij.plugins.vscodekeymap` | Supplies the `VSCode OSX` and `VSCode` base keymaps that [`keymaps/`](../keymaps/) builds on | all | | `com.markskelton.one-dark-theme` | The One Dark colour theme | IU, CL, DS | -| `com.zacess.themes` | The eight Zacess themes, each with its own editor scheme; Zacess Deep Contrast Dark is the one in use | all | +| `com.zacess.themes` | The ten Zacess themes, each with its own editor scheme; Zacess Deep Contrast Dark is the one in use | all | | `org.editorconfig.editorconfigjetbrains` | Honours a project's `.editorconfig` file | CL, DS | | `com.jetbrains.performancePlugin` | JetBrains's internal performance testing and profiling tooling | PC, CL | diff --git a/editors/jetbrains/guides/setup.md b/editors/jetbrains/guides/setup.md index 6d7a04a..0bc733e 100644 --- a/editors/jetbrains/guides/setup.md +++ b/editors/jetbrains/guides/setup.md @@ -47,7 +47,7 @@ Use each IDE's own Settings UI: ## 5. Use the Zacess Deep Contrast theme The Zacess Themes plugin ([JetBrains Marketplace](https://plugins.jetbrains.com/plugin/35082-zacess-themes), -`com.zacess.themes`, in every list in `plugins/`) adds the eight Zacess themes, each with its own +`com.zacess.themes`, in every list in `plugins/`) adds the ten Zacess themes, each with its own editor colour scheme, the IDE's terminal colours included. 1. Settings > Plugins > Marketplace: install **Zacess Themes**. diff --git a/editors/jetbrains/linux/apply.sh b/editors/jetbrains/linux/apply.sh index 4d24179..86f6f92 100755 --- a/editors/jetbrains/linux/apply.sh +++ b/editors/jetbrains/linux/apply.sh @@ -5,8 +5,9 @@ # (the root defaults to ~/Library/Application Support/JetBrains on the Mac and ~/.config/JetBrains # on Linux or $XDG_CONFIG_HOME/JetBrains when that is set) # -# --theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# --theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # the work is done by ../shared/apply.py with the system python3: the theme plugin through each diff --git a/editors/jetbrains/mac/apply.sh b/editors/jetbrains/mac/apply.sh index 4d24179..86f6f92 100755 --- a/editors/jetbrains/mac/apply.sh +++ b/editors/jetbrains/mac/apply.sh @@ -5,8 +5,9 @@ # (the root defaults to ~/Library/Application Support/JetBrains on the Mac and ~/.config/JetBrains # on Linux or $XDG_CONFIG_HOME/JetBrains when that is set) # -# --theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# --theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # the work is done by ../shared/apply.py with the system python3: the theme plugin through each diff --git a/editors/jetbrains/shared/apply.py b/editors/jetbrains/shared/apply.py index 8dca7a2..5aec3f2 100644 --- a/editors/jetbrains/shared/apply.py +++ b/editors/jetbrains/shared/apply.py @@ -67,7 +67,7 @@ theme = zt.find_theme(options.get("--theme", "deep-dark")) if theme is None: sys.exit(f"Unknown theme: {options['--theme']}\n" - "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow.") + "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light.") dark = theme if theme.dark else zt.find_theme(zt.DEFAULT_DARK) light = theme if not theme.dark else zt.find_theme(zt.DEFAULT_LIGHT) diff --git a/editors/jetbrains/shared/theme-package.json b/editors/jetbrains/shared/theme-package.json index 338f6d2..97cecd9 100644 --- a/editors/jetbrains/shared/theme-package.json +++ b/editors/jetbrains/shared/theme-package.json @@ -1,9 +1,9 @@ { "name": "zacess-themes", "id": "com.zacess.themes", - "version": "0.12.0", + "version": "1.0.0", "marketplace": "https://plugins.jetbrains.com/plugin/35082-zacess-themes", - "url": "https://github.com/zacesshq/themes/releases/download/v0.12.0/zacess-themes-0.12.0.zip", - "sha256": "03f1d477f8a6062fdf5e623ae3175da2903936cf16b16f74e9b61f4513b2ee87", + "url": "https://github.com/zacesshq/themes/releases/download/v1.0.0/zacess-themes-1.0.0.zip", + "sha256": "19a3b1c273b5ffb40caffa068676cbad1b56c197c15e7ba497faddde0f09ea35", "folder": "zacess-themes" } diff --git a/editors/jetbrains/windows/apply.ps1 b/editors/jetbrains/windows/apply.ps1 index 73c26b4..0717689 100644 --- a/editors/jetbrains/windows/apply.ps1 +++ b/editors/jetbrains/windows/apply.ps1 @@ -4,8 +4,9 @@ # (the root defaults to %APPDATA%\JetBrains; the IDEs themselves are looked for under # %LOCALAPPDATA%\Programs, where Toolbox and the standalone installers put them) # -# -Theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# -Theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # for every IDE that has been started once: a theme plugin older than the pin is replaced by the @@ -44,12 +45,14 @@ $themes = @( @{ Id = 'light'; Short = 'light'; Name = 'Zacess Light'; Dark = $false } @{ Id = 'cream'; Short = 'cream'; Name = 'Zacess Cream'; Dark = $false } @{ Id = 'yellow-on-black'; Short = 'yellow'; Name = 'Zacess Yellow on Black'; Dark = $true } + @{ Id = 'warm-dark'; Short = 'warm-dark'; Name = 'Zacess Warm Dark'; Dark = $true } + @{ Id = 'warm-light'; Short = 'warm-light'; Name = 'Zacess Warm Light'; Dark = $false } ) $key = ($Theme.Trim().ToLowerInvariant() -replace ' ', '-') -replace '^zacess-', '' $wanted = $themes | Where-Object { $_.Id -eq $key -or $_.Short -eq $key } | Select-Object -First 1 if (-not $wanted) { [Console]::Error.WriteLine("Unknown theme: $Theme") - [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow.') + [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light.') exit 1 } diff --git a/editors/kicad/ACCESSIBILITY.md b/editors/kicad/ACCESSIBILITY.md index a729de0..bf789fb 100644 --- a/editors/kicad/ACCESSIBILITY.md +++ b/editors/kicad/ACCESSIBILITY.md @@ -4,7 +4,7 @@ High contrast canvases and layer colours that stay apart, so schematics and boar ## Vision -- Every editor uses Zacess Deep Contrast Dark from [Zacess Themes](https://github.com/zacesshq/themes) 0.5.0: a black canvas with white board edges and deep, fully saturated layer and net colours. All eight Zacess themes install together and any of them can be picked with `--theme` or under **Preferences > Colors**. +- Every editor uses Zacess Deep Contrast Dark from [Zacess Themes](https://github.com/zacesshq/themes) 1.0.0: a black canvas with white board edges and deep, fully saturated layer and net colours. All ten Zacess themes install together and any of them can be picked with `--theme` or under **Preferences > Colors**. - Schematic text (references, values, pin names and numbers, labels and notes) is at least 7:1 on the canvas and on a symbol's fill in the Deep Contrast and High Contrast themes and at least 4.5:1 in the others. Wires, buses, pins, the grid and every board and Gerber layer are at least 3:1. - Top copper stays red and bottom copper blue, as in KiCad's own themes, so boards look familiar and other people's screenshots still make sense. - Colour is never the only signal: KiCad names every layer in the Appearance panel and can show one layer at a time. Net names are drawn on tracks and pads. diff --git a/editors/kicad/README.md b/editors/kicad/README.md index 36c848a..4fc58a8 100644 --- a/editors/kicad/README.md +++ b/editors/kicad/README.md @@ -1,15 +1,15 @@ # kicad -KiCad colour themes: the eight Zacess themes for the schematic, symbol, PCB, footprint, GerbView and 3D viewer canvases, built from the Zacess palette and switched with one script on every platform. +KiCad colour themes: the ten Zacess themes for the schematic, symbol, PCB, footprint, GerbView and 3D viewer canvases, built from the Zacess palette and switched with one script on every platform. -KiCad keeps each colour theme as a JSON file in the `colors` folder of its settings and names it by the file's stem. Each editor picks its theme separately, with `appearance.color_theme` in its own settings file (`eeschema.json`, `pcbnew.json`, `fpedit.json`, `symbol_editor.json`, `gerbview.json`, `3d_viewer.json` and the rest). The apply scripts install all eight themes and point every editor at one of them. +KiCad keeps each colour theme as a JSON file in the `colors` folder of its settings and names it by the file's stem. Each editor picks its theme separately, with `appearance.color_theme` in its own settings file (`eeschema.json`, `pcbnew.json`, `fpedit.json`, `symbol_editor.json`, `gerbview.json`, `3d_viewer.json` and the rest). The apply scripts install all ten themes and point every editor at one of them. ## What it sets | Setting | Value | Why | | --- | --- | --- | -| `/colors/zacess-*.json` | The eight Zacess themes | All eight show under **Preferences > Colors** in every editor | -| `appearance.color_theme` | `zacess-deep-contrast-dark` | The default theme in each editor. `--theme` (`-Theme` on Windows) picks any of the eight | +| `/colors/zacess-*.json` | The ten Zacess themes | All ten show under **Preferences > Colors** in every editor | +| `appearance.color_theme` | `zacess-deep-contrast-dark` | The default theme in each editor. `--theme` (`-Theme` on Windows) picks any of the ten | Nothing else in KiCad's settings changes. @@ -17,7 +17,7 @@ KiCad has no setting for the font of its menus, panels or canvas text: the inter ## The themes -[`scripts/build-themes.py`](scripts/build-themes.py) builds [`shared/colors/`](shared/colors/) from the palette of [Zacess Themes](https://github.com/zacesshq/themes) 0.5.0, downloaded and checked against its SHA-256 digest. Every colour key KiCad 10 reads is written, so a light theme never falls back to KiCad's dark defaults. +[`scripts/build-themes.py`](scripts/build-themes.py) builds [`shared/colors/`](shared/colors/) from the palette of [Zacess Themes](https://github.com/zacesshq/themes) 1.0.0, downloaded and checked against its SHA-256 digest. Every colour key KiCad 10 reads is written, so a light theme never falls back to KiCad's dark defaults. | Part | Colours | | --- | --- | @@ -60,7 +60,7 @@ The scripts print each theme file and settings file as `added`, `changed` or `un ## Check it worked 1. Start the Schematic Editor. The canvas is black with green notes, orange wires and a grey drawing sheet in Deep Contrast Dark. -2. **Preferences > Preferences > Schematic Editor > Colors** lists the eight Zacess themes, with Zacess Deep Contrast Dark selected. +2. **Preferences > Preferences > Schematic Editor > Colors** lists the ten Zacess themes, with Zacess Deep Contrast Dark selected. ## Validation diff --git a/editors/kicad/linux/apply.sh b/editors/kicad/linux/apply.sh index e18a1a9..ee57ad3 100755 --- a/editors/kicad/linux/apply.sh +++ b/editors/kicad/linux/apply.sh @@ -1,12 +1,13 @@ #!/usr/bin/env bash -# installs the eight Zacess colour themes for KiCad and makes one of them the theme of every editor. +# installs the ten Zacess colour themes for KiCad and makes one of them the theme of every editor. # usage: apply.sh [--theme ] [--config-dir ] # (the config folder defaults to the newest version folder KiCad has made: ~/Library/Preferences/kicad/ # on the Mac, ~/.config/kicad/ on Linux, then the Flathub copy; KICAD_CONFIG_HOME wins # when it is set, as it does for KiCad itself) # -# --theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# --theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # the theme files go into /colors, where KiCad lists them under Preferences > Colors. the @@ -43,13 +44,15 @@ theme_id() { light) echo "light" ;; cream) echo "cream" ;; yellow|yellow-on-black) echo "yellow-on-black" ;; + warm-dark) echo "warm-dark" ;; + warm-light) echo "warm-light" ;; *) return 1 ;; esac } if ! id="$(theme_id "$theme")"; then echo "Unknown theme: $theme" >&2 - echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow." >&2 + echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light." >&2 exit 1 fi diff --git a/editors/kicad/mac/apply.sh b/editors/kicad/mac/apply.sh index e18a1a9..ee57ad3 100755 --- a/editors/kicad/mac/apply.sh +++ b/editors/kicad/mac/apply.sh @@ -1,12 +1,13 @@ #!/usr/bin/env bash -# installs the eight Zacess colour themes for KiCad and makes one of them the theme of every editor. +# installs the ten Zacess colour themes for KiCad and makes one of them the theme of every editor. # usage: apply.sh [--theme ] [--config-dir ] # (the config folder defaults to the newest version folder KiCad has made: ~/Library/Preferences/kicad/ # on the Mac, ~/.config/kicad/ on Linux, then the Flathub copy; KICAD_CONFIG_HOME wins # when it is set, as it does for KiCad itself) # -# --theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# --theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # the theme files go into /colors, where KiCad lists them under Preferences > Colors. the @@ -43,13 +44,15 @@ theme_id() { light) echo "light" ;; cream) echo "cream" ;; yellow|yellow-on-black) echo "yellow-on-black" ;; + warm-dark) echo "warm-dark" ;; + warm-light) echo "warm-light" ;; *) return 1 ;; esac } if ! id="$(theme_id "$theme")"; then echo "Unknown theme: $theme" >&2 - echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow." >&2 + echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light." >&2 exit 1 fi diff --git a/editors/kicad/scripts/build-themes.py b/editors/kicad/scripts/build-themes.py index e96d544..2f5c789 100644 --- a/editors/kicad/scripts/build-themes.py +++ b/editors/kicad/scripts/build-themes.py @@ -1,4 +1,4 @@ -"""Builds the eight Zacess colour themes for KiCad in shared/colors from the Zacess palette. +"""Builds the ten Zacess colour themes for KiCad in shared/colors from the Zacess palette. usage: python3 scripts/build-themes.py [palette.json] @@ -19,12 +19,12 @@ import sys import urllib.request -PALETTE_URL = "https://raw.githubusercontent.com/zacesshq/themes/v0.5.0/palette/zacess.json" -PALETTE_SHA256 = "4fe26dbd819605ec5a17141eb5994ef5e0cb0eb7a2fc5fab93cdc82a21cf40cf" +PALETTE_URL = "https://raw.githubusercontent.com/zacesshq/themes/v1.0.0/palette/zacess.json" +PALETTE_SHA256 = "7fd99f1a321df8270c32fa1eac2a6d27dbf5fc3bdf923756a2a8bc52669607a6" # KiCad 10's colour settings schema version (colorsSchemaVersion in color_settings.cpp) SCHEMA_VERSION = 5 ORDER = ["deep-contrast-dark", "deep-contrast-light", "high-contrast-dark", "high-contrast-light", - "dark", "light", "cream", "yellow-on-black"] + "dark", "light", "cream", "yellow-on-black", "warm-dark", "warm-light"] RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN = 1, 2, 3, 4, 5, 6 # the hue each terminal colour slot stands for in degrees plus how far a palette colour may sit @@ -283,7 +283,7 @@ def main(): palette = load_palette(sys.argv) themes = {t["id"]: t for t in palette["themes"]} if sorted(themes) != sorted(ORDER): - sys.exit("the palette does not hold the eight expected Zacess themes") + sys.exit("the palette does not hold the ten expected Zacess themes") target = pathlib.Path(__file__).resolve().parent.parent / "shared" / "colors" target.mkdir(parents=True, exist_ok=True) for theme_id in ORDER: diff --git a/editors/kicad/scripts/validate.py b/editors/kicad/scripts/validate.py index 1092962..1d95f1d 100644 --- a/editors/kicad/scripts/validate.py +++ b/editors/kicad/scripts/validate.py @@ -1,6 +1,6 @@ """Checks the KiCad folder without KiCad: run from anywhere, exits non-zero on a problem. -- shared/colors holds the eight Zacess themes, each named after its file as KiCad expects +- shared/colors holds the ten Zacess themes, each named after its file as KiCad expects - every schematic, board and GerbView colour key KiCad 10 reads is present and is a CSS colour - schematic text is at least 7:1 on the canvas and on a symbol's body fill in the Deep Contrast and High Contrast themes and at least 4.5:1 in the others; lines, layers and the grid are at least @@ -21,7 +21,7 @@ problems = [] IDS = ["deep-contrast-dark", "deep-contrast-light", "high-contrast-dark", "high-contrast-light", - "dark", "light", "cream", "yellow-on-black"] + "dark", "light", "cream", "yellow-on-black", "warm-dark", "warm-light"] TEXT = ["fields", "hidden", "label_global", "label_hier", "label_local", "netclass_flag", "note", "private_note", "pin_name", "pin_number", "reference", "sheet_filename", "sheet_fields", "sheet_label", "sheet_name", "value", "op_voltages", "op_currents"] diff --git a/editors/kicad/shared/colors/zacess-cream.json b/editors/kicad/shared/colors/zacess-cream.json index 88b8a41..bf750d8 100644 --- a/editors/kicad/shared/colors/zacess-cream.json +++ b/editors/kicad/shared/colors/zacess-cream.json @@ -11,7 +11,7 @@ "background": "rgb(253, 246, 227)", "cursor": "rgb(0, 0, 0)", "drc_error": "rgba(119, 0, 4, 0.8)", - "drc_warning": "rgba(81, 49, 0, 0.8)", + "drc_warning": "rgba(128, 50, 0, 0.8)", "drc_exclusion": "rgba(63, 56, 44, 0.8)", "grid": "rgb(133, 123, 105)", "grid_axes": "rgb(110, 101, 85)", @@ -219,7 +219,7 @@ "dnp_marker": "rgba(119, 0, 4, 0.85)", "excluded_from_sim": "rgba(63, 56, 44, 0.95)", "erc_error": "rgba(119, 0, 4, 0.8)", - "erc_warning": "rgba(81, 49, 0, 0.8)", + "erc_warning": "rgba(128, 50, 0, 0.8)", "erc_exclusion": "rgba(63, 56, 44, 0.8)", "fields": "rgb(2, 0, 104)", "grid": "rgb(133, 123, 105)", diff --git a/editors/kicad/shared/colors/zacess-deep-contrast-light.json b/editors/kicad/shared/colors/zacess-deep-contrast-light.json index 0eedfc3..fa52789 100644 --- a/editors/kicad/shared/colors/zacess-deep-contrast-light.json +++ b/editors/kicad/shared/colors/zacess-deep-contrast-light.json @@ -11,11 +11,11 @@ "background": "rgb(255, 255, 255)", "cursor": "rgb(0, 0, 0)", "drc_error": "rgba(170, 0, 0, 0.8)", - "drc_warning": "rgba(103, 65, 0, 0.8)", + "drc_warning": "rgba(100, 38, 0, 0.8)", "drc_exclusion": "rgba(77, 77, 77, 0.8)", "grid": "rgb(110, 110, 110)", "grid_axes": "rgb(15, 74, 133)", - "pad_plated_hole": "rgb(103, 65, 0)", + "pad_plated_hole": "rgb(130, 65, 0)", "plated_hole": "rgb(0, 58, 57)", "ratsnest": "rgba(0, 0, 0, 0.6)", "via_hole": "rgb(130, 65, 0)", @@ -33,7 +33,7 @@ "in1": "rgb(0, 97, 8)", "in2": "rgb(0, 58, 57)", "in3": "rgb(149, 0, 148)", - "in4": "rgb(103, 65, 0)", + "in4": "rgb(130, 65, 0)", "in5": "rgb(135, 0, 0)", "in6": "rgb(0, 97, 8)", "in7": "rgb(13, 0, 255)", @@ -43,7 +43,7 @@ "in11": "rgb(0, 97, 8)", "in12": "rgb(0, 58, 57)", "in13": "rgb(149, 0, 148)", - "in14": "rgb(103, 65, 0)", + "in14": "rgb(130, 65, 0)", "in15": "rgb(135, 0, 0)", "in16": "rgb(0, 97, 8)", "in17": "rgb(13, 0, 255)", @@ -53,7 +53,7 @@ "in21": "rgb(0, 97, 8)", "in22": "rgb(0, 58, 57)", "in23": "rgb(149, 0, 148)", - "in24": "rgb(103, 65, 0)", + "in24": "rgb(130, 65, 0)", "in25": "rgb(135, 0, 0)", "in26": "rgb(0, 97, 8)", "in27": "rgb(13, 0, 255)", @@ -136,7 +136,7 @@ "layers": { "0": "rgb(115, 0, 0)", "1": "rgb(0, 97, 8)", - "2": "rgb(103, 65, 0)", + "2": "rgb(130, 65, 0)", "3": "rgb(0, 58, 57)", "4": "rgb(149, 0, 148)", "5": "rgb(0, 46, 194)", @@ -148,7 +148,7 @@ "11": "rgb(13, 0, 255)", "12": "rgb(115, 0, 0)", "13": "rgb(0, 97, 8)", - "14": "rgb(103, 65, 0)", + "14": "rgb(130, 65, 0)", "15": "rgb(0, 58, 57)", "16": "rgb(149, 0, 148)", "17": "rgb(0, 46, 194)", @@ -160,7 +160,7 @@ "23": "rgb(13, 0, 255)", "24": "rgb(115, 0, 0)", "25": "rgb(0, 97, 8)", - "26": "rgb(103, 65, 0)", + "26": "rgb(130, 65, 0)", "27": "rgb(0, 58, 57)", "28": "rgb(149, 0, 148)", "29": "rgb(0, 46, 194)", @@ -172,7 +172,7 @@ "35": "rgb(13, 0, 255)", "36": "rgb(115, 0, 0)", "37": "rgb(0, 97, 8)", - "38": "rgb(103, 65, 0)", + "38": "rgb(130, 65, 0)", "39": "rgb(0, 58, 57)", "40": "rgb(149, 0, 148)", "41": "rgb(0, 46, 194)", @@ -184,7 +184,7 @@ "47": "rgb(13, 0, 255)", "48": "rgb(115, 0, 0)", "49": "rgb(0, 97, 8)", - "50": "rgb(103, 65, 0)", + "50": "rgb(130, 65, 0)", "51": "rgb(0, 58, 57)", "52": "rgb(149, 0, 148)", "53": "rgb(0, 46, 194)", @@ -196,7 +196,7 @@ "59": "rgb(13, 0, 255)", "60": "rgb(115, 0, 0)", "61": "rgb(0, 97, 8)", - "62": "rgb(103, 65, 0)", + "62": "rgb(130, 65, 0)", "63": "rgb(0, 58, 57)" } }, @@ -219,7 +219,7 @@ "dnp_marker": "rgba(170, 0, 0, 0.85)", "excluded_from_sim": "rgba(77, 77, 77, 0.95)", "erc_error": "rgba(170, 0, 0, 0.8)", - "erc_warning": "rgba(103, 65, 0, 0.8)", + "erc_warning": "rgba(100, 38, 0, 0.8)", "erc_exclusion": "rgba(77, 77, 77, 0.8)", "fields": "rgb(46, 0, 120)", "grid": "rgb(110, 110, 110)", diff --git a/editors/kicad/shared/colors/zacess-high-contrast-light.json b/editors/kicad/shared/colors/zacess-high-contrast-light.json index 516ecbc..c51a7b0 100644 --- a/editors/kicad/shared/colors/zacess-high-contrast-light.json +++ b/editors/kicad/shared/colors/zacess-high-contrast-light.json @@ -11,14 +11,14 @@ "background": "rgb(255, 255, 255)", "cursor": "rgb(0, 0, 0)", "drc_error": "rgba(139, 0, 0, 0.8)", - "drc_warning": "rgba(90, 58, 0, 0.8)", + "drc_warning": "rgba(78, 28, 0, 0.8)", "drc_exclusion": "rgba(46, 46, 46, 0.8)", "grid": "rgb(110, 110, 110)", "grid_axes": "rgb(38, 38, 38)", "pad_plated_hole": "rgb(79, 50, 0)", "plated_hole": "rgb(0, 79, 78)", "ratsnest": "rgba(0, 0, 0, 0.6)", - "via_hole": "rgb(90, 58, 0)", + "via_hole": "rgb(107, 49, 0)", "via_hole_walls": "rgb(0, 0, 0)", "worksheet": "rgb(46, 46, 46)", "page_limits": "rgb(38, 38, 38)", @@ -39,7 +39,7 @@ "in7": "rgb(0, 48, 122)", "in8": "rgb(0, 79, 78)", "in9": "rgb(114, 0, 48)", - "in10": "rgb(90, 58, 0)", + "in10": "rgb(107, 49, 0)", "in11": "rgb(0, 85, 24)", "in12": "rgb(0, 79, 78)", "in13": "rgb(75, 0, 145)", @@ -49,7 +49,7 @@ "in17": "rgb(0, 48, 122)", "in18": "rgb(0, 79, 78)", "in19": "rgb(114, 0, 48)", - "in20": "rgb(90, 58, 0)", + "in20": "rgb(107, 49, 0)", "in21": "rgb(0, 85, 24)", "in22": "rgb(0, 79, 78)", "in23": "rgb(75, 0, 145)", @@ -59,7 +59,7 @@ "in27": "rgb(0, 48, 122)", "in28": "rgb(0, 79, 78)", "in29": "rgb(114, 0, 48)", - "in30": "rgb(90, 58, 0)" + "in30": "rgb(107, 49, 0)" }, "b_adhes": "rgb(0, 48, 122)", "f_adhes": "rgb(114, 0, 48)", @@ -142,7 +142,7 @@ "5": "rgb(30, 0, 144)", "6": "rgb(96, 0, 0)", "7": "rgb(0, 85, 24)", - "8": "rgb(90, 58, 0)", + "8": "rgb(107, 49, 0)", "9": "rgb(0, 79, 78)", "10": "rgb(114, 0, 48)", "11": "rgb(0, 48, 122)", @@ -154,7 +154,7 @@ "17": "rgb(30, 0, 144)", "18": "rgb(96, 0, 0)", "19": "rgb(0, 85, 24)", - "20": "rgb(90, 58, 0)", + "20": "rgb(107, 49, 0)", "21": "rgb(0, 79, 78)", "22": "rgb(114, 0, 48)", "23": "rgb(0, 48, 122)", @@ -166,7 +166,7 @@ "29": "rgb(30, 0, 144)", "30": "rgb(96, 0, 0)", "31": "rgb(0, 85, 24)", - "32": "rgb(90, 58, 0)", + "32": "rgb(107, 49, 0)", "33": "rgb(0, 79, 78)", "34": "rgb(114, 0, 48)", "35": "rgb(0, 48, 122)", @@ -178,7 +178,7 @@ "41": "rgb(30, 0, 144)", "42": "rgb(96, 0, 0)", "43": "rgb(0, 85, 24)", - "44": "rgb(90, 58, 0)", + "44": "rgb(107, 49, 0)", "45": "rgb(0, 79, 78)", "46": "rgb(114, 0, 48)", "47": "rgb(0, 48, 122)", @@ -190,7 +190,7 @@ "53": "rgb(30, 0, 144)", "54": "rgb(96, 0, 0)", "55": "rgb(0, 85, 24)", - "56": "rgb(90, 58, 0)", + "56": "rgb(107, 49, 0)", "57": "rgb(0, 79, 78)", "58": "rgb(114, 0, 48)", "59": "rgb(0, 48, 122)", @@ -219,7 +219,7 @@ "dnp_marker": "rgba(139, 0, 0, 0.85)", "excluded_from_sim": "rgba(46, 46, 46, 0.95)", "erc_error": "rgba(139, 0, 0, 0.8)", - "erc_warning": "rgba(90, 58, 0, 0.8)", + "erc_warning": "rgba(78, 28, 0, 0.8)", "erc_exclusion": "rgba(46, 46, 46, 0.8)", "fields": "rgb(30, 0, 144)", "grid": "rgb(110, 110, 110)", diff --git a/editors/kicad/shared/colors/zacess-light.json b/editors/kicad/shared/colors/zacess-light.json index ee84cf9..7e9255e 100644 --- a/editors/kicad/shared/colors/zacess-light.json +++ b/editors/kicad/shared/colors/zacess-light.json @@ -11,7 +11,7 @@ "background": "rgb(255, 255, 255)", "cursor": "rgb(17, 17, 17)", "drc_error": "rgba(129, 0, 5, 0.8)", - "drc_warning": "rgba(88, 54, 0, 0.8)", + "drc_warning": "rgba(132, 56, 0, 0.8)", "drc_exclusion": "rgba(66, 66, 66, 0.8)", "grid": "rgb(138, 138, 138)", "grid_axes": "rgb(112, 112, 112)", @@ -219,7 +219,7 @@ "dnp_marker": "rgba(129, 0, 5, 0.85)", "excluded_from_sim": "rgba(66, 66, 66, 0.95)", "erc_error": "rgba(129, 0, 5, 0.8)", - "erc_warning": "rgba(88, 54, 0, 0.8)", + "erc_warning": "rgba(132, 56, 0, 0.8)", "erc_exclusion": "rgba(66, 66, 66, 0.8)", "fields": "rgb(3, 0, 117)", "grid": "rgb(138, 138, 138)", diff --git a/editors/kicad/shared/colors/zacess-warm-dark.json b/editors/kicad/shared/colors/zacess-warm-dark.json new file mode 100644 index 0000000..717cd14 --- /dev/null +++ b/editors/kicad/shared/colors/zacess-warm-dark.json @@ -0,0 +1,258 @@ +{ + "3d_viewer": { + "background_top": "rgb(44, 36, 31)", + "background_bottom": "rgb(33, 27, 23)" + }, + "board": { + "anchor": "rgb(255, 71, 255)", + "locked_shadow": "rgba(255, 71, 255, 0.5)", + "conflicts_shadow": "rgba(228, 179, 91, 0.5)", + "aux_items": "rgb(228, 179, 91)", + "background": "rgb(33, 27, 23)", + "cursor": "rgb(228, 179, 91)", + "drc_error": "rgba(228, 179, 91, 0.8)", + "drc_warning": "rgba(228, 179, 91, 0.8)", + "drc_exclusion": "rgba(202, 188, 169, 0.8)", + "grid": "rgb(125, 115, 104)", + "grid_axes": "rgb(152, 140, 126)", + "pad_plated_hole": "rgb(228, 179, 91)", + "plated_hole": "rgb(113, 192, 182)", + "ratsnest": "rgba(228, 179, 91, 0.6)", + "via_hole": "rgb(162, 190, 111)", + "via_hole_walls": "rgb(228, 179, 91)", + "worksheet": "rgb(202, 188, 169)", + "page_limits": "rgb(152, 140, 126)", + "outline_area": "rgba(33, 27, 23, 0.35)", + "track_net_names": "rgba(228, 179, 91, 0.7)", + "pad_net_names": "rgba(228, 179, 91, 0.9)", + "via_net_names": "rgba(228, 179, 91, 0.9)", + "points": "rgb(255, 71, 255)", + "copper": { + "f": "rgb(255, 110, 110)", + "b": "rgb(74, 158, 255)", + "in1": "rgb(148, 190, 125)", + "in2": "rgb(113, 192, 182)", + "in3": "rgb(255, 71, 255)", + "in4": "rgb(228, 179, 91)", + "in5": "rgb(255, 112, 41)", + "in6": "rgb(0, 255, 85)", + "in7": "rgb(74, 158, 255)", + "in8": "rgb(115, 194, 184)", + "in9": "rgb(255, 92, 201)", + "in10": "rgb(162, 190, 111)", + "in11": "rgb(148, 190, 125)", + "in12": "rgb(113, 192, 182)", + "in13": "rgb(255, 71, 255)", + "in14": "rgb(228, 179, 91)", + "in15": "rgb(255, 112, 41)", + "in16": "rgb(0, 255, 85)", + "in17": "rgb(74, 158, 255)", + "in18": "rgb(115, 194, 184)", + "in19": "rgb(255, 92, 201)", + "in20": "rgb(162, 190, 111)", + "in21": "rgb(148, 190, 125)", + "in22": "rgb(113, 192, 182)", + "in23": "rgb(255, 71, 255)", + "in24": "rgb(228, 179, 91)", + "in25": "rgb(255, 112, 41)", + "in26": "rgb(0, 255, 85)", + "in27": "rgb(74, 158, 255)", + "in28": "rgb(115, 194, 184)", + "in29": "rgb(255, 92, 201)", + "in30": "rgb(162, 190, 111)" + }, + "b_adhes": "rgb(74, 158, 255)", + "f_adhes": "rgb(255, 92, 201)", + "b_paste": "rgba(115, 194, 184, 0.9)", + "f_paste": "rgba(202, 188, 169, 0.9)", + "b_silks": "rgb(255, 105, 137)", + "f_silks": "rgb(228, 179, 91)", + "b_mask": "rgba(113, 192, 182, 0.4)", + "f_mask": "rgba(255, 71, 255, 0.4)", + "dwgs_user": "rgb(202, 188, 169)", + "cmts_user": "rgb(228, 179, 91)", + "eco1_user": "rgb(113, 192, 182)", + "eco2_user": "rgb(228, 179, 91)", + "edge_cuts": "rgb(228, 179, 91)", + "margin": "rgb(113, 192, 182)", + "b_crtyd": "rgb(115, 194, 184)", + "f_crtyd": "rgb(255, 92, 201)", + "b_fab": "rgb(51, 160, 255)", + "f_fab": "rgb(202, 188, 169)", + "user_1": "rgb(202, 188, 169)", + "user_2": "rgb(228, 179, 91)", + "user_3": "rgb(113, 192, 182)", + "user_4": "rgb(228, 179, 91)", + "user_5": "rgb(202, 188, 169)", + "user_6": "rgb(228, 179, 91)", + "user_7": "rgb(113, 192, 182)", + "user_8": "rgb(228, 179, 91)", + "user_9": "rgb(202, 188, 169)", + "user_10": "rgb(228, 179, 91)", + "user_11": "rgb(113, 192, 182)", + "user_12": "rgb(228, 179, 91)", + "user_13": "rgb(202, 188, 169)", + "user_14": "rgb(228, 179, 91)", + "user_15": "rgb(113, 192, 182)", + "user_16": "rgb(228, 179, 91)", + "user_17": "rgb(202, 188, 169)", + "user_18": "rgb(228, 179, 91)", + "user_19": "rgb(113, 192, 182)", + "user_20": "rgb(228, 179, 91)", + "user_21": "rgb(202, 188, 169)", + "user_22": "rgb(228, 179, 91)", + "user_23": "rgb(113, 192, 182)", + "user_24": "rgb(228, 179, 91)", + "user_25": "rgb(202, 188, 169)", + "user_26": "rgb(228, 179, 91)", + "user_27": "rgb(113, 192, 182)", + "user_28": "rgb(228, 179, 91)", + "user_29": "rgb(202, 188, 169)", + "user_30": "rgb(228, 179, 91)", + "user_31": "rgb(113, 192, 182)", + "user_32": "rgb(228, 179, 91)", + "user_33": "rgb(202, 188, 169)", + "user_34": "rgb(228, 179, 91)", + "user_35": "rgb(113, 192, 182)", + "user_36": "rgb(228, 179, 91)", + "user_37": "rgb(202, 188, 169)", + "user_38": "rgb(228, 179, 91)", + "user_39": "rgb(113, 192, 182)", + "user_40": "rgb(228, 179, 91)", + "user_41": "rgb(202, 188, 169)", + "user_42": "rgb(228, 179, 91)", + "user_43": "rgb(113, 192, 182)", + "user_44": "rgb(228, 179, 91)", + "user_45": "rgb(202, 188, 169)" + }, + "gerbview": { + "axes": "rgb(152, 140, 126)", + "background": "rgb(33, 27, 23)", + "dcodes": "rgb(228, 179, 91)", + "grid": "rgb(125, 115, 104)", + "negative_objects": "rgb(202, 188, 169)", + "worksheet": "rgb(202, 188, 169)", + "page_limits": "rgb(152, 140, 126)", + "layers": { + "0": "rgb(255, 110, 110)", + "1": "rgb(148, 190, 125)", + "2": "rgb(228, 179, 91)", + "3": "rgb(113, 192, 182)", + "4": "rgb(255, 71, 255)", + "5": "rgb(74, 158, 255)", + "6": "rgb(255, 112, 41)", + "7": "rgb(0, 255, 85)", + "8": "rgb(162, 190, 111)", + "9": "rgb(115, 194, 184)", + "10": "rgb(255, 92, 201)", + "11": "rgb(74, 158, 255)", + "12": "rgb(255, 110, 110)", + "13": "rgb(148, 190, 125)", + "14": "rgb(228, 179, 91)", + "15": "rgb(113, 192, 182)", + "16": "rgb(255, 71, 255)", + "17": "rgb(74, 158, 255)", + "18": "rgb(255, 112, 41)", + "19": "rgb(0, 255, 85)", + "20": "rgb(162, 190, 111)", + "21": "rgb(115, 194, 184)", + "22": "rgb(255, 92, 201)", + "23": "rgb(74, 158, 255)", + "24": "rgb(255, 110, 110)", + "25": "rgb(148, 190, 125)", + "26": "rgb(228, 179, 91)", + "27": "rgb(113, 192, 182)", + "28": "rgb(255, 71, 255)", + "29": "rgb(74, 158, 255)", + "30": "rgb(255, 112, 41)", + "31": "rgb(0, 255, 85)", + "32": "rgb(162, 190, 111)", + "33": "rgb(115, 194, 184)", + "34": "rgb(255, 92, 201)", + "35": "rgb(74, 158, 255)", + "36": "rgb(255, 110, 110)", + "37": "rgb(148, 190, 125)", + "38": "rgb(228, 179, 91)", + "39": "rgb(113, 192, 182)", + "40": "rgb(255, 71, 255)", + "41": "rgb(74, 158, 255)", + "42": "rgb(255, 112, 41)", + "43": "rgb(0, 255, 85)", + "44": "rgb(162, 190, 111)", + "45": "rgb(115, 194, 184)", + "46": "rgb(255, 92, 201)", + "47": "rgb(74, 158, 255)", + "48": "rgb(255, 110, 110)", + "49": "rgb(148, 190, 125)", + "50": "rgb(228, 179, 91)", + "51": "rgb(113, 192, 182)", + "52": "rgb(255, 71, 255)", + "53": "rgb(74, 158, 255)", + "54": "rgb(255, 112, 41)", + "55": "rgb(0, 255, 85)", + "56": "rgb(162, 190, 111)", + "57": "rgb(115, 194, 184)", + "58": "rgb(255, 92, 201)", + "59": "rgb(74, 158, 255)", + "60": "rgb(255, 110, 110)", + "61": "rgb(148, 190, 125)", + "62": "rgb(228, 179, 91)", + "63": "rgb(113, 192, 182)" + } + }, + "meta": { + "filename": "zacess-warm-dark", + "name": "Zacess Warm Dark", + "version": 5 + }, + "schematic": { + "anchor": "rgb(228, 179, 91)", + "aux_items": "rgb(228, 179, 91)", + "background": "rgb(33, 27, 23)", + "hovered": "rgb(228, 179, 91)", + "brightened": "rgb(113, 192, 182)", + "bus": "rgb(228, 179, 91)", + "bus_junction": "rgb(228, 179, 91)", + "component_body": "rgb(44, 36, 31)", + "component_outline": "rgb(255, 105, 137)", + "cursor": "rgb(228, 179, 91)", + "dnp_marker": "rgba(228, 179, 91, 0.85)", + "excluded_from_sim": "rgba(202, 188, 169, 0.95)", + "erc_error": "rgba(228, 179, 91, 0.8)", + "erc_warning": "rgba(228, 179, 91, 0.8)", + "erc_exclusion": "rgba(202, 188, 169, 0.8)", + "fields": "rgb(51, 160, 255)", + "grid": "rgb(125, 115, 104)", + "grid_axes": "rgb(228, 179, 91)", + "hidden": "rgb(202, 188, 169)", + "junction": "rgb(171, 186, 111)", + "label_global": "rgb(255, 105, 137)", + "label_hier": "rgb(228, 179, 91)", + "label_local": "rgb(228, 179, 91)", + "netclass_flag": "rgb(202, 188, 169)", + "drag_net_collision": "rgba(228, 179, 91, 0.8)", + "rule_area": "rgb(228, 179, 91)", + "no_connect": "rgb(228, 179, 91)", + "note": "rgb(190, 177, 158)", + "private_note": "rgb(190, 177, 158)", + "note_background": "rgba(33, 27, 23, 0)", + "pin": "rgb(255, 105, 137)", + "pin_name": "rgb(113, 192, 182)", + "pin_number": "rgb(255, 92, 197)", + "reference": "rgb(113, 192, 182)", + "shadow": "rgba(228, 179, 91, 0.5)", + "sheet": "rgb(228, 179, 91)", + "sheet_background": "rgba(33, 27, 23, 0)", + "sheet_filename": "rgb(228, 179, 91)", + "sheet_fields": "rgb(51, 160, 255)", + "sheet_label": "rgb(113, 192, 182)", + "sheet_name": "rgb(113, 192, 182)", + "value": "rgb(113, 192, 182)", + "wire": "rgb(171, 186, 111)", + "worksheet": "rgb(202, 188, 169)", + "page_limits": "rgb(152, 140, 126)", + "op_voltages": "rgb(255, 92, 197)", + "op_currents": "rgb(113, 192, 182)", + "override_item_colors": false + } +} diff --git a/editors/kicad/shared/colors/zacess-warm-light.json b/editors/kicad/shared/colors/zacess-warm-light.json new file mode 100644 index 0000000..b489e9b --- /dev/null +++ b/editors/kicad/shared/colors/zacess-warm-light.json @@ -0,0 +1,258 @@ +{ + "3d_viewer": { + "background_top": "rgb(228, 216, 190)", + "background_bottom": "rgb(244, 234, 213)" + }, + "board": { + "anchor": "rgb(118, 2, 68)", + "locked_shadow": "rgba(118, 2, 68, 0.5)", + "conflicts_shadow": "rgba(113, 2, 5, 0.5)", + "aux_items": "rgb(52, 36, 16)", + "background": "rgb(244, 234, 213)", + "cursor": "rgb(91, 19, 1)", + "drc_error": "rgba(113, 2, 5, 0.8)", + "drc_warning": "rgba(98, 61, 2, 0.8)", + "drc_exclusion": "rgba(72, 59, 44, 0.8)", + "grid": "rgb(138, 126, 113)", + "grid_axes": "rgb(126, 111, 95)", + "pad_plated_hole": "rgb(39, 82, 0)", + "plated_hole": "rgb(1, 75, 121)", + "ratsnest": "rgba(52, 36, 16, 0.6)", + "via_hole": "rgb(116, 79, 1)", + "via_hole_walls": "rgb(52, 36, 16)", + "worksheet": "rgb(72, 59, 44)", + "page_limits": "rgb(126, 111, 95)", + "outline_area": "rgba(72, 59, 44, 0.35)", + "track_net_names": "rgba(52, 36, 16, 0.7)", + "pad_net_names": "rgba(52, 36, 16, 0.9)", + "via_net_names": "rgba(52, 36, 16, 0.9)", + "points": "rgb(118, 2, 68)", + "copper": { + "f": "rgb(91, 19, 1)", + "b": "rgb(1, 75, 121)", + "in1": "rgb(39, 82, 0)", + "in2": "rgb(1, 75, 121)", + "in3": "rgb(118, 2, 68)", + "in4": "rgb(39, 82, 0)", + "in5": "rgb(113, 2, 5)", + "in6": "rgb(8, 101, 27)", + "in7": "rgb(1, 56, 92)", + "in8": "rgb(1, 56, 92)", + "in9": "rgb(150, 43, 112)", + "in10": "rgb(116, 79, 1)", + "in11": "rgb(39, 82, 0)", + "in12": "rgb(1, 75, 121)", + "in13": "rgb(118, 2, 68)", + "in14": "rgb(39, 82, 0)", + "in15": "rgb(113, 2, 5)", + "in16": "rgb(8, 101, 27)", + "in17": "rgb(1, 56, 92)", + "in18": "rgb(1, 56, 92)", + "in19": "rgb(150, 43, 112)", + "in20": "rgb(116, 79, 1)", + "in21": "rgb(39, 82, 0)", + "in22": "rgb(1, 75, 121)", + "in23": "rgb(118, 2, 68)", + "in24": "rgb(39, 82, 0)", + "in25": "rgb(113, 2, 5)", + "in26": "rgb(8, 101, 27)", + "in27": "rgb(1, 56, 92)", + "in28": "rgb(1, 56, 92)", + "in29": "rgb(150, 43, 112)", + "in30": "rgb(116, 79, 1)" + }, + "b_adhes": "rgb(1, 56, 92)", + "f_adhes": "rgb(150, 43, 112)", + "b_paste": "rgba(1, 56, 92, 0.9)", + "f_paste": "rgba(72, 59, 44, 0.9)", + "b_silks": "rgb(118, 2, 68)", + "f_silks": "rgb(116, 79, 1)", + "b_mask": "rgba(1, 75, 121, 0.4)", + "f_mask": "rgba(118, 2, 68, 0.4)", + "dwgs_user": "rgb(72, 59, 44)", + "cmts_user": "rgb(131, 42, 1)", + "eco1_user": "rgb(4, 82, 71)", + "eco2_user": "rgb(116, 79, 1)", + "edge_cuts": "rgb(52, 36, 16)", + "margin": "rgb(6, 64, 69)", + "b_crtyd": "rgb(1, 56, 92)", + "f_crtyd": "rgb(150, 43, 112)", + "b_fab": "rgb(2, 49, 141)", + "f_fab": "rgb(72, 59, 44)", + "user_1": "rgb(72, 59, 44)", + "user_2": "rgb(131, 42, 1)", + "user_3": "rgb(4, 82, 71)", + "user_4": "rgb(116, 79, 1)", + "user_5": "rgb(72, 59, 44)", + "user_6": "rgb(131, 42, 1)", + "user_7": "rgb(4, 82, 71)", + "user_8": "rgb(116, 79, 1)", + "user_9": "rgb(72, 59, 44)", + "user_10": "rgb(131, 42, 1)", + "user_11": "rgb(4, 82, 71)", + "user_12": "rgb(116, 79, 1)", + "user_13": "rgb(72, 59, 44)", + "user_14": "rgb(131, 42, 1)", + "user_15": "rgb(4, 82, 71)", + "user_16": "rgb(116, 79, 1)", + "user_17": "rgb(72, 59, 44)", + "user_18": "rgb(131, 42, 1)", + "user_19": "rgb(4, 82, 71)", + "user_20": "rgb(116, 79, 1)", + "user_21": "rgb(72, 59, 44)", + "user_22": "rgb(131, 42, 1)", + "user_23": "rgb(4, 82, 71)", + "user_24": "rgb(116, 79, 1)", + "user_25": "rgb(72, 59, 44)", + "user_26": "rgb(131, 42, 1)", + "user_27": "rgb(4, 82, 71)", + "user_28": "rgb(116, 79, 1)", + "user_29": "rgb(72, 59, 44)", + "user_30": "rgb(131, 42, 1)", + "user_31": "rgb(4, 82, 71)", + "user_32": "rgb(116, 79, 1)", + "user_33": "rgb(72, 59, 44)", + "user_34": "rgb(131, 42, 1)", + "user_35": "rgb(4, 82, 71)", + "user_36": "rgb(116, 79, 1)", + "user_37": "rgb(72, 59, 44)", + "user_38": "rgb(131, 42, 1)", + "user_39": "rgb(4, 82, 71)", + "user_40": "rgb(116, 79, 1)", + "user_41": "rgb(72, 59, 44)", + "user_42": "rgb(131, 42, 1)", + "user_43": "rgb(4, 82, 71)", + "user_44": "rgb(116, 79, 1)", + "user_45": "rgb(72, 59, 44)" + }, + "gerbview": { + "axes": "rgb(126, 111, 95)", + "background": "rgb(244, 234, 213)", + "dcodes": "rgb(52, 36, 16)", + "grid": "rgb(138, 126, 113)", + "negative_objects": "rgb(72, 59, 44)", + "worksheet": "rgb(72, 59, 44)", + "page_limits": "rgb(126, 111, 95)", + "layers": { + "0": "rgb(91, 19, 1)", + "1": "rgb(39, 82, 0)", + "2": "rgb(39, 82, 0)", + "3": "rgb(1, 75, 121)", + "4": "rgb(118, 2, 68)", + "5": "rgb(1, 75, 121)", + "6": "rgb(113, 2, 5)", + "7": "rgb(8, 101, 27)", + "8": "rgb(116, 79, 1)", + "9": "rgb(1, 56, 92)", + "10": "rgb(150, 43, 112)", + "11": "rgb(1, 56, 92)", + "12": "rgb(91, 19, 1)", + "13": "rgb(39, 82, 0)", + "14": "rgb(39, 82, 0)", + "15": "rgb(1, 75, 121)", + "16": "rgb(118, 2, 68)", + "17": "rgb(1, 75, 121)", + "18": "rgb(113, 2, 5)", + "19": "rgb(8, 101, 27)", + "20": "rgb(116, 79, 1)", + "21": "rgb(1, 56, 92)", + "22": "rgb(150, 43, 112)", + "23": "rgb(1, 56, 92)", + "24": "rgb(91, 19, 1)", + "25": "rgb(39, 82, 0)", + "26": "rgb(39, 82, 0)", + "27": "rgb(1, 75, 121)", + "28": "rgb(118, 2, 68)", + "29": "rgb(1, 75, 121)", + "30": "rgb(113, 2, 5)", + "31": "rgb(8, 101, 27)", + "32": "rgb(116, 79, 1)", + "33": "rgb(1, 56, 92)", + "34": "rgb(150, 43, 112)", + "35": "rgb(1, 56, 92)", + "36": "rgb(91, 19, 1)", + "37": "rgb(39, 82, 0)", + "38": "rgb(39, 82, 0)", + "39": "rgb(1, 75, 121)", + "40": "rgb(118, 2, 68)", + "41": "rgb(1, 75, 121)", + "42": "rgb(113, 2, 5)", + "43": "rgb(8, 101, 27)", + "44": "rgb(116, 79, 1)", + "45": "rgb(1, 56, 92)", + "46": "rgb(150, 43, 112)", + "47": "rgb(1, 56, 92)", + "48": "rgb(91, 19, 1)", + "49": "rgb(39, 82, 0)", + "50": "rgb(39, 82, 0)", + "51": "rgb(1, 75, 121)", + "52": "rgb(118, 2, 68)", + "53": "rgb(1, 75, 121)", + "54": "rgb(113, 2, 5)", + "55": "rgb(8, 101, 27)", + "56": "rgb(116, 79, 1)", + "57": "rgb(1, 56, 92)", + "58": "rgb(150, 43, 112)", + "59": "rgb(1, 56, 92)", + "60": "rgb(91, 19, 1)", + "61": "rgb(39, 82, 0)", + "62": "rgb(39, 82, 0)", + "63": "rgb(1, 75, 121)" + } + }, + "meta": { + "filename": "zacess-warm-light", + "name": "Zacess Warm Light", + "version": 5 + }, + "schematic": { + "anchor": "rgb(109, 59, 2)", + "aux_items": "rgb(52, 36, 16)", + "background": "rgb(244, 234, 213)", + "hovered": "rgb(109, 59, 2)", + "brightened": "rgb(6, 64, 69)", + "bus": "rgb(131, 42, 1)", + "bus_junction": "rgb(131, 42, 1)", + "component_body": "rgb(228, 216, 190)", + "component_outline": "rgb(118, 2, 68)", + "cursor": "rgb(91, 19, 1)", + "dnp_marker": "rgba(113, 2, 5, 0.85)", + "excluded_from_sim": "rgba(72, 59, 44, 0.95)", + "erc_error": "rgba(113, 2, 5, 0.8)", + "erc_warning": "rgba(98, 61, 2, 0.8)", + "erc_exclusion": "rgba(72, 59, 44, 0.8)", + "fields": "rgb(2, 49, 141)", + "grid": "rgb(138, 126, 113)", + "grid_axes": "rgb(109, 59, 2)", + "hidden": "rgb(72, 59, 44)", + "junction": "rgb(4, 82, 58)", + "label_global": "rgb(118, 2, 68)", + "label_hier": "rgb(140, 65, 5)", + "label_local": "rgb(52, 36, 16)", + "netclass_flag": "rgb(72, 59, 44)", + "drag_net_collision": "rgba(113, 2, 5, 0.8)", + "rule_area": "rgb(113, 2, 5)", + "no_connect": "rgb(131, 42, 1)", + "note": "rgb(98, 82, 64)", + "private_note": "rgb(98, 82, 64)", + "note_background": "rgba(244, 234, 213, 0)", + "pin": "rgb(118, 2, 68)", + "pin_name": "rgb(4, 82, 71)", + "pin_number": "rgb(150, 43, 112)", + "reference": "rgb(4, 82, 71)", + "shadow": "rgba(109, 59, 2, 0.5)", + "sheet": "rgb(131, 42, 1)", + "sheet_background": "rgba(244, 234, 213, 0)", + "sheet_filename": "rgb(140, 65, 5)", + "sheet_fields": "rgb(2, 49, 141)", + "sheet_label": "rgb(4, 82, 71)", + "sheet_name": "rgb(4, 82, 71)", + "value": "rgb(4, 82, 71)", + "wire": "rgb(4, 82, 58)", + "worksheet": "rgb(72, 59, 44)", + "page_limits": "rgb(126, 111, 95)", + "op_voltages": "rgb(150, 43, 112)", + "op_currents": "rgb(6, 64, 69)", + "override_item_colors": false + } +} diff --git a/editors/kicad/windows/apply.ps1 b/editors/kicad/windows/apply.ps1 index 43d045b..7a3dedd 100644 --- a/editors/kicad/windows/apply.ps1 +++ b/editors/kicad/windows/apply.ps1 @@ -1,10 +1,11 @@ -# installs the eight Zacess colour themes for KiCad and makes one of them the theme of every editor. +# installs the ten Zacess colour themes for KiCad and makes one of them the theme of every editor. # usage: .\apply.ps1 [-Theme ] [-ConfigDir ] # (the config folder defaults to the newest version folder under %APPDATA%\kicad; when # KICAD_CONFIG_HOME is set it is used instead, as it is by KiCad itself) # -# -Theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# -Theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # the theme files go into \colors, where KiCad lists them under Preferences > Colors. the @@ -27,12 +28,13 @@ $themeIds = [ordered]@{ 'hc-light' = 'high-contrast-light'; 'high-contrast-light' = 'high-contrast-light' 'dark' = 'dark'; 'light' = 'light'; 'cream' = 'cream' 'yellow' = 'yellow-on-black'; 'yellow-on-black' = 'yellow-on-black' + 'warm-dark' = 'warm-dark'; 'warm-light' = 'warm-light' } $key = ($Theme.ToLowerInvariant() -replace '^zacess[ -]', '') -replace ' ', '-' $id = $themeIds[$key] if (-not $id) { [Console]::Error.WriteLine("Unknown theme: $Theme") - [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow.') + [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light.') exit 1 } $chosen = "zacess-$id" diff --git a/editors/ltspice/ACCESSIBILITY.md b/editors/ltspice/ACCESSIBILITY.md index 4a56684..49f455e 100644 --- a/editors/ltspice/ACCESSIBILITY.md +++ b/editors/ltspice/ACCESSIBILITY.md @@ -4,7 +4,7 @@ High contrast schematics and waveforms, so LTspice reads like the other tools. ## Vision -- The default is Zacess Deep Contrast Dark: a black background with parts, wires and labels in its fully saturated syntax colours. All eight Zacess themes are available, light ones included. Measured contrast is in the [Zacess Themes accessibility statement](https://github.com/zacesshq/themes/blob/main/ACCESSIBILITY.md). +- The default is Zacess Deep Contrast Dark: a black background with parts, wires and labels in its fully saturated syntax colours. All ten Zacess themes are available, light ones included. Measured contrast is in the [Zacess Themes accessibility statement](https://github.com/zacesshq/themes/blob/main/ACCESSIBILITY.md). - Waveform traces take the theme's terminal colours, chosen to stay distinct from each other and the background. - The macOS app takes the same colours through its own preferences. It has one schematic colour fewer than Windows, so that one keeps LTspice's default there. - Each trace is also named in the plot's legend and the cursor readout, so colour is never the only signal. diff --git a/editors/ltspice/README.md b/editors/ltspice/README.md index df75dc2..7f90328 100644 --- a/editors/ltspice/README.md +++ b/editors/ltspice/README.md @@ -51,4 +51,4 @@ LTspice can write the start of its ini as UTF-16 and the rest as plain bytes, so ## Validation -[`scripts/validate.py`](scripts/validate.py) runs in CI on Linux. It checks all eight themes exist, every line is a colour entry with a 24-bit value and every theme sets the same entries. +[`scripts/validate.py`](scripts/validate.py) runs in CI on Linux. It checks all ten themes exist, every line is a colour entry with a 24-bit value and every theme sets the same entries. diff --git a/editors/ltspice/linux/apply.sh b/editors/ltspice/linux/apply.sh index 6aeaf72..c1ea949 100644 --- a/editors/ltspice/linux/apply.sh +++ b/editors/ltspice/linux/apply.sh @@ -4,8 +4,9 @@ # (on Linux LTspice runs under Wine, so the ini defaults to the Wine prefix's # AppData/Roaming/LTspice.ini (LTspiceXVII.ini from older versions)) # -# --theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# --theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. the work is done by ../shared/apply.py; nothing is backed up. set -euo pipefail @@ -31,12 +32,14 @@ theme_name() { light) echo "Zacess Light" ;; cream) echo "Zacess Cream" ;; yellow|yellow-on-black) echo "Zacess Yellow on Black" ;; + warm-dark) echo "Zacess Warm Dark" ;; + warm-light) echo "Zacess Warm Light" ;; *) return 1 ;; esac } if ! name="$(theme_name "$theme")"; then echo "Unknown theme: $theme" >&2 - echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow." >&2 + echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light." >&2 exit 1 fi diff --git a/editors/ltspice/mac/apply.sh b/editors/ltspice/mac/apply.sh index 8e60d75..8e07cb0 100755 --- a/editors/ltspice/mac/apply.sh +++ b/editors/ltspice/mac/apply.sh @@ -2,8 +2,9 @@ # sets the native Mac LTspice's schematic, waveform and netlist colours to one of the Zacess themes. # usage: apply.sh [--theme ] # -# --theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# --theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # the Mac app (LTspice 17 for macOS) keeps no LTspice.ini: its settings live in the @@ -36,12 +37,14 @@ theme_name() { light) echo "Zacess Light" ;; cream) echo "Zacess Cream" ;; yellow|yellow-on-black) echo "Zacess Yellow on Black" ;; + warm-dark) echo "Zacess Warm Dark" ;; + warm-light) echo "Zacess Warm Light" ;; *) return 1 ;; esac } if ! name="$(theme_name "$theme")"; then echo "Unknown theme: $theme" >&2 - echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow." >&2 + echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light." >&2 exit 1 fi diff --git a/editors/ltspice/scripts/build-themes.py b/editors/ltspice/scripts/build-themes.py index 6f1c32f..cec653c 100644 --- a/editors/ltspice/scripts/build-themes.py +++ b/editors/ltspice/scripts/build-themes.py @@ -25,6 +25,8 @@ "zacess-light": "Zacess Light", "zacess-cream": "Zacess Cream", "zacess-yellow-on-black": "Zacess Yellow on Black", + "zacess-warm-dark": "Zacess Warm Dark", + "zacess-warm-light": "Zacess Warm Light", } TRACES = ["terminal.ansiGreen", "terminal.ansiBlue", "terminal.ansiRed", "terminal.ansiCyan", diff --git a/editors/ltspice/scripts/validate.py b/editors/ltspice/scripts/validate.py index d65ff7a..c534222 100644 --- a/editors/ltspice/scripts/validate.py +++ b/editors/ltspice/scripts/validate.py @@ -1,6 +1,6 @@ """Checks the LTspice folder without LTspice: run from anywhere, exits non-zero on a problem. -- shared/themes holds the eight Zacess themes, each a [Colors] section of name=number lines +- shared/themes holds the ten Zacess themes, each a [Colors] section of name=number lines - every colour is a 24-bit value and every theme sets the same entries - shared/apply.py parses as Python """ @@ -11,7 +11,8 @@ import sys NAMES = ["Zacess Deep Contrast Dark", "Zacess Deep Contrast Light", "Zacess High Contrast Dark", - "Zacess High Contrast Light", "Zacess Dark", "Zacess Light", "Zacess Cream", "Zacess Yellow on Black"] + "Zacess High Contrast Light", "Zacess Dark", "Zacess Light", "Zacess Cream", "Zacess Yellow on Black", + "Zacess Warm Dark", "Zacess Warm Light"] root = pathlib.Path(__file__).resolve().parent.parent problems = [] diff --git a/editors/ltspice/shared/themes/Zacess Warm Dark.ini b/editors/ltspice/shared/themes/Zacess Warm Dark.ini new file mode 100644 index 0000000..7d17105 --- /dev/null +++ b/editors/ltspice/shared/themes/Zacess Warm Dark.ini @@ -0,0 +1,37 @@ +; Zacess Warm Dark for LTspice, built by scripts/build-themes.py from the Zacess VS Code theme, do not edit by hand +[Colors] +Grid=11123914 +InActiveAxis=11123914 +WaveColor0=1514273 +WaveColor1=11982309 +WaveColor2=7323298 +WaveColor3=14924168 +WaveColor4=9280252 +WaveColor5=12108403 +WaveColor6=13279711 +WaveColor7=6009828 +WaveColor8=11596505 +WaveColor9=16772311 +WaveColor10=14738686 +WaveColor11=15595441 +WaveColor12=16048639 +WaveColor13=11987455 +SchematicColor0=7642614 +SchematicColor1=10610943 +SchematicColor2=11976817 +SchematicColor3=7642614 +SchematicColor4=6047276 +SchematicColor5=11982309 +SchematicColor6=11982309 +SchematicColor7=10400190 +SchematicColor8=10610943 +SchematicColor9=7642614 +SchematicColor10=6993385 +SchematicColor11=10400190 +SchematicColor12=1514273 +SchematicColor13=11976817 +NetlistNormalTextColor=11982309 +NetlistCommentTextColor=10400190 +NetlistDotcmdTextColor=12627967 +NetlistBackgroundColor=1514273 +ContinuationLineColor=12627967 diff --git a/editors/ltspice/shared/themes/Zacess Warm Light.ini b/editors/ltspice/shared/themes/Zacess Warm Light.ini new file mode 100644 index 0000000..1dbf98e --- /dev/null +++ b/editors/ltspice/shared/themes/Zacess Warm Light.ini @@ -0,0 +1,37 @@ +; Zacess Warm Light for LTspice, built by scripts/build-themes.py from the Zacess VS Code theme, do not edit by hand +[Colors] +Grid=2898760 +InActiveAxis=2898760 +WaveColor0=14019316 +WaveColor1=1057844 +WaveColor2=21031 +WaveColor3=7949057 +WaveColor4=1448588 +WaveColor5=5067013 +WaveColor6=6302836 +WaveColor7=214634 +WaveColor8=1467960 +WaveColor9=9658129 +WaveColor10=2831268 +WaveColor11=6448646 +WaveColor12=7618698 +WaveColor13=87940 +SchematicColor0=76419 +SchematicColor1=85876 +SchematicColor2=4674052 +SchematicColor3=76419 +SchematicColor4=16700064 +SchematicColor5=1057844 +SchematicColor6=1057844 +SchematicColor7=4215394 +SchematicColor8=85876 +SchematicColor9=76419 +SchematicColor10=146285 +SchematicColor11=4215394 +SchematicColor12=14019316 +SchematicColor13=4674052 +NetlistNormalTextColor=1057844 +NetlistCommentTextColor=4215394 +NetlistDotcmdTextColor=4457078 +NetlistBackgroundColor=14019316 +ContinuationLineColor=4457078 diff --git a/editors/ltspice/windows/apply.ps1 b/editors/ltspice/windows/apply.ps1 index ff4b6fd..a8340b0 100644 --- a/editors/ltspice/windows/apply.ps1 +++ b/editors/ltspice/windows/apply.ps1 @@ -2,8 +2,9 @@ # usage: .\apply.ps1 [-Theme ] [-Ini ] # (the ini defaults to %APPDATA%\LTspice.ini (LTspiceXVII.ini from older versions)) # -# -Theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# -Theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # only the colour entries in ..\shared\themes\.ini change. LTspice writes the start of its @@ -23,12 +24,13 @@ $themeNames = [ordered]@{ 'hc-light' = 'Zacess High Contrast Light'; 'high-contrast-light' = 'Zacess High Contrast Light' 'dark' = 'Zacess Dark'; 'light' = 'Zacess Light'; 'cream' = 'Zacess Cream' 'yellow' = 'Zacess Yellow on Black'; 'yellow-on-black' = 'Zacess Yellow on Black' + 'warm-dark' = 'Zacess Warm Dark'; 'warm-light' = 'Zacess Warm Light' } $key = ($Theme.ToLowerInvariant() -replace '^zacess[ -]', '') -replace ' ', '-' $name = $themeNames[$key] if (-not $name) { [Console]::Error.WriteLine("Unknown theme: $Theme") - [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow.') + [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light.') exit 1 } diff --git a/editors/matlab/ACCESSIBILITY.md b/editors/matlab/ACCESSIBILITY.md index 7693344..4685029 100644 --- a/editors/matlab/ACCESSIBILITY.md +++ b/editors/matlab/ACCESSIBILITY.md @@ -5,7 +5,7 @@ A high contrast desktop, matching syntax colours and a clear code font, so MATLA ## Vision - Code is GeistMono Nerd Font at 14 points (GeistMono Nerd Font Mono at 18 on a Mac's higher density display). -- The default is Zacess Deep Contrast Dark with MATLAB's dark desktop. All eight Zacess themes are available, light ones included. Measured contrast is in the [Zacess Themes accessibility statement](https://github.com/zacesshq/themes/blob/main/ACCESSIBILITY.md). +- The default is Zacess Deep Contrast Dark with MATLAB's dark desktop. All ten Zacess themes are available, light ones included. Measured contrast is in the [Zacess Themes accessibility statement](https://github.com/zacesshq/themes/blob/main/ACCESSIBILITY.md). - The editor takes the theme's own text and background in both MATLAB themes, so code reads the same as in the other editors, with nothing left on MATLAB's default greys. - Errors and warnings keep distinct hues (red and amber) and MATLAB also marks them with icons and underlines, so colour is never the only signal. diff --git a/editors/matlab/README.md b/editors/matlab/README.md index fb0b05c..cdbf797 100644 --- a/editors/matlab/README.md +++ b/editors/matlab/README.md @@ -55,4 +55,4 @@ MATLAB starts in `~/dev/projects/matlab`, the projects folder every editor share ## Validation -[`scripts/validate.py`](scripts/validate.py) runs in CI on Linux. It checks all eight themes have a Light or Dark desktop and RGB colours, every theme has a scheme for the same desktop with every colour set, the add-on is pinned by commit and digest, every platform names Geist Mono and `zacess_apply.m` defines its function. +[`scripts/validate.py`](scripts/validate.py) runs in CI on Linux. It checks all ten themes have a Light or Dark desktop and RGB colours, every theme has a scheme for the same desktop with every colour set, the add-on is pinned by commit and digest, every platform names Geist Mono and `zacess_apply.m` defines its function. diff --git a/editors/matlab/linux/apply.sh b/editors/matlab/linux/apply.sh index ac1029b..075ff06 100644 --- a/editors/matlab/linux/apply.sh +++ b/editors/matlab/linux/apply.sh @@ -3,8 +3,9 @@ # usage: apply.sh [--theme ] [--pending] [path to the matlab launcher] # (the launcher defaults to matlab on PATH, then the newest /usr/local/MATLAB/R20*/bin/matlab) # -# --theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# --theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # ../shared/zacess_apply.m writes the theme and fonts through MATLAB's own settings API, which @@ -45,12 +46,14 @@ theme_name() { light) echo "Zacess Light" ;; cream) echo "Zacess Cream" ;; yellow|yellow-on-black) echo "Zacess Yellow on Black" ;; + warm-dark) echo "Zacess Warm Dark" ;; + warm-light) echo "Zacess Warm Light" ;; *) return 1 ;; esac } if ! name="$(theme_name "$theme")"; then echo "Unknown theme: $theme" >&2 - echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow." >&2 + echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light." >&2 exit 1 fi diff --git a/editors/matlab/mac/apply.sh b/editors/matlab/mac/apply.sh index da48f52..47b9f7d 100755 --- a/editors/matlab/mac/apply.sh +++ b/editors/matlab/mac/apply.sh @@ -3,8 +3,9 @@ # usage: apply.sh [--theme ] [--pending] [path to the matlab launcher] # (the launcher defaults to matlab on PATH, then the newest /Applications/MATLAB_R20*.app/bin/matlab) # -# --theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# --theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # ../shared/zacess_apply.m writes the theme and fonts through MATLAB's own settings API, which @@ -45,12 +46,14 @@ theme_name() { light) echo "Zacess Light" ;; cream) echo "Zacess Cream" ;; yellow|yellow-on-black) echo "Zacess Yellow on Black" ;; + warm-dark) echo "Zacess Warm Dark" ;; + warm-light) echo "Zacess Warm Light" ;; *) return 1 ;; esac } if ! name="$(theme_name "$theme")"; then echo "Unknown theme: $theme" >&2 - echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow." >&2 + echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light." >&2 exit 1 fi diff --git a/editors/matlab/scripts/build-themes.py b/editors/matlab/scripts/build-themes.py index e4bb89b..ed0b322 100644 --- a/editors/matlab/scripts/build-themes.py +++ b/editors/matlab/scripts/build-themes.py @@ -27,6 +27,8 @@ "zacess-light": ("Zacess Light", "Light"), "zacess-cream": ("Zacess Cream", "Light"), "zacess-yellow-on-black": ("Zacess Yellow on Black", "Dark"), + "zacess-warm-dark": ("Zacess Warm Dark", "Dark"), + "zacess-warm-light": ("Zacess Warm Light", "Light"), } # matlab setting: the TextMate scope or VS Code colour it takes diff --git a/editors/matlab/scripts/validate.py b/editors/matlab/scripts/validate.py index a523b39..865614f 100644 --- a/editors/matlab/scripts/validate.py +++ b/editors/matlab/scripts/validate.py @@ -1,6 +1,6 @@ """Checks the MATLAB folder without MATLAB: run from anywhere, exits non-zero on a problem. -- shared/themes holds the eight Zacess themes, each with a Light or Dark desktop and RGB colours +- shared/themes holds the ten Zacess themes, each with a Light or Dark desktop and RGB colours - every platform's fonts.json names Geist Mono - shared/zacess_apply.m defines the zacess_apply function - shared/schemes holds a colour scheme per theme for the same desktop, setting every colour in @@ -14,7 +14,8 @@ import sys NAMES = ["Zacess Deep Contrast Dark", "Zacess Deep Contrast Light", "Zacess High Contrast Dark", - "Zacess High Contrast Light", "Zacess Dark", "Zacess Light", "Zacess Cream", "Zacess Yellow on Black"] + "Zacess High Contrast Light", "Zacess Dark", "Zacess Light", "Zacess Cream", "Zacess Yellow on Black", + "Zacess Warm Dark", "Zacess Warm Light"] root = pathlib.Path(__file__).resolve().parent.parent problems = [] diff --git a/editors/matlab/shared/schemes/Zacess Cream.json b/editors/matlab/shared/schemes/Zacess Cream.json index 049a0e0..9bb86ab 100644 --- a/editors/matlab/shared/schemes/Zacess Cream.json +++ b/editors/matlab/shared/schemes/Zacess Cream.json @@ -3,7 +3,7 @@ "TextColor": "#000000", "BackgroundColor": "#FDF6E3", "HighlightCurrentLine": true, - "HighlightCurrentLineColor": "#F3EAD2", + "HighlightCurrentLineColor": "#C8DADD", "ShowRightHandTextLimitLine": true, "RightHandTextLimitLineColor": "#857B69", "MATLABSyntaxHighlightingColors": { @@ -27,7 +27,7 @@ "WarningsColor": "#451700", "InfoColor": "#004498", "AutofixHighlight": true, - "AutofixHighlightColor": "#F3EAD2" + "AutofixHighlightColor": "#C8DADD" }, "VariableAndFunctionColors": { "VariablesWithSharedScope": true, diff --git a/editors/matlab/shared/schemes/Zacess Dark.json b/editors/matlab/shared/schemes/Zacess Dark.json index fb614c9..2761be2 100644 --- a/editors/matlab/shared/schemes/Zacess Dark.json +++ b/editors/matlab/shared/schemes/Zacess Dark.json @@ -3,7 +3,7 @@ "TextColor": "#F5F5F5", "BackgroundColor": "#121212", "HighlightCurrentLine": true, - "HighlightCurrentLineColor": "#1F1F1F", + "HighlightCurrentLineColor": "#2F2F2F", "ShowRightHandTextLimitLine": true, "RightHandTextLimitLineColor": "#6B6B6B", "MATLABSyntaxHighlightingColors": { @@ -27,7 +27,7 @@ "WarningsColor": "#FFD9BA", "InfoColor": "#8CBCFF", "AutofixHighlight": true, - "AutofixHighlightColor": "#1F1F1F" + "AutofixHighlightColor": "#2F2F2F" }, "VariableAndFunctionColors": { "VariablesWithSharedScope": true, diff --git a/editors/matlab/shared/schemes/Zacess Deep Contrast Dark.json b/editors/matlab/shared/schemes/Zacess Deep Contrast Dark.json index 3186a3f..c27819b 100644 --- a/editors/matlab/shared/schemes/Zacess Deep Contrast Dark.json +++ b/editors/matlab/shared/schemes/Zacess Deep Contrast Dark.json @@ -3,7 +3,7 @@ "TextColor": "#FFFFFF", "BackgroundColor": "#000000", "HighlightCurrentLine": true, - "HighlightCurrentLineColor": "#141414", + "HighlightCurrentLineColor": "#262626", "ShowRightHandTextLimitLine": true, "RightHandTextLimitLineColor": "#8C8C8C", "MATLABSyntaxHighlightingColors": { @@ -27,7 +27,7 @@ "WarningsColor": "#E19E00", "InfoColor": "#1DB4FF", "AutofixHighlight": true, - "AutofixHighlightColor": "#141414" + "AutofixHighlightColor": "#262626" }, "VariableAndFunctionColors": { "VariablesWithSharedScope": true, diff --git a/editors/matlab/shared/schemes/Zacess Deep Contrast Light.json b/editors/matlab/shared/schemes/Zacess Deep Contrast Light.json index 7932b11..535940d 100644 --- a/editors/matlab/shared/schemes/Zacess Deep Contrast Light.json +++ b/editors/matlab/shared/schemes/Zacess Deep Contrast Light.json @@ -3,7 +3,7 @@ "TextColor": "#000000", "BackgroundColor": "#FFFFFF", "HighlightCurrentLine": true, - "HighlightCurrentLineColor": "#F5F5F5", + "HighlightCurrentLineColor": "#C8DEBD", "ShowRightHandTextLimitLine": true, "RightHandTextLimitLineColor": "#6E6E6E", "MATLABSyntaxHighlightingColors": { @@ -27,7 +27,7 @@ "WarningsColor": "#A3005F", "InfoColor": "#003DF6", "AutofixHighlight": true, - "AutofixHighlightColor": "#F5F5F5" + "AutofixHighlightColor": "#C8DEBD" }, "VariableAndFunctionColors": { "VariablesWithSharedScope": true, diff --git a/editors/matlab/shared/schemes/Zacess High Contrast Dark.json b/editors/matlab/shared/schemes/Zacess High Contrast Dark.json index 411afda..740f4bf 100644 --- a/editors/matlab/shared/schemes/Zacess High Contrast Dark.json +++ b/editors/matlab/shared/schemes/Zacess High Contrast Dark.json @@ -3,7 +3,7 @@ "TextColor": "#FFFFFF", "BackgroundColor": "#000000", "HighlightCurrentLine": true, - "HighlightCurrentLineColor": "#1A1A1A", + "HighlightCurrentLineColor": "#262626", "ShowRightHandTextLimitLine": true, "RightHandTextLimitLineColor": "#8C8C8C", "MATLABSyntaxHighlightingColors": { @@ -27,7 +27,7 @@ "WarningsColor": "#FFB27A", "InfoColor": "#8FD0FF", "AutofixHighlight": true, - "AutofixHighlightColor": "#1A1A1A" + "AutofixHighlightColor": "#262626" }, "VariableAndFunctionColors": { "VariablesWithSharedScope": true, diff --git a/editors/matlab/shared/schemes/Zacess High Contrast Light.json b/editors/matlab/shared/schemes/Zacess High Contrast Light.json index 56428ff..3f09b18 100644 --- a/editors/matlab/shared/schemes/Zacess High Contrast Light.json +++ b/editors/matlab/shared/schemes/Zacess High Contrast Light.json @@ -3,7 +3,7 @@ "TextColor": "#000000", "BackgroundColor": "#FFFFFF", "HighlightCurrentLine": true, - "HighlightCurrentLineColor": "#F2F2F2", + "HighlightCurrentLineColor": "#C3E5FE", "ShowRightHandTextLimitLine": true, "RightHandTextLimitLineColor": "#6E6E6E", "MATLABSyntaxHighlightingColors": { @@ -27,7 +27,7 @@ "WarningsColor": "#521E00", "InfoColor": "#003D99", "AutofixHighlight": true, - "AutofixHighlightColor": "#F2F2F2" + "AutofixHighlightColor": "#C3E5FE" }, "VariableAndFunctionColors": { "VariablesWithSharedScope": true, diff --git a/editors/matlab/shared/schemes/Zacess Light.json b/editors/matlab/shared/schemes/Zacess Light.json index 4b0c26a..661a339 100644 --- a/editors/matlab/shared/schemes/Zacess Light.json +++ b/editors/matlab/shared/schemes/Zacess Light.json @@ -3,7 +3,7 @@ "TextColor": "#111111", "BackgroundColor": "#FFFFFF", "HighlightCurrentLine": true, - "HighlightCurrentLineColor": "#F0F0F0", + "HighlightCurrentLineColor": "#D6DDE8", "ShowRightHandTextLimitLine": true, "RightHandTextLimitLineColor": "#8A8A8A", "MATLABSyntaxHighlightingColors": { @@ -27,7 +27,7 @@ "WarningsColor": "#4C1B00", "InfoColor": "#0049A3", "AutofixHighlight": true, - "AutofixHighlightColor": "#F0F0F0" + "AutofixHighlightColor": "#D6DDE8" }, "VariableAndFunctionColors": { "VariablesWithSharedScope": true, diff --git a/editors/matlab/shared/schemes/Zacess Warm Dark.json b/editors/matlab/shared/schemes/Zacess Warm Dark.json new file mode 100644 index 0000000..f1067eb --- /dev/null +++ b/editors/matlab/shared/schemes/Zacess Warm Dark.json @@ -0,0 +1,173 @@ +{ + "DesktopTheme": "Dark", + "TextColor": "#E5D5B6", + "BackgroundColor": "#211B17", + "HighlightCurrentLine": true, + "HighlightCurrentLineColor": "#36322D", + "ShowRightHandTextLimitLine": true, + "RightHandTextLimitLineColor": "#7D7368", + "MATLABSyntaxHighlightingColors": { + "KeywordsColor": "#F69D74", + "CommentsColor": "#BEB19E", + "StringsColor": "#ABBA6F", + "UnterminatedStringsColor": "#FCA8A1", + "SystemCommandsColor": "#FFAFC0", + "ValidationSectionsColor": "#71C0B6", + "SyntaxErrorsColor": "#FCA8A1", + "EnableSyntaxHighlighting": true, + "ApplySmartIndentWhileTyping": true + }, + "MATLABOutputColors": { + "ErrorTextColor": "#FCA8A1", + "WarningTextColor": "#ECB4D8", + "HyperlinksInCommandWindowColor": "#E9B56A" + }, + "ProgrammingTools": { + "CodeAnalyzerColors": { + "WarningsColor": "#ECB4D8", + "InfoColor": "#E9B56A", + "AutofixHighlight": true, + "AutofixHighlightColor": "#36322D" + }, + "VariableAndFunctionColors": { + "VariablesWithSharedScope": true, + "VariablesWithSharedScopeColor": "#71C0B6", + "AutomaticallyHighlight": true, + "AutomaticallyHighlightColor": "#2C465C" + } + }, + "OtherLanguages": { + "C": { + "KeywordsColor": "#F69D74", + "CommentsColor": "#BEB19E", + "StringsColor": "#ABBA6F", + "PreprocessorColor": "#FFAFC0", + "CharactersColor": "#ABBA6F", + "EnableSyntaxHighlighting": true, + "ApplySmartIndentWhileTyping": true + }, + "Cpp": { + "KeywordsColor": "#F69D74", + "CommentsColor": "#BEB19E", + "StringsColor": "#ABBA6F", + "PreprocessorColor": "#FFAFC0", + "CharactersColor": "#ABBA6F", + "EnableSyntaxHighlighting": true, + "ApplySmartIndentWhileTyping": true + }, + "XML": { + "AttributeNameColor": "#71C0B6", + "AttributeValueColor": "#ABBA6F", + "CDATASectionColor": "#ABBA6F", + "CharacterColor": "#ABBA6F", + "CommentColor": "#BEB19E", + "DOCTYPEDeclarationColor": "#FFAFC0", + "ErrorColor": "#FCA8A1", + "TagColor": "#F69D74", + "ProcessingInstructionColor": "#FFAFC0", + "EnableSyntaxHighlighting": true, + "ApplySmartIndentWhileTyping": true + }, + "HTML": { + "AttributeNameColor": "#71C0B6", + "AttributeValueColor": "#ABBA6F", + "CDATASectionColor": "#ABBA6F", + "CharacterColor": "#ABBA6F", + "CommentColor": "#BEB19E", + "DOCTYPEDeclarationColor": "#FFAFC0", + "ErrorColor": "#FCA8A1", + "TagColor": "#F69D74", + "ProcessingInstructionColor": "#FFAFC0", + "EnableSyntaxHighlighting": true, + "ApplySmartIndentWhileTyping": true + }, + "Simscape": { + "KeywordsColor": "#F69D74", + "CommentsColor": "#BEB19E", + "StringsColor": "#ABBA6F", + "UnterminatedStringsColor": "#FCA8A1", + "EnableSyntaxHighlighting": true, + "ApplySmartIndentWhileTyping": true + }, + "Java": { + "KeywordsColor": "#F69D74", + "CommentsColor": "#BEB19E", + "StringsColor": "#ABBA6F", + "CharactersColor": "#ABBA6F", + "EnableSyntaxHighlighting": true, + "ApplySmartIndentWhileTyping": true + }, + "Javascript": { + "KeywordsColor": "#F69D74", + "CommentsColor": "#BEB19E", + "StringsColor": "#ABBA6F", + "EnableSyntaxHighlighting": true, + "ApplySmartIndentWhileTyping": true + }, + "Markdown": { + "HeadingsColor": "#FFE8A1", + "HorizontalRuleColor": "#ECB4D8", + "ListsColor": "#F69D74", + "BoldColor": "#FFE8A1", + "ItalicColor": "#FFE8A1", + "LinksColor": "#E9B56A", + "CodeBlocksColor": "#FFE8A1", + "CommentsColor": "#BEB19E", + "BlockQuotesColor": "#BEB19E", + "HTMLColor": "#E9B56A", + "EnableSyntaxHighlighting": true + }, + "Typescript": { + "KeywordsColor": "#F69D74", + "StringsColor": "#ABBA6F", + "CommentsColor": "#BEB19E", + "EnableSyntaxHighlighting": true, + "ApplySmartIndentWhileTyping": true + }, + "JSON": { + "KeywordsColor": "#F69D74", + "StringsColor": "#ABBA6F", + "CommentsColor": "#BEB19E", + "EnableSyntaxHighlighting": true, + "ApplySmartIndentWhileTyping": true + }, + "Python": { + "KeywordsColor": "#F69D74", + "StringsColor": "#ABBA6F", + "CommentsColor": "#BEB19E", + "ErrorColor": "#FCA8A1", + "EnableSyntaxHighlighting": true, + "ApplySmartIndentWhileTyping": true + }, + "YAML": { + "KeysColor": "#F69D74", + "StringsColor": "#ABBA6F", + "CommentsColor": "#BEB19E", + "NumbersAndKeywordsColor": "#ECB4D8", + "EnableSyntaxHighlighting": true, + "ApplySmartIndentWhileTyping": true + }, + "TLC": { + "CommandsColor": "#F69D74", + "CommentsColor": "#BEB19E", + "CStringsColor": "#ABBA6F", + "MacroColor": "#FFAFC0", + "EnableSyntaxHighlighting": true, + "ApplySmartIndentWhileTyping": true + }, + "Verilog": { + "KeywordsColor": "#F69D74", + "CommentsColor": "#BEB19E", + "StringsColor": "#ABBA6F", + "OperatorsColor": "#ECB4D8", + "EnableSyntaxHighlighting": true + }, + "VHDL": { + "KeywordsColor": "#F69D74", + "CommentsColor": "#BEB19E", + "StringsColor": "#ABBA6F", + "OperatorsColor": "#ECB4D8", + "EnableSyntaxHighlighting": true + } + } +} diff --git a/editors/matlab/shared/schemes/Zacess Warm Light.json b/editors/matlab/shared/schemes/Zacess Warm Light.json new file mode 100644 index 0000000..3fefff8 --- /dev/null +++ b/editors/matlab/shared/schemes/Zacess Warm Light.json @@ -0,0 +1,173 @@ +{ + "DesktopTheme": "Light", + "TextColor": "#342410", + "BackgroundColor": "#F4EAD5", + "HighlightCurrentLine": true, + "HighlightCurrentLineColor": "#D0CEC0", + "ShowRightHandTextLimitLine": true, + "RightHandTextLimitLineColor": "#8A7E71", + "MATLABSyntaxHighlightingColors": { + "KeywordsColor": "#832A01", + "CommentsColor": "#625240", + "StringsColor": "#04523A", + "UnterminatedStringsColor": "#710205", + "SystemCommandsColor": "#760244", + "ValidationSectionsColor": "#045247", + "SyntaxErrorsColor": "#710205", + "EnableSyntaxHighlighting": true, + "ApplySmartIndentWhileTyping": true + }, + "MATLABOutputColors": { + "ErrorTextColor": "#710205", + "WarningTextColor": "#962B70", + "HyperlinksInCommandWindowColor": "#6D3B02" + }, + "ProgrammingTools": { + "CodeAnalyzerColors": { + "WarningsColor": "#962B70", + "InfoColor": "#6D3B02", + "AutofixHighlight": true, + "AutofixHighlightColor": "#D0CEC0" + }, + "VariableAndFunctionColors": { + "VariablesWithSharedScope": true, + "VariablesWithSharedScopeColor": "#045247", + "AutomaticallyHighlight": true, + "AutomaticallyHighlightColor": "#A0D2FE" + } + }, + "OtherLanguages": { + "C": { + "KeywordsColor": "#832A01", + "CommentsColor": "#625240", + "StringsColor": "#04523A", + "PreprocessorColor": "#760244", + "CharactersColor": "#04523A", + "EnableSyntaxHighlighting": true, + "ApplySmartIndentWhileTyping": true + }, + "Cpp": { + "KeywordsColor": "#832A01", + "CommentsColor": "#625240", + "StringsColor": "#04523A", + "PreprocessorColor": "#760244", + "CharactersColor": "#04523A", + "EnableSyntaxHighlighting": true, + "ApplySmartIndentWhileTyping": true + }, + "XML": { + "AttributeNameColor": "#045247", + "AttributeValueColor": "#04523A", + "CDATASectionColor": "#04523A", + "CharacterColor": "#04523A", + "CommentColor": "#625240", + "DOCTYPEDeclarationColor": "#760244", + "ErrorColor": "#710205", + "TagColor": "#832A01", + "ProcessingInstructionColor": "#760244", + "EnableSyntaxHighlighting": true, + "ApplySmartIndentWhileTyping": true + }, + "HTML": { + "AttributeNameColor": "#045247", + "AttributeValueColor": "#04523A", + "CDATASectionColor": "#04523A", + "CharacterColor": "#04523A", + "CommentColor": "#625240", + "DOCTYPEDeclarationColor": "#760244", + "ErrorColor": "#710205", + "TagColor": "#832A01", + "ProcessingInstructionColor": "#760244", + "EnableSyntaxHighlighting": true, + "ApplySmartIndentWhileTyping": true + }, + "Simscape": { + "KeywordsColor": "#832A01", + "CommentsColor": "#625240", + "StringsColor": "#04523A", + "UnterminatedStringsColor": "#710205", + "EnableSyntaxHighlighting": true, + "ApplySmartIndentWhileTyping": true + }, + "Java": { + "KeywordsColor": "#832A01", + "CommentsColor": "#625240", + "StringsColor": "#04523A", + "CharactersColor": "#04523A", + "EnableSyntaxHighlighting": true, + "ApplySmartIndentWhileTyping": true + }, + "Javascript": { + "KeywordsColor": "#832A01", + "CommentsColor": "#625240", + "StringsColor": "#04523A", + "EnableSyntaxHighlighting": true, + "ApplySmartIndentWhileTyping": true + }, + "Markdown": { + "HeadingsColor": "#744F01", + "HorizontalRuleColor": "#962B70", + "ListsColor": "#832A01", + "BoldColor": "#744F01", + "ItalicColor": "#744F01", + "LinksColor": "#6D3B02", + "CodeBlocksColor": "#744F01", + "CommentsColor": "#625240", + "BlockQuotesColor": "#625240", + "HTMLColor": "#6D3B02", + "EnableSyntaxHighlighting": true + }, + "Typescript": { + "KeywordsColor": "#832A01", + "StringsColor": "#04523A", + "CommentsColor": "#625240", + "EnableSyntaxHighlighting": true, + "ApplySmartIndentWhileTyping": true + }, + "JSON": { + "KeywordsColor": "#832A01", + "StringsColor": "#04523A", + "CommentsColor": "#625240", + "EnableSyntaxHighlighting": true, + "ApplySmartIndentWhileTyping": true + }, + "Python": { + "KeywordsColor": "#832A01", + "StringsColor": "#04523A", + "CommentsColor": "#625240", + "ErrorColor": "#710205", + "EnableSyntaxHighlighting": true, + "ApplySmartIndentWhileTyping": true + }, + "YAML": { + "KeysColor": "#832A01", + "StringsColor": "#04523A", + "CommentsColor": "#625240", + "NumbersAndKeywordsColor": "#962B70", + "EnableSyntaxHighlighting": true, + "ApplySmartIndentWhileTyping": true + }, + "TLC": { + "CommandsColor": "#832A01", + "CommentsColor": "#625240", + "CStringsColor": "#04523A", + "MacroColor": "#760244", + "EnableSyntaxHighlighting": true, + "ApplySmartIndentWhileTyping": true + }, + "Verilog": { + "KeywordsColor": "#832A01", + "CommentsColor": "#625240", + "StringsColor": "#04523A", + "OperatorsColor": "#962B70", + "EnableSyntaxHighlighting": true + }, + "VHDL": { + "KeywordsColor": "#832A01", + "CommentsColor": "#625240", + "StringsColor": "#04523A", + "OperatorsColor": "#962B70", + "EnableSyntaxHighlighting": true + } + } +} diff --git a/editors/matlab/shared/schemes/Zacess Yellow on Black.json b/editors/matlab/shared/schemes/Zacess Yellow on Black.json index 9405e42..ab3b986 100644 --- a/editors/matlab/shared/schemes/Zacess Yellow on Black.json +++ b/editors/matlab/shared/schemes/Zacess Yellow on Black.json @@ -3,7 +3,7 @@ "TextColor": "#FFEB3B", "BackgroundColor": "#000000", "HighlightCurrentLine": true, - "HighlightCurrentLineColor": "#141414", + "HighlightCurrentLineColor": "#262626", "ShowRightHandTextLimitLine": true, "RightHandTextLimitLineColor": "#8C8C8C", "MATLABSyntaxHighlightingColors": { @@ -27,7 +27,7 @@ "WarningsColor": "#FFA77E", "InfoColor": "#1BE4ED", "AutofixHighlight": true, - "AutofixHighlightColor": "#141414" + "AutofixHighlightColor": "#262626" }, "VariableAndFunctionColors": { "VariablesWithSharedScope": true, diff --git a/editors/matlab/shared/themes/Zacess Cream.json b/editors/matlab/shared/themes/Zacess Cream.json index 5be48e1..2c0f65e 100644 --- a/editors/matlab/shared/themes/Zacess Cream.json +++ b/editors/matlab/shared/themes/Zacess Cream.json @@ -73,9 +73,9 @@ 255 ], "matlab.colors.programmingtools.AutofixHighlightColor": [ - 243, - 234, - 210 + 200, + 218, + 221 ] } } diff --git a/editors/matlab/shared/themes/Zacess Dark.json b/editors/matlab/shared/themes/Zacess Dark.json index 18b2e22..fe9e1de 100644 --- a/editors/matlab/shared/themes/Zacess Dark.json +++ b/editors/matlab/shared/themes/Zacess Dark.json @@ -73,9 +73,9 @@ 105 ], "matlab.colors.programmingtools.AutofixHighlightColor": [ - 31, - 31, - 31 + 47, + 47, + 47 ] } } diff --git a/editors/matlab/shared/themes/Zacess Deep Contrast Dark.json b/editors/matlab/shared/themes/Zacess Deep Contrast Dark.json index 46bd799..d47af9d 100644 --- a/editors/matlab/shared/themes/Zacess Deep Contrast Dark.json +++ b/editors/matlab/shared/themes/Zacess Deep Contrast Dark.json @@ -73,9 +73,9 @@ 255 ], "matlab.colors.programmingtools.AutofixHighlightColor": [ - 20, - 20, - 20 + 38, + 38, + 38 ] } } diff --git a/editors/matlab/shared/themes/Zacess Deep Contrast Light.json b/editors/matlab/shared/themes/Zacess Deep Contrast Light.json index d933dd3..fe2abbe 100644 --- a/editors/matlab/shared/themes/Zacess Deep Contrast Light.json +++ b/editors/matlab/shared/themes/Zacess Deep Contrast Light.json @@ -73,9 +73,9 @@ 152 ], "matlab.colors.programmingtools.AutofixHighlightColor": [ - 245, - 245, - 245 + 200, + 222, + 189 ] } } diff --git a/editors/matlab/shared/themes/Zacess High Contrast Dark.json b/editors/matlab/shared/themes/Zacess High Contrast Dark.json index 4b5faf2..9537a65 100644 --- a/editors/matlab/shared/themes/Zacess High Contrast Dark.json +++ b/editors/matlab/shared/themes/Zacess High Contrast Dark.json @@ -73,9 +73,9 @@ 255 ], "matlab.colors.programmingtools.AutofixHighlightColor": [ - 26, - 26, - 26 + 38, + 38, + 38 ] } } diff --git a/editors/matlab/shared/themes/Zacess High Contrast Light.json b/editors/matlab/shared/themes/Zacess High Contrast Light.json index a4ec926..0bbd0c4 100644 --- a/editors/matlab/shared/themes/Zacess High Contrast Light.json +++ b/editors/matlab/shared/themes/Zacess High Contrast Light.json @@ -73,9 +73,9 @@ 94 ], "matlab.colors.programmingtools.AutofixHighlightColor": [ - 242, - 242, - 242 + 195, + 229, + 254 ] } } diff --git a/editors/matlab/shared/themes/Zacess Light.json b/editors/matlab/shared/themes/Zacess Light.json index 968e3c2..ea72ad1 100644 --- a/editors/matlab/shared/themes/Zacess Light.json +++ b/editors/matlab/shared/themes/Zacess Light.json @@ -73,9 +73,9 @@ 255 ], "matlab.colors.programmingtools.AutofixHighlightColor": [ - 240, - 240, - 240 + 214, + 221, + 232 ] } } diff --git a/editors/matlab/shared/themes/Zacess Warm Dark.json b/editors/matlab/shared/themes/Zacess Warm Dark.json new file mode 100644 index 0000000..260ba13 --- /dev/null +++ b/editors/matlab/shared/themes/Zacess Warm Dark.json @@ -0,0 +1,81 @@ +{ + "name": "Zacess Warm Dark", + "settings": { + "matlab.appearance.MATLABTheme": "Dark", + "matlab.colors.KeywordColor": [ + 246, + 157, + 116 + ], + "matlab.colors.CommentColor": [ + 190, + 177, + 158 + ], + "matlab.colors.StringColor": [ + 171, + 186, + 111 + ], + "matlab.colors.SystemCommandColor": [ + 255, + 175, + 192 + ], + "matlab.colors.ValidationSectionColor": [ + 113, + 192, + 182 + ], + "matlab.colors.UnterminatedStringColor": [ + 252, + 168, + 161 + ], + "matlab.colors.SyntaxErrorColor": [ + 252, + 168, + 161 + ], + "matlab.colors.commandwindow.ErrorColor": [ + 252, + 168, + 161 + ], + "matlab.colors.commandwindow.WarningColor": [ + 236, + 180, + 216 + ], + "matlab.colors.commandwindow.HyperlinkColor": [ + 233, + 181, + 106 + ], + "matlab.colors.programmingtools.CodeAnalyzerWarningColor": [ + 236, + 180, + 216 + ], + "matlab.colors.programmingtools.CodeAnalyzerInfoColor": [ + 233, + 181, + 106 + ], + "matlab.colors.programmingtools.VariablesWithSharedScopeColor": [ + 113, + 192, + 182 + ], + "matlab.colors.programmingtools.VariableHighlightColor": [ + 44, + 70, + 92 + ], + "matlab.colors.programmingtools.AutofixHighlightColor": [ + 54, + 50, + 45 + ] + } +} diff --git a/editors/matlab/shared/themes/Zacess Warm Light.json b/editors/matlab/shared/themes/Zacess Warm Light.json new file mode 100644 index 0000000..7d676b4 --- /dev/null +++ b/editors/matlab/shared/themes/Zacess Warm Light.json @@ -0,0 +1,81 @@ +{ + "name": "Zacess Warm Light", + "settings": { + "matlab.appearance.MATLABTheme": "Light", + "matlab.colors.KeywordColor": [ + 131, + 42, + 1 + ], + "matlab.colors.CommentColor": [ + 98, + 82, + 64 + ], + "matlab.colors.StringColor": [ + 4, + 82, + 58 + ], + "matlab.colors.SystemCommandColor": [ + 118, + 2, + 68 + ], + "matlab.colors.ValidationSectionColor": [ + 4, + 82, + 71 + ], + "matlab.colors.UnterminatedStringColor": [ + 113, + 2, + 5 + ], + "matlab.colors.SyntaxErrorColor": [ + 113, + 2, + 5 + ], + "matlab.colors.commandwindow.ErrorColor": [ + 113, + 2, + 5 + ], + "matlab.colors.commandwindow.WarningColor": [ + 150, + 43, + 112 + ], + "matlab.colors.commandwindow.HyperlinkColor": [ + 109, + 59, + 2 + ], + "matlab.colors.programmingtools.CodeAnalyzerWarningColor": [ + 150, + 43, + 112 + ], + "matlab.colors.programmingtools.CodeAnalyzerInfoColor": [ + 109, + 59, + 2 + ], + "matlab.colors.programmingtools.VariablesWithSharedScopeColor": [ + 4, + 82, + 71 + ], + "matlab.colors.programmingtools.VariableHighlightColor": [ + 160, + 210, + 254 + ], + "matlab.colors.programmingtools.AutofixHighlightColor": [ + 208, + 206, + 192 + ] + } +} diff --git a/editors/matlab/shared/themes/Zacess Yellow on Black.json b/editors/matlab/shared/themes/Zacess Yellow on Black.json index e543cb5..200b2fe 100644 --- a/editors/matlab/shared/themes/Zacess Yellow on Black.json +++ b/editors/matlab/shared/themes/Zacess Yellow on Black.json @@ -73,9 +73,9 @@ 196 ], "matlab.colors.programmingtools.AutofixHighlightColor": [ - 20, - 20, - 20 + 38, + 38, + 38 ] } } diff --git a/editors/matlab/windows/apply.ps1 b/editors/matlab/windows/apply.ps1 index 1d3fb53..1935793 100644 --- a/editors/matlab/windows/apply.ps1 +++ b/editors/matlab/windows/apply.ps1 @@ -1,8 +1,9 @@ # sets MATLAB's desktop theme, syntax colours and code font to one of the Zacess themes. # usage: .\apply.ps1 [-Theme ] [-Matlab ] [-Pending] # -# -Theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# -Theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # ..\shared\zacess_apply.m writes the theme and fonts through MATLAB's own settings API, which @@ -36,12 +37,13 @@ $themeNames = [ordered]@{ 'hc-light' = 'Zacess High Contrast Light'; 'high-contrast-light' = 'Zacess High Contrast Light' 'dark' = 'Zacess Dark'; 'light' = 'Zacess Light'; 'cream' = 'Zacess Cream' 'yellow' = 'Zacess Yellow on Black'; 'yellow-on-black' = 'Zacess Yellow on Black' + 'warm-dark' = 'Zacess Warm Dark'; 'warm-light' = 'Zacess Warm Light' } $key = ($Theme.ToLowerInvariant() -replace '^zacess[ -]', '') -replace ' ', '-' $name = $themeNames[$key] if (-not $name) { [Console]::Error.WriteLine("Unknown theme: $Theme") - [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow.') + [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light.') exit 1 } diff --git a/editors/microchip-studio/ACCESSIBILITY.md b/editors/microchip-studio/ACCESSIBILITY.md index 746ae2d..733b0fc 100644 --- a/editors/microchip-studio/ACCESSIBILITY.md +++ b/editors/microchip-studio/ACCESSIBILITY.md @@ -5,7 +5,7 @@ Larger text in a high contrast theme, with C macros kept apart from function cal ## Vision - Editor and output window text is GeistMono Nerd Font at 14 points, larger than Microchip Studio's default 10. -- The theme is Zacess Deep Contrast Dark from [Zacess Themes](https://github.com/zacesshq/themes) 0.5.0: white on pure black with deep, fully saturated colours. The window chrome uses the Dark environment theme to match. All eight Zacess themes are in `themes/`; `-Theme` imports any of them. Measured contrast is in the [Zacess Themes accessibility statement](https://github.com/zacesshq/themes/blob/main/ACCESSIBILITY.md). +- The theme is Zacess Deep Contrast Dark from [Zacess Themes](https://github.com/zacesshq/themes) 1.0.0: white on pure black with deep, fully saturated colours. The window chrome uses the Dark environment theme to match. All ten Zacess themes are in `themes/`; `-Theme` imports any of them. Measured contrast is in the [Zacess Themes accessibility statement](https://github.com/zacesshq/themes/blob/main/ACCESSIBILITY.md). - Macros and directives have their own colour, separate from functions and keywords in every theme, so a register macro is never confused with a function call. - Colour is never the only signal: keywords, directives and macros are also bold. - **Tools > Options > Environment > Fonts and Colors** changes any font or colour from the keyboard. diff --git a/editors/microchip-studio/README.md b/editors/microchip-studio/README.md index 36e60bc..0c0422c 100644 --- a/editors/microchip-studio/README.md +++ b/editors/microchip-studio/README.md @@ -1,6 +1,6 @@ # microchip-studio -Microchip Studio 7 fonts and colours: the eight Zacess themes converted for it, with Geist Mono in the editor and the output windows. +Microchip Studio 7 fonts and colours: the ten Zacess themes converted for it, with Geist Mono in the editor and the output windows. Microchip Studio (formerly Atmel Studio) is the Visual Studio 2015 shell with Microchip's AVR and SAM tools. It is Windows only. On macOS and Linux the route is MPLAB X, which is not set up here yet. @@ -21,7 +21,7 @@ Comments are not italic: Visual Studio 2015 has no italic style. [`themes/`](themes/) holds one `.vssettings` file per Zacess theme, built by [`scripts/build-themes.py`](scripts/build-themes.py) from the Zacess Themes `.vsix`. Each file holds only the Fonts and Colors category, so importing it changes nothing else. Rebuild after a Zacess Themes release: ```bash -python scripts/build-themes.py zacess-themes-0.5.0.vsix +python scripts/build-themes.py zacess-themes-1.0.0.vsix ``` ## Apply diff --git a/editors/microchip-studio/scripts/build-themes.py b/editors/microchip-studio/scripts/build-themes.py index c2f878d..edc399b 100644 --- a/editors/microchip-studio/scripts/build-themes.py +++ b/editors/microchip-studio/scripts/build-themes.py @@ -24,6 +24,8 @@ "zacess-light": ("Zacess Light", "light"), "zacess-cream": ("Zacess Cream", "light"), "zacess-yellow-on-black": ("Zacess Yellow on Black", "dark"), + "zacess-warm-dark": ("Zacess Warm Dark", "dark"), + "zacess-warm-light": ("Zacess Warm Light", "light"), } # the Visual Studio 2015 environment themes the window chrome follows diff --git a/editors/microchip-studio/themes/Zacess Warm Dark.vssettings b/editors/microchip-studio/themes/Zacess Warm Dark.vssettings new file mode 100644 index 0000000..232f2f6 --- /dev/null +++ b/editors/microchip-studio/themes/Zacess Warm Dark.vssettings @@ -0,0 +1,3 @@ + + +2 diff --git a/editors/microchip-studio/themes/Zacess Warm Light.vssettings b/editors/microchip-studio/themes/Zacess Warm Light.vssettings new file mode 100644 index 0000000..4db4412 --- /dev/null +++ b/editors/microchip-studio/themes/Zacess Warm Light.vssettings @@ -0,0 +1,3 @@ + + +2 diff --git a/editors/microchip-studio/windows/apply.ps1 b/editors/microchip-studio/windows/apply.ps1 index eb29918..9120927 100644 --- a/editors/microchip-studio/windows/apply.ps1 +++ b/editors/microchip-studio/windows/apply.ps1 @@ -1,8 +1,9 @@ # imports one Zacess theme (fonts and colours) into Microchip Studio 7. # usage: .\apply.ps1 [-Theme ] [-Studio ] [-Close] [-Pending] # -# -Theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# -Theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # Microchip Studio reads colours only through its own Import and Export Settings command, so the @@ -33,12 +34,13 @@ $themeNames = [ordered]@{ 'hc-light' = @('Zacess High Contrast Light', 'light'); 'high-contrast-light' = @('Zacess High Contrast Light', 'light') 'dark' = @('Zacess Dark', 'dark'); 'light' = @('Zacess Light', 'light'); 'cream' = @('Zacess Cream', 'light') 'yellow' = @('Zacess Yellow on Black', 'dark'); 'yellow-on-black' = @('Zacess Yellow on Black', 'dark') + 'warm-dark' = @('Zacess Warm Dark', 'dark'); 'warm-light' = @('Zacess Warm Light', 'light') } $key = ($Theme.ToLowerInvariant() -replace '^zacess[ -]', '') -replace ' ', '-' $picked = $themeNames[$key] if (-not $picked) { [Console]::Error.WriteLine("Unknown theme: $Theme") - [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow.') + [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light.') exit 1 } $name, $mode = $picked diff --git a/editors/nano/ACCESSIBILITY.md b/editors/nano/ACCESSIBILITY.md index ba6bad0..50cb871 100644 --- a/editors/nano/ACCESSIBILITY.md +++ b/editors/nano/ACCESSIBILITY.md @@ -4,7 +4,7 @@ ## Contrast -Every interface colour comes from the Zacess palette through [`build-themes.py`](../../terminal/terminal/scripts/build-themes.py). nano takes a colour as three hex digits and shows the nearest of the 216 colours in the terminal's colour cube, so the generator measures each pair as nano shows it rather than as the palette has it. It stops if a text colour falls under 4.5:1. The lowest text contrast across the eight themes is 5.4:1 (the error bar on the light themes) and the title bar keeps at least 6.45:1. +Every interface colour comes from the Zacess palette through [`build-themes.py`](../../terminal/terminal/scripts/build-themes.py). nano takes a colour as three hex digits and shows the nearest of the 216 colours in the terminal's colour cube, so the generator measures each pair as nano shows it rather than as the palette has it. It stops if a text colour falls under 4.5:1. The lowest text contrast across the ten themes is 5.4:1 (the error bar on the light themes) and the title bar keeps at least 6.45:1. | What | Colour slot | Floor | | --- | --- | --- | diff --git a/editors/nano/README.md b/editors/nano/README.md index 8374eb9..5f03827 100644 --- a/editors/nano/README.md +++ b/editors/nano/README.md @@ -1,6 +1,6 @@ # nano -My nano settings: one shared `nanorc` for GNU nano on every machine, VS Code's keys where nano can take them and the eight Zacess themes, switched by `zt` like every other editor. nano's own rc file is written by `zt` per machine rather than linked, for the reasons under [Themes](#themes). +My nano settings: one shared `nanorc` for GNU nano on every machine, VS Code's keys where nano can take them and the ten Zacess themes, switched by `zt` like every other editor. nano's own rc file is written by `zt` per machine rather than linked, for the reasons under [Themes](#themes). ## What it sets diff --git a/editors/neovim/ACCESSIBILITY.md b/editors/neovim/ACCESSIBILITY.md index 0d31dfc..f72975a 100644 --- a/editors/neovim/ACCESSIBILITY.md +++ b/editors/neovim/ACCESSIBILITY.md @@ -7,7 +7,7 @@ The config favours a readable screen and short, consistent key sequences. Every ## Vision -- The colour scheme is `zacess-deep-contrast-dark` from [zacess.nvim](https://github.com/zacesshq/zacess.nvim) 0.12.0: white on pure black with deep, fully saturated colours, every syntax colour at 9:1 or more. All eight Zacess schemes are installed. `lua/config/theme.lua` reads the theme the `zt` command sets, so Neovim switches with the terminal and the other editors; `zt auto` makes it follow the system appearance, checked again whenever Neovim regains focus. +- The colour scheme is `zacess-deep-contrast-dark` from [zacess.nvim](https://github.com/zacesshq/zacess.nvim) 1.0.0: white on pure black with deep, fully saturated colours, every syntax colour at 9:1 or more. All ten Zacess schemes are installed. `lua/config/theme.lua` reads the theme the `zt` command sets, so Neovim switches with the terminal and the other editors; `zt auto` makes it follow the system appearance, checked again whenever Neovim regains focus. - Running `:colorscheme` by hand keeps that scheme until `:ZacessFollow` hands control back to `zt`. - Meaning never rests on colour alone. Selection, search matches, the status line mode block and menus use reverse video. Keywords and errors are bold. Diagnostics are underlined in the text. - Absolute and relative line numbers are both shown, so a motion such as `5j` needs no counting by eye. diff --git a/editors/neovim/README.md b/editors/neovim/README.md index c3f5dbf..13187df 100644 --- a/editors/neovim/README.md +++ b/editors/neovim/README.md @@ -12,11 +12,11 @@ recorded in a demo project. Each one links to a short animation of the same scen | Deep Contrast Dark | Deep Contrast Light | | --- | --- | -| [![Dark: Neovim with the high-contrast colour scheme, drawn in the terminal's Zacess Deep Contrast colours, editing a Python file, with relative line numbers and the status line at the bottom](docs/demo/neovim-dark.webp)](docs/demo/terminal-dark.gif) | [![Light: Neovim with the high-contrast colour scheme, drawn in the terminal's Zacess Deep Contrast colours, editing a Python file, with relative line numbers and the status line at the bottom](docs/demo/neovim-light.webp)](docs/demo/terminal-light.gif) | +| [![Dark: Neovim with the Zacess colour scheme editing a Python file, with relative line numbers and the status line at the bottom](docs/demo/neovim-dark.webp)](docs/demo/terminal-dark.gif) | [![Light: Neovim with the Zacess colour scheme editing a Python file, with relative line numbers and the status line at the bottom](docs/demo/neovim-light.webp)](docs/demo/terminal-light.gif) | | Yellow on Black | Cream | | --- | --- | -| [![Yellow on Black: Neovim with the high-contrast colour scheme, drawn in the terminal's Zacess Yellow on Black colours, editing a Python file, with relative line numbers and the status line at the bottom](docs/demo/neovim-yellow-on-black.webp)](docs/demo/terminal-yellow-on-black.gif) | [![Cream: Neovim with the high-contrast colour scheme, drawn in the terminal's Zacess Cream colours, editing a Python file, with relative line numbers and the status line at the bottom](docs/demo/neovim-cream.webp)](docs/demo/terminal-cream.gif) | +| [![Yellow on Black: Neovim with the Zacess colour scheme editing a Python file, with relative line numbers and the status line at the bottom](docs/demo/neovim-yellow-on-black.webp)](docs/demo/terminal-yellow-on-black.gif) | [![Cream: Neovim with the Zacess colour scheme editing a Python file, with relative line numbers and the status line at the bottom](docs/demo/neovim-cream.webp)](docs/demo/terminal-cream.gif) | The shots show the real config in a throwaway demo project, in [Zacess Themes](https://github.com/zacesshq/themes) Deep Contrast Dark and Light, Yellow on Black diff --git a/editors/neovim/docs/demo/neovim-cream.webp b/editors/neovim/docs/demo/neovim-cream.webp index 19f4b6f..96cfa28 100644 Binary files a/editors/neovim/docs/demo/neovim-cream.webp and b/editors/neovim/docs/demo/neovim-cream.webp differ diff --git a/editors/neovim/docs/demo/neovim-dark.webp b/editors/neovim/docs/demo/neovim-dark.webp index 86a053b..5263b3b 100644 Binary files a/editors/neovim/docs/demo/neovim-dark.webp and b/editors/neovim/docs/demo/neovim-dark.webp differ diff --git a/editors/neovim/docs/demo/neovim-light.webp b/editors/neovim/docs/demo/neovim-light.webp index 8d0a1a6..50b10a0 100644 Binary files a/editors/neovim/docs/demo/neovim-light.webp and b/editors/neovim/docs/demo/neovim-light.webp differ diff --git a/editors/neovim/docs/demo/neovim-yellow-on-black.webp b/editors/neovim/docs/demo/neovim-yellow-on-black.webp index c9d0ee3..cc0ba2c 100644 Binary files a/editors/neovim/docs/demo/neovim-yellow-on-black.webp and b/editors/neovim/docs/demo/neovim-yellow-on-black.webp differ diff --git a/editors/neovim/docs/demo/terminal-cream.gif b/editors/neovim/docs/demo/terminal-cream.gif index 3108da4..5acb131 100644 Binary files a/editors/neovim/docs/demo/terminal-cream.gif and b/editors/neovim/docs/demo/terminal-cream.gif differ diff --git a/editors/neovim/docs/demo/terminal-dark.gif b/editors/neovim/docs/demo/terminal-dark.gif index 2885653..2dc30f8 100644 Binary files a/editors/neovim/docs/demo/terminal-dark.gif and b/editors/neovim/docs/demo/terminal-dark.gif differ diff --git a/editors/neovim/docs/demo/terminal-light.gif b/editors/neovim/docs/demo/terminal-light.gif index 8ec3d5a..7349c46 100644 Binary files a/editors/neovim/docs/demo/terminal-light.gif and b/editors/neovim/docs/demo/terminal-light.gif differ diff --git a/editors/neovim/docs/demo/terminal-yellow-on-black.gif b/editors/neovim/docs/demo/terminal-yellow-on-black.gif index d3c00b8..c2a9b27 100644 Binary files a/editors/neovim/docs/demo/terminal-yellow-on-black.gif and b/editors/neovim/docs/demo/terminal-yellow-on-black.gif differ diff --git a/editors/neovim/guides/reference.md b/editors/neovim/guides/reference.md index 738b807..8ce422c 100644 --- a/editors/neovim/guides/reference.md +++ b/editors/neovim/guides/reference.md @@ -50,7 +50,7 @@ editing a central list. | Plugin | What it does | | --- | --- | -| `zacess.nvim` | The eight Zacess colour schemes, pinned to 0.12.0. `lua/config/theme.lua` picks one from the `zt` state file (`~/.local/state/zacess/theme`, `%LOCALAPPDATA%\zacess\theme` on Windows). With no state file it uses Zacess Deep Contrast Dark. It checks the file again on focus. `:ZacessFollow` returns to it after a manual `:colorscheme` | +| `zacess.nvim` | The ten Zacess colour schemes, pinned to 1.0.0. `lua/config/theme.lua` picks one from the `zt` state file (`~/.local/state/zacess/theme`, `%LOCALAPPDATA%\zacess\theme` on Windows). With no state file it uses Zacess Deep Contrast Dark. It checks the file again on focus. `:ZacessFollow` returns to it after a manual `:colorscheme` | | `colors/high-contrast.lua` | The earlier colour scheme (no plugin), kept for `:colorscheme high-contrast`: uses only the terminal's 16 colours | | `nvim-treesitter` | Syntax highlighting and indentation, pinned to `master`, see below | | `telescope.nvim` | Fuzzy finder, backed by `ripgrep` for grep and native fzf sort | diff --git a/editors/neovim/nvim/lazy-lock.json b/editors/neovim/nvim/lazy-lock.json index 1d59311..769d670 100644 --- a/editors/neovim/nvim/lazy-lock.json +++ b/editors/neovim/nvim/lazy-lock.json @@ -26,5 +26,5 @@ "vim-tmux-navigator": { "branch": "master", "commit": "e41c431a0c7b7388ae7ba341f01a0d217eb3a432" }, "vim-wakatime": { "branch": "master", "commit": "98cb7a8a09f8a0cb225b5955bf491ffb9860569f" }, "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }, - "zacess.nvim": { "branch": "main", "commit": "dae702696609e7747cadc00e3f299e0dae1f539f" } + "zacess.nvim": { "branch": "main", "commit": "1c38b94d58c1367db7bf754b761dc531a2da7abb" } } diff --git a/editors/neovim/nvim/lua/plugins/colorscheme.lua b/editors/neovim/nvim/lua/plugins/colorscheme.lua index 2db37b1..87c4e45 100644 --- a/editors/neovim/nvim/lua/plugins/colorscheme.lua +++ b/editors/neovim/nvim/lua/plugins/colorscheme.lua @@ -1,10 +1,10 @@ --- the eight Zacess colour schemes come from zacess.nvim, pinned to its release. config/theme.lua picks +-- the ten Zacess colour schemes come from zacess.nvim, pinned to its release. config/theme.lua picks -- one from the state file the zt command writes, Zacess Deep Contrast Dark when there is none. The -- earlier colors/high-contrast.lua stays available through :colorscheme high-contrast. return { { "zacesshq/zacess.nvim", - version = "0.12.0", + version = "1.0.0", lazy = false, priority = 1000, config = function() diff --git a/editors/nextpad-plus-plus/ACCESSIBILITY.md b/editors/nextpad-plus-plus/ACCESSIBILITY.md index 9505c62..6d0a1e3 100644 --- a/editors/nextpad-plus-plus/ACCESSIBILITY.md +++ b/editors/nextpad-plus-plus/ACCESSIBILITY.md @@ -4,8 +4,8 @@ A high contrast theme for every language Nextpad++ knows, with Geist Mono at the ## Vision -- The theme is Zacess Deep Contrast Dark from [Zacess Themes](https://github.com/zacesshq/themes) 0.5.0: white on pure black with deep, fully saturated syntax colours. All eight Zacess themes install together and any of them can be picked with `--theme` or in **Settings > Style Configurator**. -- Every token style in every language is at least 7:1 on the background in the Deep Contrast and High Contrast themes and at least 4.5:1 in the others. The current line is a visible band, as in Zacess Themes 0.12.0, with every token at least 4.5:1 over it. Line numbers pass the same floor. Selected text is drawn in its own colour on a solid block, the pair held to 4.5:1, Zacess Themes' selection rule. +- The theme is Zacess Deep Contrast Dark from [Zacess Themes](https://github.com/zacesshq/themes) 1.0.0: white on pure black with deep, fully saturated syntax colours. All ten Zacess themes install together and any of them can be picked with `--theme` or in **Settings > Style Configurator**. +- Every token style in every language is at least 7:1 on the background in the Deep Contrast and High Contrast themes and at least 4.5:1 in the others. The current line is a visible band, as in Zacess Themes 1.0.0, with every token at least 4.5:1 over it. Line numbers pass the same floor. Selected text is drawn in its own colour on a solid block, the pair held to 4.5:1, Zacess Themes' selection rule. - Colour is never the only signal: keywords and control flow are bold while comments and parameters are italic. - The text size set in the Style Configurator is kept. Only the colour and font overrides that would hide the theme are cleared. - Nextpad++ cannot follow the system light and dark setting for its editor colours, so the theme stays fixed until another one is applied. diff --git a/editors/nextpad-plus-plus/README.md b/editors/nextpad-plus-plus/README.md index 03320ef..4e29b07 100644 --- a/editors/nextpad-plus-plus/README.md +++ b/editors/nextpad-plus-plus/README.md @@ -1,6 +1,6 @@ # nextpad-plus-plus -Nextpad++ setup for macOS: the eight Zacess themes, built from the Zacess palette, with Geist Mono as the editor font. +Nextpad++ setup for macOS: the ten Zacess themes, built from the Zacess palette, with Geist Mono as the editor font. Nextpad++ is a Mac port of Notepad++ and reads the same style files: one XML file per theme with a style for every language's tokens plus the editor-wide styles. It loads extra themes from `~/.nextpad++/themes` and keeps the active one, by name, in its own preferences (`org.nextpadplusplus.mac`). It only runs on macOS, so there is no Linux or Windows script. @@ -8,8 +8,8 @@ Nextpad++ is a Mac port of Notepad++ and reads the same style files: one XML fil | Setting | Value | Why | | --- | --- | --- | -| `~/.nextpad++/themes/Zacess *.xml` | The eight Zacess themes | All eight show under **Settings > Style Configurator** | -| `NPPActiveTheme` | `Zacess Deep Contrast Dark` | The default theme. `--theme` picks any of the eight | +| `~/.nextpad++/themes/Zacess *.xml` | The ten Zacess themes | All ten show under **Settings > Style Configurator** | +| `NPPActiveTheme` | `Zacess Deep Contrast Dark` | The default theme. `--theme` picks any of the ten | | `styleFontName` | `GeistMono Nerd Font Mono` | Geist Mono, the font every editor uses | | `NPPStyleOverrides` | The Default Style's colour and font entries removed | An override made in the Style Configurator sits on top of every theme and would hide it | @@ -17,7 +17,7 @@ Every other override stays, the text size included. ## The themes -[`scripts/build-themes.py`](scripts/build-themes.py) builds [`shared/themes/`](shared/themes/) from the palette of [Zacess Themes](https://github.com/zacesshq/themes) 0.12.0 and the `stylers.model.xml` that ships inside Nextpad++, which lists every language and token style the app knows. Each style takes a palette colour by what its name says it is: a comment, a string, a number, a keyword, a type, a function, an operator, a tag and so on. Bold and italic follow the palette (keywords and control flow bold, comments and parameters italic). Every style sits on the theme's own background. A newer Nextpad++ with more languages is covered by running the build again. +[`scripts/build-themes.py`](scripts/build-themes.py) builds [`shared/themes/`](shared/themes/) from the palette of [Zacess Themes](https://github.com/zacesshq/themes) 1.0.0 and the `stylers.model.xml` that ships inside Nextpad++, which lists every language and token style the app knows. Each style takes a palette colour by what its name says it is: a comment, a string, a number, a keyword, a type, a function, an operator, a tag and so on. Bold and italic follow the palette (keywords and control flow bold, comments and parameters italic). Every style sits on the theme's own background. A newer Nextpad++ with more languages is covered by running the build again. The same files work in Notepad++ on Windows, which reads the same format, so a Notepad++ setup can take them from `shared/themes/` as they are. diff --git a/editors/nextpad-plus-plus/mac/apply.sh b/editors/nextpad-plus-plus/mac/apply.sh index 38274df..4941088 100755 --- a/editors/nextpad-plus-plus/mac/apply.sh +++ b/editors/nextpad-plus-plus/mac/apply.sh @@ -1,9 +1,10 @@ #!/usr/bin/env bash -# installs the eight Zacess themes for Nextpad++ and makes one of them the active theme. +# installs the ten Zacess themes for Nextpad++ and makes one of them the active theme. # usage: apply.sh [--theme ] # -# --theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# --theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # Nextpad++ reads extra themes from ~/.nextpad++/themes and keeps the active one, by name, in its @@ -37,13 +38,15 @@ theme_name() { light) echo "Zacess Light" ;; cream) echo "Zacess Cream" ;; yellow|yellow-on-black) echo "Zacess Yellow on Black" ;; + warm-dark) echo "Zacess Warm Dark" ;; + warm-light) echo "Zacess Warm Light" ;; *) return 1 ;; esac } if ! name="$(theme_name "$theme")"; then echo "Unknown theme: $theme" >&2 - echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow." >&2 + echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light." >&2 exit 1 fi diff --git a/editors/nextpad-plus-plus/scripts/build-themes.py b/editors/nextpad-plus-plus/scripts/build-themes.py index 98ad4aa..e85012d 100644 --- a/editors/nextpad-plus-plus/scripts/build-themes.py +++ b/editors/nextpad-plus-plus/scripts/build-themes.py @@ -1,4 +1,4 @@ -"""Builds the eight Zacess themes for Nextpad++ in shared/themes from the Zacess palette. +"""Builds the ten Zacess themes for Nextpad++ in shared/themes from the Zacess palette. usage: python3 scripts/build-themes.py [--model stylers.model.xml] [palette.json] @@ -21,11 +21,11 @@ import urllib.request import xml.etree.ElementTree as ET -PALETTE_URL = "https://raw.githubusercontent.com/zacesshq/themes/v0.12.0/palette/zacess.json" -PALETTE_SHA256 = "d352781fec89796622c0372fc046b588f092483007960204981c9dcb8c28d1f4" +PALETTE_URL = "https://raw.githubusercontent.com/zacesshq/themes/v1.0.0/palette/zacess.json" +PALETTE_SHA256 = "7fd99f1a321df8270c32fa1eac2a6d27dbf5fc3bdf923756a2a8bc52669607a6" MODEL = pathlib.Path("/Applications/Nextpad++.app/Contents/Resources/stylers.model.xml") ORDER = ["deep-contrast-dark", "deep-contrast-light", "high-contrast-dark", "high-contrast-light", - "dark", "light", "cream", "yellow-on-black"] + "dark", "light", "cream", "yellow-on-black", "warm-dark", "warm-light"] FONT = "GeistMono Nerd Font Mono" # the first rule whose pattern matches a style's name decides its token, so the narrow names @@ -171,7 +171,7 @@ def main(): styles = {name: token["style"] for name, token in palette["tokens"].items()} themes = {t["id"]: t for t in palette["themes"]} if sorted(themes) != sorted(ORDER): - sys.exit("the palette does not hold the eight expected Zacess themes") + sys.exit("the palette does not hold the ten expected Zacess themes") target = pathlib.Path(__file__).resolve().parent.parent / "shared" / "themes" target.mkdir(parents=True, exist_ok=True) for theme_id in ORDER: diff --git a/editors/nextpad-plus-plus/scripts/validate.py b/editors/nextpad-plus-plus/scripts/validate.py index 37ae013..a64b25b 100644 --- a/editors/nextpad-plus-plus/scripts/validate.py +++ b/editors/nextpad-plus-plus/scripts/validate.py @@ -1,6 +1,6 @@ """Checks the Nextpad++ folder without Nextpad++: run from anywhere, exits non-zero on a problem. -- shared/themes holds the eight Zacess themes as Notepad++ style files that parse +- shared/themes holds the ten Zacess themes as Notepad++ style files that parse - every style's text colour and the line numbers are at least 7:1 on the editor background in the Deep Contrast and High Contrast themes and at least 4.5:1 in the others - every style is at least 4.5:1 on the current line, the rule Zacess Themes 0.6.0 sets for syntax @@ -19,7 +19,8 @@ NAMES = {"deep-contrast-dark": "Zacess Deep Contrast Dark", "deep-contrast-light": "Zacess Deep Contrast Light", "high-contrast-dark": "Zacess High Contrast Dark", "high-contrast-light": "Zacess High Contrast Light", "dark": "Zacess Dark", "light": "Zacess Light", "cream": "Zacess Cream", - "yellow-on-black": "Zacess Yellow on Black"} + "yellow-on-black": "Zacess Yellow on Black", "warm-dark": "Zacess Warm Dark", + "warm-light": "Zacess Warm Light"} FONT = "GeistMono Nerd Font Mono" diff --git a/editors/nextpad-plus-plus/shared/themes/Zacess Cream.xml b/editors/nextpad-plus-plus/shared/themes/Zacess Cream.xml index 2eef85c..115e229 100644 --- a/editors/nextpad-plus-plus/shared/themes/Zacess Cream.xml +++ b/editors/nextpad-plus-plus/shared/themes/Zacess Cream.xml @@ -1800,7 +1800,7 @@ - + diff --git a/editors/nextpad-plus-plus/shared/themes/Zacess Dark.xml b/editors/nextpad-plus-plus/shared/themes/Zacess Dark.xml index b726f1e..45dc171 100644 --- a/editors/nextpad-plus-plus/shared/themes/Zacess Dark.xml +++ b/editors/nextpad-plus-plus/shared/themes/Zacess Dark.xml @@ -1800,7 +1800,7 @@ - + diff --git a/editors/nextpad-plus-plus/shared/themes/Zacess Deep Contrast Light.xml b/editors/nextpad-plus-plus/shared/themes/Zacess Deep Contrast Light.xml index 50ed39a..b4cc164 100644 --- a/editors/nextpad-plus-plus/shared/themes/Zacess Deep Contrast Light.xml +++ b/editors/nextpad-plus-plus/shared/themes/Zacess Deep Contrast Light.xml @@ -1800,7 +1800,7 @@ - + diff --git a/editors/nextpad-plus-plus/shared/themes/Zacess High Contrast Light.xml b/editors/nextpad-plus-plus/shared/themes/Zacess High Contrast Light.xml index bb4b08b..b4cf77a 100644 --- a/editors/nextpad-plus-plus/shared/themes/Zacess High Contrast Light.xml +++ b/editors/nextpad-plus-plus/shared/themes/Zacess High Contrast Light.xml @@ -1800,7 +1800,7 @@ - + diff --git a/editors/nextpad-plus-plus/shared/themes/Zacess Light.xml b/editors/nextpad-plus-plus/shared/themes/Zacess Light.xml index 49fad29..35034a8 100644 --- a/editors/nextpad-plus-plus/shared/themes/Zacess Light.xml +++ b/editors/nextpad-plus-plus/shared/themes/Zacess Light.xml @@ -1800,7 +1800,7 @@ - + diff --git a/editors/nextpad-plus-plus/shared/themes/Zacess Warm Dark.xml b/editors/nextpad-plus-plus/shared/themes/Zacess Warm Dark.xml new file mode 100644 index 0000000..854a42c --- /dev/null +++ b/editors/nextpad-plus-plus/shared/themes/Zacess Warm Dark.xml @@ -0,0 +1,1832 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/editors/nextpad-plus-plus/shared/themes/Zacess Warm Light.xml b/editors/nextpad-plus-plus/shared/themes/Zacess Warm Light.xml new file mode 100644 index 0000000..114f733 --- /dev/null +++ b/editors/nextpad-plus-plus/shared/themes/Zacess Warm Light.xml @@ -0,0 +1,1832 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/editors/notepad-plus-plus/ACCESSIBILITY.md b/editors/notepad-plus-plus/ACCESSIBILITY.md index 584ce82..5a6a662 100644 --- a/editors/notepad-plus-plus/ACCESSIBILITY.md +++ b/editors/notepad-plus-plus/ACCESSIBILITY.md @@ -5,7 +5,7 @@ A high contrast editor and window, so Notepad++ reads like the other editors. ## Vision - Editor text is GeistMono NF at 14 points. -- The default is Zacess Deep Contrast Dark with Notepad++'s dark mode, so menus, tabs and dialogs are dark too. All eight Zacess themes are available, light ones included, from **Settings > Style Configurator**. Measured contrast is in the [Zacess Themes accessibility statement](https://github.com/zacesshq/themes/blob/main/ACCESSIBILITY.md). +- The default is Zacess Deep Contrast Dark with Notepad++'s dark mode, so menus, tabs and dialogs are dark too. All ten Zacess themes are available, light ones included, from **Settings > Style Configurator**. Measured contrast is in the [Zacess Themes accessibility statement](https://github.com/zacesshq/themes/blob/main/ACCESSIBILITY.md). - Keywords are bold as well as coloured, so colour is never the only signal. ## Feedback wanted diff --git a/editors/notepad-plus-plus/README.md b/editors/notepad-plus-plus/README.md index 4da91c2..7092e35 100644 --- a/editors/notepad-plus-plus/README.md +++ b/editors/notepad-plus-plus/README.md @@ -1,12 +1,12 @@ # notepad-plus-plus -Notepad++ setup: the eight Zacess themes with Geist Mono, used together with Notepad++'s own dark mode. Notepad++ runs on Windows only. On macOS, [Nextpad++](../nextpad-plus-plus/) reads the same theme format. +Notepad++ setup: the ten Zacess themes with Geist Mono, used together with Notepad++'s own dark mode. Notepad++ runs on Windows only. On macOS, [Nextpad++](../nextpad-plus-plus/) reads the same theme format. ## What it sets | Setting | Value | Why | | --- | --- | --- | -| `%APPDATA%\Notepad++\themes\Zacess *.xml` | The eight Zacess themes | All eight show under **Settings > Style Configurator** | +| `%APPDATA%\Notepad++\themes\Zacess *.xml` | The ten Zacess themes | All ten show under **Settings > Style Configurator** | | `DarkMode` `enable` in `config.xml` | `yes` for a dark theme, `no` for a light one | Menus, tabs and dialogs match the editor | | `DarkMode` `darkThemeName` or `lightThemeName` | The chosen theme's file | Notepad++ loads that theme whenever it switches to that mode | | Default Style font | GeistMono NF at 14 points | Geist Mono's Nerd Font build, under the short name Windows' older font lookup knows | @@ -31,8 +31,8 @@ The script prints each file and key as `added`, `changed` or `unchanged`. Runnin ## Check it worked 1. Start Notepad++. Menus and tabs are dark and the editor is black with Geist Mono in Deep Contrast Dark. -2. **Settings > Style Configurator** shows the Zacess theme selected, with all eight in the list. +2. **Settings > Style Configurator** shows the Zacess theme selected, with all ten in the list. ## Validation -[`scripts/validate.py`](scripts/validate.py) runs in CI on Linux. It checks all eight themes are well-formed XML and their Default Style and Global override use Geist Mono with valid colours. +[`scripts/validate.py`](scripts/validate.py) runs in CI on Linux. It checks all ten themes are well-formed XML and their Default Style and Global override use Geist Mono with valid colours. diff --git a/editors/notepad-plus-plus/scripts/build-themes.py b/editors/notepad-plus-plus/scripts/build-themes.py index 8c3c5e2..f412c3d 100644 --- a/editors/notepad-plus-plus/scripts/build-themes.py +++ b/editors/notepad-plus-plus/scripts/build-themes.py @@ -25,6 +25,8 @@ "zacess-light": ("Zacess Light", "light"), "zacess-cream": ("Zacess Cream", "light"), "zacess-yellow-on-black": ("Zacess Yellow on Black", "dark"), + "zacess-warm-dark": ("Zacess Warm Dark", "dark"), + "zacess-warm-light": ("Zacess Warm Light", "light"), } # windows looks fonts up by their GDI family name, which Nerd Fonts shortens to GeistMono NF diff --git a/editors/notepad-plus-plus/scripts/validate.py b/editors/notepad-plus-plus/scripts/validate.py index f765919..a3d0d5a 100644 --- a/editors/notepad-plus-plus/scripts/validate.py +++ b/editors/notepad-plus-plus/scripts/validate.py @@ -1,6 +1,6 @@ """Checks the Notepad++ folder without Notepad++: run from anywhere, exits non-zero on a problem. -- themes/ holds the eight Zacess themes, each well-formed XML +- themes/ holds the ten Zacess themes, each well-formed XML - each theme's Default Style and Global override use GeistMono NF with six-digit hex colours """ @@ -10,7 +10,8 @@ import xml.etree.ElementTree as ET NAMES = ["Zacess Deep Contrast Dark", "Zacess Deep Contrast Light", "Zacess High Contrast Dark", - "Zacess High Contrast Light", "Zacess Dark", "Zacess Light", "Zacess Cream", "Zacess Yellow on Black"] + "Zacess High Contrast Light", "Zacess Dark", "Zacess Light", "Zacess Cream", "Zacess Yellow on Black", + "Zacess Warm Dark", "Zacess Warm Light"] root = pathlib.Path(__file__).resolve().parent.parent problems = [] diff --git a/editors/notepad-plus-plus/themes/Zacess Warm Dark.xml b/editors/notepad-plus-plus/themes/Zacess Warm Dark.xml new file mode 100644 index 0000000..89d3f9d --- /dev/null +++ b/editors/notepad-plus-plus/themes/Zacess Warm Dark.xml @@ -0,0 +1,1847 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/editors/notepad-plus-plus/themes/Zacess Warm Light.xml b/editors/notepad-plus-plus/themes/Zacess Warm Light.xml new file mode 100644 index 0000000..60d8ac6 --- /dev/null +++ b/editors/notepad-plus-plus/themes/Zacess Warm Light.xml @@ -0,0 +1,1847 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/editors/notepad-plus-plus/windows/apply.ps1 b/editors/notepad-plus-plus/windows/apply.ps1 index dc35e76..5344b03 100644 --- a/editors/notepad-plus-plus/windows/apply.ps1 +++ b/editors/notepad-plus-plus/windows/apply.ps1 @@ -2,8 +2,9 @@ # usage: .\apply.ps1 [-Theme ] [-ConfigDir ] # (the config folder defaults to %APPDATA%\Notepad++) # -# -Theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# -Theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # the themes from ..\themes are copied into \themes. config.xml turns Notepad++'s dark @@ -24,12 +25,13 @@ $themeNames = [ordered]@{ 'hc-light' = @('Zacess High Contrast Light', 'light'); 'high-contrast-light' = @('Zacess High Contrast Light', 'light') 'dark' = @('Zacess Dark', 'dark'); 'light' = @('Zacess Light', 'light'); 'cream' = @('Zacess Cream', 'light') 'yellow' = @('Zacess Yellow on Black', 'dark'); 'yellow-on-black' = @('Zacess Yellow on Black', 'dark') + 'warm-dark' = @('Zacess Warm Dark', 'dark'); 'warm-light' = @('Zacess Warm Light', 'light') } $key = ($Theme.ToLowerInvariant() -replace '^zacess[ -]', '') -replace ' ', '-' $picked = $themeNames[$key] if (-not $picked) { [Console]::Error.WriteLine("Unknown theme: $Theme") - [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow.') + [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light.') exit 1 } $name, $mode = $picked diff --git a/editors/processing/ACCESSIBILITY.md b/editors/processing/ACCESSIBILITY.md index 06d1cc6..b7a48ee 100644 --- a/editors/processing/ACCESSIBILITY.md +++ b/editors/processing/ACCESSIBILITY.md @@ -4,7 +4,7 @@ A high contrast editor and console, line numbers at full strength and Geist Mono ## Vision -- The theme is Zacess Deep Contrast Dark from [Zacess Themes](https://github.com/zacesshq/themes) 0.5.0: white on pure black with deep, fully saturated syntax colours. All eight Zacess themes are in `shared/themes/` and any of them can be applied with `--theme`. +- The theme is Zacess Deep Contrast Dark from [Zacess Themes](https://github.com/zacesshq/themes) 1.0.0: white on pure black with deep, fully saturated syntax colours. All ten Zacess themes are in `shared/themes/` and any of them can be applied with `--theme`. - Syntax colours and interface text are at least 7:1 on what they sit on in the Deep Contrast and High Contrast themes (the current line included) and at least 4.5:1 in the others. The selection is a fill under the token's own colour, held to 4.5:1 in every theme, Zacess Themes' selection rule. - Line numbers are drawn at full strength. Processing's own themes fade them to 40 percent. - Colour is never the only signal: keywords, control flow and the `setup` and `draw` callbacks are also bold. diff --git a/editors/processing/README.md b/editors/processing/README.md index 33c11cd..3725a79 100644 --- a/editors/processing/README.md +++ b/editors/processing/README.md @@ -1,6 +1,6 @@ # processing -Processing 4 setup: Geist Mono as the editor font plus the eight Zacess themes for the editor, console and toolbar, built from the Zacess palette. +Processing 4 setup: Geist Mono as the editor font plus the ten Zacess themes for the editor, console and toolbar, built from the Zacess palette. Processing reads a theme as plain `key = value` lines. It loads its built-in theme first and then a `theme.txt` in the sketchbook folder on top, which is how a custom theme works. The apply scripts write the chosen Zacess theme there and set the editor font in `preferences.txt`. @@ -8,14 +8,14 @@ Processing reads a theme as plain `key = value` lines. It loads its built-in the | Setting | Value | Why | | --- | --- | --- | -| `/theme.txt` | Zacess Deep Contrast Dark | The default theme. `--theme` picks any of the eight | +| `/theme.txt` | Zacess Deep Contrast Dark | The default theme. `--theme` picks any of the ten | | `editor.font.family` | `GeistMono Nerd Font Mono` | Geist Mono, the font every editor uses | Every other line of `preferences.txt` stays as it was, the built-in theme choice (`theme=`) and the font size included. ## The themes -[`scripts/build-themes.py`](scripts/build-themes.py) builds [`shared/themes/`](shared/themes/) from the palette of [Zacess Themes](https://github.com/zacesshq/themes) 0.5.0, downloaded and checked against its SHA-256 digest. Every colour key Processing reads is written: the editor, the console, the tabs, the toolbar buttons, the error table and the Contribution Manager. The fonts in the theme are left to Processing. +[`scripts/build-themes.py`](scripts/build-themes.py) builds [`shared/themes/`](shared/themes/) from the palette of [Zacess Themes](https://github.com/zacesshq/themes) 1.0.0, downloaded and checked against its SHA-256 digest. Every colour key Processing reads is written: the editor, the console, the tabs, the toolbar buttons, the error table and the Contribution Manager. The fonts in the theme are left to Processing. | Processing token | Zacess colour | | --- | --- | diff --git a/editors/processing/linux/apply.sh b/editors/processing/linux/apply.sh index 20c67b1..d42ed5c 100755 --- a/editors/processing/linux/apply.sh +++ b/editors/processing/linux/apply.sh @@ -1,11 +1,12 @@ #!/usr/bin/env bash -# puts one of the eight Zacess themes in Processing's sketchbook and sets Geist Mono as its editor font. +# puts one of the ten Zacess themes in Processing's sketchbook and sets Geist Mono as its editor font. # usage: apply.sh [--theme ] [--prefs ] # (preferences.txt defaults to ~/Library/Processing on the Mac, ~/.config/processing on Linux, # then the Flathub copy) # -# --theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# --theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # Processing loads theme.txt from the sketchbook folder over whichever built-in theme is picked, @@ -42,13 +43,15 @@ theme_id() { light) echo "light" ;; cream) echo "cream" ;; yellow|yellow-on-black) echo "yellow-on-black" ;; + warm-dark) echo "warm-dark" ;; + warm-light) echo "warm-light" ;; *) return 1 ;; esac } if ! id="$(theme_id "$theme")"; then echo "Unknown theme: $theme" >&2 - echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow." >&2 + echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light." >&2 exit 1 fi diff --git a/editors/processing/mac/apply.sh b/editors/processing/mac/apply.sh index 20c67b1..d42ed5c 100755 --- a/editors/processing/mac/apply.sh +++ b/editors/processing/mac/apply.sh @@ -1,11 +1,12 @@ #!/usr/bin/env bash -# puts one of the eight Zacess themes in Processing's sketchbook and sets Geist Mono as its editor font. +# puts one of the ten Zacess themes in Processing's sketchbook and sets Geist Mono as its editor font. # usage: apply.sh [--theme ] [--prefs ] # (preferences.txt defaults to ~/Library/Processing on the Mac, ~/.config/processing on Linux, # then the Flathub copy) # -# --theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# --theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # Processing loads theme.txt from the sketchbook folder over whichever built-in theme is picked, @@ -42,13 +43,15 @@ theme_id() { light) echo "light" ;; cream) echo "cream" ;; yellow|yellow-on-black) echo "yellow-on-black" ;; + warm-dark) echo "warm-dark" ;; + warm-light) echo "warm-light" ;; *) return 1 ;; esac } if ! id="$(theme_id "$theme")"; then echo "Unknown theme: $theme" >&2 - echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow." >&2 + echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light." >&2 exit 1 fi diff --git a/editors/processing/scripts/build-themes.py b/editors/processing/scripts/build-themes.py index 79b8239..14b7b82 100644 --- a/editors/processing/scripts/build-themes.py +++ b/editors/processing/scripts/build-themes.py @@ -1,4 +1,4 @@ -"""Builds the eight Zacess themes for Processing 4 in shared/themes from the Zacess palette. +"""Builds the ten Zacess themes for Processing 4 in shared/themes from the Zacess palette. usage: python3 scripts/build-themes.py [palette.json] @@ -17,10 +17,10 @@ import sys import urllib.request -PALETTE_URL = "https://raw.githubusercontent.com/zacesshq/themes/v0.5.0/palette/zacess.json" -PALETTE_SHA256 = "4fe26dbd819605ec5a17141eb5994ef5e0cb0eb7a2fc5fab93cdc82a21cf40cf" +PALETTE_URL = "https://raw.githubusercontent.com/zacesshq/themes/v1.0.0/palette/zacess.json" +PALETTE_SHA256 = "7fd99f1a321df8270c32fa1eac2a6d27dbf5fc3bdf923756a2a8bc52669607a6" ORDER = ["deep-contrast-dark", "deep-contrast-light", "high-contrast-dark", "high-contrast-light", - "dark", "light", "cream", "yellow-on-black"] + "dark", "light", "cream", "yellow-on-black", "warm-dark", "warm-light"] # the first line marks a file as one of these themes, so the apply scripts only ever replace a # sketchbook theme.txt that they wrote themselves MARKER = "# Zacess theme for Processing" @@ -251,7 +251,7 @@ def main(): palette_styles = {name: token["style"] for name, token in palette["tokens"].items()} themes = {t["id"]: t for t in palette["themes"]} if sorted(themes) != sorted(ORDER): - sys.exit("the palette does not hold the eight expected Zacess themes") + sys.exit("the palette does not hold the ten expected Zacess themes") target = pathlib.Path(__file__).resolve().parent.parent / "shared" / "themes" target.mkdir(parents=True, exist_ok=True) for theme_id in ORDER: diff --git a/editors/processing/scripts/validate.py b/editors/processing/scripts/validate.py index dba4a8a..b57f332 100644 --- a/editors/processing/scripts/validate.py +++ b/editors/processing/scripts/validate.py @@ -1,10 +1,11 @@ """Checks the Processing folder without Processing: run from anywhere, exits non-zero on a problem. -- shared/themes holds the eight Zacess themes, each starting with the marker line the apply +- shared/themes holds the ten Zacess themes, each starting with the marker line the apply scripts look for, every line a comment or key = value and every colour a six-digit hex value - every syntax colour and the editor, console, tab, status and error table text is at least 7:1 on what it sits on in the Deep Contrast and High Contrast themes and at least 4.5:1 in the others; - the selection fill is held to 4.5:1 in every theme, Zacess Themes' own selection rule + on the current line every syntax colour is held to 4.5:1, the rule Zacess Themes 0.6.0 sets for + syntax. The selection fill is held to 4.5:1 in every theme, Zacess Themes' own selection rule - shared/preferences.txt names Geist Mono for the editor - mac/apply.sh and linux/apply.sh are the same file """ @@ -17,7 +18,7 @@ problems = [] IDS = ["deep-contrast-dark", "deep-contrast-light", "high-contrast-dark", "high-contrast-light", - "dark", "light", "cream", "yellow-on-black"] + "dark", "light", "cream", "yellow-on-black", "warm-dark", "warm-light"] MARKER = "# Zacess theme for Processing" TOKENS = [f"editor.token.{t}.style" for t in ["function1", "function2", "function3", "function4", "keyword1", "keyword2", "keyword3", @@ -85,8 +86,9 @@ def contrast(a, b): problems.append(f"{path.name}: {fg_key} or {bg_key} is missing") continue ratio = contrast(values[fg_key].split(",")[0], values[bg_key]) - # the selection is a fill under the token's own colour, held to Zacess Themes' 4.5:1 selection rule - limit = 4.5 if bg_key == "editor.selection.color" else floor + # the selection is a fill under the token's own colour, held to Zacess Themes' 4.5:1 selection rule; + # the current line band takes Zacess Themes 0.6.0's 4.5:1 rule for syntax on it + limit = 4.5 if bg_key in ("editor.selection.color", "editor.line.highlight.color") else floor if ratio < limit: problems.append(f"{path.name}: {fg_key} is {ratio:.2f}:1 on {bg_key}, below {limit}:1") diff --git a/editors/processing/shared/themes/zacess-cream.txt b/editors/processing/shared/themes/zacess-cream.txt index 422650e..38cd99f 100644 --- a/editors/processing/shared/themes/zacess-cream.txt +++ b/editors/processing/shared/themes/zacess-cream.txt @@ -56,7 +56,7 @@ status.notice.bgcolor = #E9E5DD status.error.fgcolor = #FFFFFF status.error.bgcolor = #770004 status.warning.fgcolor = #FFFFFF -status.warning.bgcolor = #513100 +status.warning.bgcolor = #803200 ## Tabs above the editor header.text.selected.color = #000000 @@ -96,7 +96,7 @@ editor.bgcolor = #FDF6E3 editor.gradient.top = #E9E5DD editor.gradient.bottom = #E9E5DD editor.line.highlight = true -editor.line.highlight.color = #F3EAD2 +editor.line.highlight.color = #C8DADD editor.caret.color = #000000 editor.selection.color = #C8A9FF editor.eol_markers = false @@ -110,11 +110,11 @@ editor.scrollbar.color = #E9E5DD editor.gutter.text.color = #000000 editor.gutter.text.active.alpha = 100 editor.gutter.text.inactive.alpha = 100 -editor.gutter.highlight.color = #F3EAD2 +editor.gutter.highlight.color = #C8DADD editor.error.underline.color = #770004 -editor.warning.underline.color = #513100 +editor.warning.underline.color = #803200 editor.column.error.color = #770004 -editor.column.warning.color = #513100 +editor.column.warning.color = #803200 ## Errors table errors.header.bgcolor = #E9E5DD @@ -127,7 +127,7 @@ errors.selection.bgcolor = #C8A9FF errors.selection.error.bgcolor = #C8A9FF errors.selection.warning.bgcolor = #C8A9FF errors.indicator.error.color = #770004 -errors.indicator.warning.color = #513100 +errors.indicator.warning.color = #803200 ## Contribution Manager manager.tab.selected.color = #FDF6E3 diff --git a/editors/processing/shared/themes/zacess-dark.txt b/editors/processing/shared/themes/zacess-dark.txt index 78166cf..9afe97f 100644 --- a/editors/processing/shared/themes/zacess-dark.txt +++ b/editors/processing/shared/themes/zacess-dark.txt @@ -56,7 +56,7 @@ status.notice.bgcolor = #232323 status.error.fgcolor = #121212 status.error.bgcolor = #FFCCC4 status.warning.fgcolor = #121212 -status.warning.bgcolor = #FFD182 +status.warning.bgcolor = #EDC071 ## Tabs above the editor header.text.selected.color = #F5F5F5 @@ -96,7 +96,7 @@ editor.bgcolor = #121212 editor.gradient.top = #232323 editor.gradient.bottom = #232323 editor.line.highlight = true -editor.line.highlight.color = #1F1F1F +editor.line.highlight.color = #2F2F2F editor.caret.color = #FFD400 editor.selection.color = #004769 editor.eol_markers = false @@ -110,11 +110,11 @@ editor.scrollbar.color = #232323 editor.gutter.text.color = #F5F5F5 editor.gutter.text.active.alpha = 100 editor.gutter.text.inactive.alpha = 100 -editor.gutter.highlight.color = #1F1F1F +editor.gutter.highlight.color = #2F2F2F editor.error.underline.color = #FFCCC4 -editor.warning.underline.color = #FFD182 +editor.warning.underline.color = #EDC071 editor.column.error.color = #FFCCC4 -editor.column.warning.color = #FFD182 +editor.column.warning.color = #EDC071 ## Errors table errors.header.bgcolor = #232323 @@ -127,7 +127,7 @@ errors.selection.bgcolor = #004769 errors.selection.error.bgcolor = #004769 errors.selection.warning.bgcolor = #004769 errors.indicator.error.color = #FFCCC4 -errors.indicator.warning.color = #FFD182 +errors.indicator.warning.color = #EDC071 ## Contribution Manager manager.tab.selected.color = #121212 diff --git a/editors/processing/shared/themes/zacess-deep-contrast-dark.txt b/editors/processing/shared/themes/zacess-deep-contrast-dark.txt index f549e0f..7b6147e 100644 --- a/editors/processing/shared/themes/zacess-deep-contrast-dark.txt +++ b/editors/processing/shared/themes/zacess-deep-contrast-dark.txt @@ -96,7 +96,7 @@ editor.bgcolor = #000000 editor.gradient.top = #0A0A0A editor.gradient.bottom = #0A0A0A editor.line.highlight = true -editor.line.highlight.color = #141414 +editor.line.highlight.color = #262626 editor.caret.color = #FFFF00 editor.selection.color = #720072 editor.eol_markers = false @@ -110,7 +110,7 @@ editor.scrollbar.color = #0A0A0A editor.gutter.text.color = #FFFF00 editor.gutter.text.active.alpha = 100 editor.gutter.text.inactive.alpha = 100 -editor.gutter.highlight.color = #141414 +editor.gutter.highlight.color = #262626 editor.error.underline.color = #FE8167 editor.warning.underline.color = #FFD370 editor.column.error.color = #FE8167 diff --git a/editors/processing/shared/themes/zacess-deep-contrast-light.txt b/editors/processing/shared/themes/zacess-deep-contrast-light.txt index 6bbbfb2..39ad1a4 100644 --- a/editors/processing/shared/themes/zacess-deep-contrast-light.txt +++ b/editors/processing/shared/themes/zacess-deep-contrast-light.txt @@ -56,7 +56,7 @@ status.notice.bgcolor = #FFFFFF status.error.fgcolor = #FFFFFF status.error.bgcolor = #AA0000 status.warning.fgcolor = #FFFFFF -status.warning.bgcolor = #674100 +status.warning.bgcolor = #642600 ## Tabs above the editor header.text.selected.color = #000000 @@ -96,7 +96,7 @@ editor.bgcolor = #FFFFFF editor.gradient.top = #FFFFFF editor.gradient.bottom = #FFFFFF editor.line.highlight = true -editor.line.highlight.color = #F5F5F5 +editor.line.highlight.color = #C8DEBD editor.caret.color = #000000 editor.selection.color = #FFBCFA editor.eol_markers = false @@ -110,11 +110,11 @@ editor.scrollbar.color = #FFFFFF editor.gutter.text.color = #000000 editor.gutter.text.active.alpha = 100 editor.gutter.text.inactive.alpha = 100 -editor.gutter.highlight.color = #F5F5F5 +editor.gutter.highlight.color = #C8DEBD editor.error.underline.color = #AA0000 -editor.warning.underline.color = #674100 +editor.warning.underline.color = #642600 editor.column.error.color = #AA0000 -editor.column.warning.color = #674100 +editor.column.warning.color = #642600 ## Errors table errors.header.bgcolor = #FFFFFF @@ -127,7 +127,7 @@ errors.selection.bgcolor = #FFBCFA errors.selection.error.bgcolor = #FFBCFA errors.selection.warning.bgcolor = #FFBCFA errors.indicator.error.color = #AA0000 -errors.indicator.warning.color = #674100 +errors.indicator.warning.color = #642600 ## Contribution Manager manager.tab.selected.color = #FFFFFF diff --git a/editors/processing/shared/themes/zacess-high-contrast-dark.txt b/editors/processing/shared/themes/zacess-high-contrast-dark.txt index 7e4761b..ad10b34 100644 --- a/editors/processing/shared/themes/zacess-high-contrast-dark.txt +++ b/editors/processing/shared/themes/zacess-high-contrast-dark.txt @@ -96,7 +96,7 @@ editor.bgcolor = #000000 editor.gradient.top = #0F0F0F editor.gradient.bottom = #0F0F0F editor.line.highlight = true -editor.line.highlight.color = #1A1A1A +editor.line.highlight.color = #262626 editor.caret.color = #F5C400 editor.selection.color = #6501AE editor.eol_markers = false @@ -110,7 +110,7 @@ editor.scrollbar.color = #0F0F0F editor.gutter.text.color = #F5C400 editor.gutter.text.active.alpha = 100 editor.gutter.text.inactive.alpha = 100 -editor.gutter.highlight.color = #1A1A1A +editor.gutter.highlight.color = #262626 editor.error.underline.color = #FF9E94 editor.warning.underline.color = #FFD28A editor.column.error.color = #FF9E94 diff --git a/editors/processing/shared/themes/zacess-high-contrast-light.txt b/editors/processing/shared/themes/zacess-high-contrast-light.txt index 923e32a..656343f 100644 --- a/editors/processing/shared/themes/zacess-high-contrast-light.txt +++ b/editors/processing/shared/themes/zacess-high-contrast-light.txt @@ -56,7 +56,7 @@ status.notice.bgcolor = #EFEFEF status.error.fgcolor = #FFFFFF status.error.bgcolor = #8B0000 status.warning.fgcolor = #FFFFFF -status.warning.bgcolor = #5A3A00 +status.warning.bgcolor = #4E1C00 ## Tabs above the editor header.text.selected.color = #000000 @@ -96,7 +96,7 @@ editor.bgcolor = #FFFFFF editor.gradient.top = #EFEFEF editor.gradient.bottom = #EFEFEF editor.line.highlight = true -editor.line.highlight.color = #F2F2F2 +editor.line.highlight.color = #C3E5FE editor.caret.color = #000000 editor.selection.color = #00D3D0 editor.eol_markers = false @@ -110,11 +110,11 @@ editor.scrollbar.color = #EFEFEF editor.gutter.text.color = #000000 editor.gutter.text.active.alpha = 100 editor.gutter.text.inactive.alpha = 100 -editor.gutter.highlight.color = #F2F2F2 +editor.gutter.highlight.color = #C3E5FE editor.error.underline.color = #8B0000 -editor.warning.underline.color = #5A3A00 +editor.warning.underline.color = #4E1C00 editor.column.error.color = #8B0000 -editor.column.warning.color = #5A3A00 +editor.column.warning.color = #4E1C00 ## Errors table errors.header.bgcolor = #EFEFEF @@ -127,7 +127,7 @@ errors.selection.bgcolor = #00D3D0 errors.selection.error.bgcolor = #00D3D0 errors.selection.warning.bgcolor = #00D3D0 errors.indicator.error.color = #8B0000 -errors.indicator.warning.color = #5A3A00 +errors.indicator.warning.color = #4E1C00 ## Contribution Manager manager.tab.selected.color = #FFFFFF diff --git a/editors/processing/shared/themes/zacess-light.txt b/editors/processing/shared/themes/zacess-light.txt index 806143b..6cbfb64 100644 --- a/editors/processing/shared/themes/zacess-light.txt +++ b/editors/processing/shared/themes/zacess-light.txt @@ -56,7 +56,7 @@ status.notice.bgcolor = #EDEDED status.error.fgcolor = #FFFFFF status.error.bgcolor = #810005 status.warning.fgcolor = #FFFFFF -status.warning.bgcolor = #583600 +status.warning.bgcolor = #843800 ## Tabs above the editor header.text.selected.color = #111111 @@ -96,7 +96,7 @@ editor.bgcolor = #FFFFFF editor.gradient.top = #EDEDED editor.gradient.bottom = #EDEDED editor.line.highlight = true -editor.line.highlight.color = #F0F0F0 +editor.line.highlight.color = #D6DDE8 editor.caret.color = #111111 editor.selection.color = #9BC3FF editor.eol_markers = false @@ -110,11 +110,11 @@ editor.scrollbar.color = #EDEDED editor.gutter.text.color = #111111 editor.gutter.text.active.alpha = 100 editor.gutter.text.inactive.alpha = 100 -editor.gutter.highlight.color = #F0F0F0 +editor.gutter.highlight.color = #D6DDE8 editor.error.underline.color = #810005 -editor.warning.underline.color = #583600 +editor.warning.underline.color = #843800 editor.column.error.color = #810005 -editor.column.warning.color = #583600 +editor.column.warning.color = #843800 ## Errors table errors.header.bgcolor = #EDEDED @@ -127,7 +127,7 @@ errors.selection.bgcolor = #9BC3FF errors.selection.error.bgcolor = #9BC3FF errors.selection.warning.bgcolor = #9BC3FF errors.indicator.error.color = #810005 -errors.indicator.warning.color = #583600 +errors.indicator.warning.color = #843800 ## Contribution Manager manager.tab.selected.color = #FFFFFF diff --git a/editors/processing/shared/themes/zacess-warm-dark.txt b/editors/processing/shared/themes/zacess-warm-dark.txt new file mode 100644 index 0000000..9691b3c --- /dev/null +++ b/editors/processing/shared/themes/zacess-warm-dark.txt @@ -0,0 +1,207 @@ +# Zacess theme for Processing: Zacess Warm Dark +# built by scripts/build-themes.py from the Zacess palette, do not edit by hand + +## Look and feel +laf.mode = dark +laf.accent.color = #E9B56A +label.link.color = #E9B56A + +## Toolbar +toolbar.rollover.color = #E5D5B6 +toolbar.gradient.top = #2C241F +toolbar.gradient.bottom = #2C241F +mode.title.color = #E5D5B6 +mode.background.color = #2C241F +mode.outline.color = #988C7E +mode.popup.enabled.fgcolor = #E5D5B6 +mode.popup.enabled.bgcolor = #211B17 +mode.popup.disabled.fgcolor = #CABCA9 +mode.popup.disabled.bgcolor = #211B17 +mode.popup.selected.fgcolor = #211B17 +mode.popup.selected.bgcolor = #E9B56A +toolbar.button.disabled.field = #2C241F +toolbar.button.disabled.glyph = #CABCA9 +toolbar.button.disabled.stroke = none +toolbar.button.enabled.field = #211B17 +toolbar.button.enabled.glyph = #E9B56A +toolbar.button.enabled.stroke = #988C7E +toolbar.button.pressed.field = #E9B56A +toolbar.button.pressed.glyph = #211B17 +toolbar.button.pressed.stroke = #E5D5B6 +toolbar.button.rollover.field = #2C465C +toolbar.button.rollover.glyph = #E5D5B6 +toolbar.button.rollover.stroke = #988C7E +toolbar.button.selected.field = #E9B56A +toolbar.button.selected.glyph = #211B17 +toolbar.button.selected.stroke = none +toolbar.button.debug.disabled.field = #2C241F +toolbar.button.debug.disabled.glyph = #CABCA9 +toolbar.button.debug.disabled.stroke = none +toolbar.button.debug.enabled.field = #211B17 +toolbar.button.debug.enabled.glyph = #E9B56A +toolbar.button.debug.enabled.stroke = #988C7E +toolbar.button.debug.pressed.field = #E9B56A +toolbar.button.debug.pressed.glyph = #211B17 +toolbar.button.debug.pressed.stroke = #E5D5B6 +toolbar.button.debug.rollover.field = #2C465C +toolbar.button.debug.rollover.glyph = #E5D5B6 +toolbar.button.debug.rollover.stroke = #988C7E +toolbar.button.debug.selected.field = #E9B56A +toolbar.button.debug.selected.glyph = #211B17 +toolbar.button.debug.selected.stroke = none + +## Status bar +status.notice.fgcolor = #E5D5B6 +status.notice.bgcolor = #2C241F +status.error.fgcolor = #211B17 +status.error.bgcolor = #FCA8A1 +status.warning.fgcolor = #211B17 +status.warning.bgcolor = #FAC97C + +## Tabs above the editor +header.text.selected.color = #E5D5B6 +header.text.unselected.color = #CABCA9 +header.tab.arrow.color = #CABCA9 +header.tab.selected.color = #211B17 +header.tab.unselected.color = #2C241F +header.tab.modified.color = #E9B56A +header.gradient.top = #2C241F +header.gradient.bottom = #2C241F + +## Tabs below the editor +footer.text.selected.color = #E5D5B6 +footer.text.enabled.color = #CABCA9 +footer.icon.selected.color = #E5D5B6 +footer.icon.enabled.color = #CABCA9 +footer.gradient.top = #2C241F +footer.gradient.bottom = #2C241F +footer.tab.selected.color = #211B17 +footer.tab.enabled.color = #2C241F +footer.updates.text.color = #211B17 +footer.updates.indicator.field.color = #E9B56A +footer.updates.indicator.text.color = #211B17 + +## Console +console.color = #211B17 +console.output.color = #E5D5B6 +console.error.color = #FCA8A1 +console.scrollbar.thumb.enabled.color = #988C7E +console.scrollbar.thumb.rollover.color = #CABCA9 +console.scrollbar.thumb.pressed.color = #CABCA9 +console.scrollbar.color = #2C241F + +## Editor +editor.fgcolor = #E5D5B6 +editor.bgcolor = #211B17 +editor.gradient.top = #2C241F +editor.gradient.bottom = #2C241F +editor.line.highlight = true +editor.line.highlight.color = #36322D +editor.caret.color = #FEC9A7 +editor.selection.color = #2C465C +editor.eol_markers = false +editor.eol_markers.color = #857C71 +editor.bracket.highlight = true +editor.bracket.highlight.color = #E9B56A +editor.scrollbar.thumb.enabled.color = #988C7E +editor.scrollbar.thumb.rollover.color = #CABCA9 +editor.scrollbar.thumb.pressed.color = #CABCA9 +editor.scrollbar.color = #2C241F +editor.gutter.text.color = #E5D5B6 +editor.gutter.text.active.alpha = 100 +editor.gutter.text.inactive.alpha = 100 +editor.gutter.highlight.color = #36322D +editor.error.underline.color = #FCA8A1 +editor.warning.underline.color = #FAC97C +editor.column.error.color = #FCA8A1 +editor.column.warning.color = #FAC97C + +## Errors table +errors.header.bgcolor = #2C241F +errors.header.fgcolor = #E5D5B6 +errors.bgcolor = #211B17 +errors.row.fgcolor = #E5D5B6 +errors.row.bgcolor = #211B17 +errors.selection.fgcolor = #E5D5B6 +errors.selection.bgcolor = #2C465C +errors.selection.error.bgcolor = #2C465C +errors.selection.warning.bgcolor = #2C465C +errors.indicator.error.color = #FCA8A1 +errors.indicator.warning.color = #FAC97C + +## Contribution Manager +manager.tab.selected.color = #211B17 +manager.tab.unselected.color = #2C241F +manager.tab.text.selected.color = #E5D5B6 +manager.tab.text.unselected.color = #CABCA9 +manager.tab.gradient.top = #2C241F +manager.tab.gradient.bottom = #2C241F +manager.tab.background = #2C241F +manager.categories.enabled.fgcolor = #E5D5B6 +manager.categories.enabled.bgcolor = #211B17 +manager.categories.disabled.fgcolor = #CABCA9 +manager.categories.disabled.bgcolor = #211B17 +manager.categories.selected.fgcolor = #211B17 +manager.categories.selected.bgcolor = #E9B56A +manager.error.close.icon.color = #E5D5B6 +manager.scrollbar.thumb.enabled.color = #988C7E +manager.scrollbar.thumb.rollover.color = #CABCA9 +manager.scrollbar.thumb.pressed.color = #CABCA9 +manager.scrollbar.color = #2C241F +manager.search.text.color = #E5D5B6 +manager.search.icon.color = #CABCA9 +manager.search.background.color = #211B17 +manager.search.caret.color = #FEC9A7 +manager.search.placeholder.color = #CABCA9 +manager.search.selection.text.color = #E5D5B6 +manager.search.selection.background.color = #2C465C +manager.list.background.color = #211B17 +manager.list.header.fgcolor = #E5D5B6 +manager.list.header.bgcolor = #2C241F +manager.list.section.color = #211B17 +manager.list.selection.color = #2C465C +manager.list.icon.color = #E9B56A +manager.list.text.color = #E5D5B6 +manager.list.foundation.color = #E9B56A +manager.list.incompatible.selection.color = #2C465C +manager.list.incompatible.text.color = #CABCA9 +manager.panel.background.color = #2C241F +manager.panel.text.color = #E5D5B6 +manager.panel.link.color = #E9B56A +manager.panel.foundation.color = #E9B56A +manager.button.enabled.background.color = #E9B56A +manager.button.enabled.text.color = #211B17 +manager.button.enabled.icon.color = #211B17 +manager.button.pressed.background.color = #E5D5B6 +manager.button.pressed.text.color = #211B17 +manager.button.pressed.icon.color = #211B17 +manager.button.disabled.background.color = #2C241F +manager.button.disabled.text.color = #CABCA9 +manager.button.disabled.icon.color = #CABCA9 +manager.progress.complete.fgcolor = #211B17 +manager.progress.complete.bgcolor = #E9B56A +manager.progress.incomplete.fgcolor = #E5D5B6 +manager.progress.incomplete.bgcolor = #2C241F + +## Syntax: Java keywords, control flow, the API, types and constants +editor.token.function1.style = #FFE8A1,plain +editor.token.function2.style = #FFE8A1,plain +editor.token.function3.style = #FFAFC0,bold +editor.token.function4.style = #FFE8A1,bold +editor.token.keyword1.style = #F69D74,bold +editor.token.keyword2.style = #A4C9E9,plain +editor.token.keyword3.style = #FFAFC0,bold +editor.token.keyword4.style = #ECB4D8,plain +editor.token.keyword5.style = #71C0B6,plain +editor.token.keyword6.style = #FFAFC0,bold +editor.token.literal1.style = #ABBA6F,plain +editor.token.literal2.style = #ECB4D8,plain +editor.token.operator.style = #E5D5B6,plain +editor.token.label.style = #FFCE9F,bold +editor.token.comment1.style = #BEB19E,plain +editor.token.comment2.style = #BEB19E,plain +editor.token.invalid.style = #FFB1AA,bold +editor.completion.class.color = #71C0B6 +editor.completion.field.color = #A4C9E9 +editor.completion.local.color = #E5D5B6 +editor.completion.method.color = #FFE8A1 diff --git a/editors/processing/shared/themes/zacess-warm-light.txt b/editors/processing/shared/themes/zacess-warm-light.txt new file mode 100644 index 0000000..18e2538 --- /dev/null +++ b/editors/processing/shared/themes/zacess-warm-light.txt @@ -0,0 +1,207 @@ +# Zacess theme for Processing: Zacess Warm Light +# built by scripts/build-themes.py from the Zacess palette, do not edit by hand + +## Look and feel +laf.mode = light +laf.accent.color = #6D3B02 +label.link.color = #6D3B02 + +## Toolbar +toolbar.rollover.color = #342410 +toolbar.gradient.top = #E4D8BE +toolbar.gradient.bottom = #E4D8BE +mode.title.color = #342410 +mode.background.color = #E4D8BE +mode.outline.color = #7E6F5F +mode.popup.enabled.fgcolor = #342410 +mode.popup.enabled.bgcolor = #F4EAD5 +mode.popup.disabled.fgcolor = #483B2C +mode.popup.disabled.bgcolor = #F4EAD5 +mode.popup.selected.fgcolor = #F4EAD5 +mode.popup.selected.bgcolor = #6D3B02 +toolbar.button.disabled.field = #E4D8BE +toolbar.button.disabled.glyph = #483B2C +toolbar.button.disabled.stroke = none +toolbar.button.enabled.field = #F4EAD5 +toolbar.button.enabled.glyph = #6D3B02 +toolbar.button.enabled.stroke = #7E6F5F +toolbar.button.pressed.field = #6D3B02 +toolbar.button.pressed.glyph = #F4EAD5 +toolbar.button.pressed.stroke = #342410 +toolbar.button.rollover.field = #A0D2FE +toolbar.button.rollover.glyph = #342410 +toolbar.button.rollover.stroke = #7E6F5F +toolbar.button.selected.field = #6D3B02 +toolbar.button.selected.glyph = #F4EAD5 +toolbar.button.selected.stroke = none +toolbar.button.debug.disabled.field = #E4D8BE +toolbar.button.debug.disabled.glyph = #483B2C +toolbar.button.debug.disabled.stroke = none +toolbar.button.debug.enabled.field = #F4EAD5 +toolbar.button.debug.enabled.glyph = #6D3B02 +toolbar.button.debug.enabled.stroke = #7E6F5F +toolbar.button.debug.pressed.field = #6D3B02 +toolbar.button.debug.pressed.glyph = #F4EAD5 +toolbar.button.debug.pressed.stroke = #342410 +toolbar.button.debug.rollover.field = #A0D2FE +toolbar.button.debug.rollover.glyph = #342410 +toolbar.button.debug.rollover.stroke = #7E6F5F +toolbar.button.debug.selected.field = #6D3B02 +toolbar.button.debug.selected.glyph = #F4EAD5 +toolbar.button.debug.selected.stroke = none + +## Status bar +status.notice.fgcolor = #342410 +status.notice.bgcolor = #E4D8BE +status.error.fgcolor = #F4EAD5 +status.error.bgcolor = #710205 +status.warning.fgcolor = #F4EAD5 +status.warning.bgcolor = #623D02 + +## Tabs above the editor +header.text.selected.color = #342410 +header.text.unselected.color = #483B2C +header.tab.arrow.color = #483B2C +header.tab.selected.color = #F4EAD5 +header.tab.unselected.color = #E4D8BE +header.tab.modified.color = #6D3B02 +header.gradient.top = #E4D8BE +header.gradient.bottom = #E4D8BE + +## Tabs below the editor +footer.text.selected.color = #342410 +footer.text.enabled.color = #483B2C +footer.icon.selected.color = #342410 +footer.icon.enabled.color = #483B2C +footer.gradient.top = #E4D8BE +footer.gradient.bottom = #E4D8BE +footer.tab.selected.color = #F4EAD5 +footer.tab.enabled.color = #E4D8BE +footer.updates.text.color = #F4EAD5 +footer.updates.indicator.field.color = #6D3B02 +footer.updates.indicator.text.color = #F4EAD5 + +## Console +console.color = #F4EAD5 +console.output.color = #342410 +console.error.color = #710205 +console.scrollbar.thumb.enabled.color = #7E6F5F +console.scrollbar.thumb.rollover.color = #483B2C +console.scrollbar.thumb.pressed.color = #483B2C +console.scrollbar.color = #E4D8BE + +## Editor +editor.fgcolor = #342410 +editor.bgcolor = #F4EAD5 +editor.gradient.top = #E4D8BE +editor.gradient.bottom = #E4D8BE +editor.line.highlight = true +editor.line.highlight.color = #D0CEC0 +editor.caret.color = #5B1301 +editor.selection.color = #A0D2FE +editor.eol_markers = false +editor.eol_markers.color = #827568 +editor.bracket.highlight = true +editor.bracket.highlight.color = #6D3B02 +editor.scrollbar.thumb.enabled.color = #7E6F5F +editor.scrollbar.thumb.rollover.color = #483B2C +editor.scrollbar.thumb.pressed.color = #483B2C +editor.scrollbar.color = #E4D8BE +editor.gutter.text.color = #342410 +editor.gutter.text.active.alpha = 100 +editor.gutter.text.inactive.alpha = 100 +editor.gutter.highlight.color = #D0CEC0 +editor.error.underline.color = #710205 +editor.warning.underline.color = #623D02 +editor.column.error.color = #710205 +editor.column.warning.color = #623D02 + +## Errors table +errors.header.bgcolor = #E4D8BE +errors.header.fgcolor = #342410 +errors.bgcolor = #F4EAD5 +errors.row.fgcolor = #342410 +errors.row.bgcolor = #F4EAD5 +errors.selection.fgcolor = #342410 +errors.selection.bgcolor = #A0D2FE +errors.selection.error.bgcolor = #A0D2FE +errors.selection.warning.bgcolor = #A0D2FE +errors.indicator.error.color = #710205 +errors.indicator.warning.color = #623D02 + +## Contribution Manager +manager.tab.selected.color = #F4EAD5 +manager.tab.unselected.color = #E4D8BE +manager.tab.text.selected.color = #342410 +manager.tab.text.unselected.color = #483B2C +manager.tab.gradient.top = #E4D8BE +manager.tab.gradient.bottom = #E4D8BE +manager.tab.background = #E4D8BE +manager.categories.enabled.fgcolor = #342410 +manager.categories.enabled.bgcolor = #F4EAD5 +manager.categories.disabled.fgcolor = #483B2C +manager.categories.disabled.bgcolor = #F4EAD5 +manager.categories.selected.fgcolor = #F4EAD5 +manager.categories.selected.bgcolor = #6D3B02 +manager.error.close.icon.color = #342410 +manager.scrollbar.thumb.enabled.color = #7E6F5F +manager.scrollbar.thumb.rollover.color = #483B2C +manager.scrollbar.thumb.pressed.color = #483B2C +manager.scrollbar.color = #E4D8BE +manager.search.text.color = #342410 +manager.search.icon.color = #483B2C +manager.search.background.color = #F4EAD5 +manager.search.caret.color = #5B1301 +manager.search.placeholder.color = #483B2C +manager.search.selection.text.color = #342410 +manager.search.selection.background.color = #A0D2FE +manager.list.background.color = #F4EAD5 +manager.list.header.fgcolor = #342410 +manager.list.header.bgcolor = #E4D8BE +manager.list.section.color = #F4EAD5 +manager.list.selection.color = #A0D2FE +manager.list.icon.color = #6D3B02 +manager.list.text.color = #342410 +manager.list.foundation.color = #6D3B02 +manager.list.incompatible.selection.color = #A0D2FE +manager.list.incompatible.text.color = #483B2C +manager.panel.background.color = #E4D8BE +manager.panel.text.color = #342410 +manager.panel.link.color = #6D3B02 +manager.panel.foundation.color = #6D3B02 +manager.button.enabled.background.color = #6D3B02 +manager.button.enabled.text.color = #F4EAD5 +manager.button.enabled.icon.color = #F4EAD5 +manager.button.pressed.background.color = #342410 +manager.button.pressed.text.color = #F4EAD5 +manager.button.pressed.icon.color = #F4EAD5 +manager.button.disabled.background.color = #E4D8BE +manager.button.disabled.text.color = #483B2C +manager.button.disabled.icon.color = #483B2C +manager.progress.complete.fgcolor = #F4EAD5 +manager.progress.complete.bgcolor = #6D3B02 +manager.progress.incomplete.fgcolor = #342410 +manager.progress.incomplete.bgcolor = #E4D8BE + +## Syntax: Java keywords, control flow, the API, types and constants +editor.token.function1.style = #744F01,plain +editor.token.function2.style = #744F01,plain +editor.token.function3.style = #760244,bold +editor.token.function4.style = #744F01,bold +editor.token.keyword1.style = #832A01,bold +editor.token.keyword2.style = #02318D,plain +editor.token.keyword3.style = #760244,bold +editor.token.keyword4.style = #962B70,plain +editor.token.keyword5.style = #045247,plain +editor.token.keyword6.style = #760244,bold +editor.token.literal1.style = #04523A,plain +editor.token.literal2.style = #962B70,plain +editor.token.operator.style = #342410,plain +editor.token.label.style = #8C4105,bold +editor.token.comment1.style = #625240,plain +editor.token.comment2.style = #625240,plain +editor.token.invalid.style = #62020B,bold +editor.completion.class.color = #045247 +editor.completion.field.color = #02318D +editor.completion.local.color = #342410 +editor.completion.method.color = #744F01 diff --git a/editors/processing/shared/themes/zacess-yellow-on-black.txt b/editors/processing/shared/themes/zacess-yellow-on-black.txt index e9c1233..b669816 100644 --- a/editors/processing/shared/themes/zacess-yellow-on-black.txt +++ b/editors/processing/shared/themes/zacess-yellow-on-black.txt @@ -96,7 +96,7 @@ editor.bgcolor = #000000 editor.gradient.top = #0D0D0D editor.gradient.bottom = #0D0D0D editor.line.highlight = true -editor.line.highlight.color = #141414 +editor.line.highlight.color = #262626 editor.caret.color = #FFFFFF editor.selection.color = #024B4E editor.eol_markers = false @@ -110,7 +110,7 @@ editor.scrollbar.color = #0D0D0D editor.gutter.text.color = #FFEB3B editor.gutter.text.active.alpha = 100 editor.gutter.text.inactive.alpha = 100 -editor.gutter.highlight.color = #141414 +editor.gutter.highlight.color = #262626 editor.error.underline.color = #FFBEB5 editor.warning.underline.color = #FFD8AB editor.column.error.color = #FFBEB5 diff --git a/editors/processing/windows/apply.ps1 b/editors/processing/windows/apply.ps1 index dbd0826..7147438 100644 --- a/editors/processing/windows/apply.ps1 +++ b/editors/processing/windows/apply.ps1 @@ -1,9 +1,10 @@ -# puts one of the eight Zacess themes in Processing's sketchbook and sets Geist Mono as its editor font. +# puts one of the ten Zacess themes in Processing's sketchbook and sets Geist Mono as its editor font. # usage: .\apply.ps1 [-Theme ] [-Prefs ] # (preferences.txt defaults to %APPDATA%\Processing\preferences.txt) # -# -Theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# -Theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # Processing loads theme.txt from the sketchbook folder over whichever built-in theme is picked, @@ -25,12 +26,13 @@ $themeIds = @{ 'hc-light' = 'high-contrast-light'; 'high-contrast-light' = 'high-contrast-light' 'dark' = 'dark'; 'light' = 'light'; 'cream' = 'cream' 'yellow' = 'yellow-on-black'; 'yellow-on-black' = 'yellow-on-black' + 'warm-dark' = 'warm-dark'; 'warm-light' = 'warm-light' } $key = ($Theme.ToLowerInvariant() -replace '^zacess[ -]', '') -replace ' ', '-' $id = $themeIds[$key] if (-not $id) { [Console]::Error.WriteLine("Unknown theme: $Theme") - [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow.') + [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light.') exit 1 } diff --git a/editors/proteus/ACCESSIBILITY.md b/editors/proteus/ACCESSIBILITY.md index ff13671..7584e0f 100644 --- a/editors/proteus/ACCESSIBILITY.md +++ b/editors/proteus/ACCESSIBILITY.md @@ -4,7 +4,7 @@ High contrast colours across the schematic, the PCB layout and the graphs, so Pr ## Vision -- The default is Zacess Deep Contrast Dark: a black paper, white text and outlines and fully saturated wire, probe and layer colours. All eight Zacess themes are available, light ones included. Proteus's own colours come back with `-Theme proteus`. +- The default is Zacess Deep Contrast Dark: a black paper, white text and outlines and fully saturated wire, probe and layer colours. All ten Zacess themes are available, light ones included. Proteus's own colours come back with `-Theme proteus`. - Selected parts take the theme's focus colour (yellow in Deep Contrast Dark), which no wire or outline uses, so a selection always stands out. - PCB layers keep their usual hues in every theme: top copper red and bottom copper blue. Layers can still be told apart by name in the layer list, so colour is never the only signal. - Measured contrast for each theme is in the [Zacess Themes accessibility statement](https://github.com/zacesshq/themes/blob/main/ACCESSIBILITY.md). diff --git a/editors/proteus/README.md b/editors/proteus/README.md index 8791d20..994f58f 100644 --- a/editors/proteus/README.md +++ b/editors/proteus/README.md @@ -6,7 +6,7 @@ Proteus 8 Professional colours: the Zacess themes in the schematic, the PCB layo | Part of Proteus | Where Proteus keeps it | What the script does | | --- | --- | --- | -| PCB layout and graphs | Named colour sets in the registry, under `HKCU\Software\Labcenter Electronics\Proteus 8 Professional\ARES` and `GVIEW` | Adds all eight Zacess sets beside Proteus's own Black Paper, White Paper and Monochrome and makes the chosen one active | +| PCB layout and graphs | Named colour sets in the registry, under `HKCU\Software\Labcenter Electronics\Proteus 8 Professional\ARES` and `GVIEW` | Adds all ten Zacess sets beside Proteus's own Black Paper, White Paper and Monochrome and makes the chosen one active | | Schematic | Each design's template, copied into the design when it is made | Writes the chosen theme into every template in `%ProgramData%\Labcenter Electronics\Proteus 8 Professional\Templates`, so every new design starts in it | | Existing designs | Inside each `.pdsprj` | Only with `-Project`: rewrites the colours in the named projects and nothing else in them | @@ -18,11 +18,11 @@ Quit Proteus first: it writes its settings back when it exits, so the script ref ```powershell pwsh -File windows\apply.ps1 # Zacess Deep Contrast Dark, the default -pwsh -File windows\apply.ps1 -Theme deep-light # any of the eight, light ones included +pwsh -File windows\apply.ps1 -Theme deep-light # any of the ten, light ones included pwsh -File windows\apply.ps1 -Theme proteus # back to Proteus's own colours ``` -`-Theme` takes a short name (`deep-dark`, `deep-light`, `hc-dark`, `hc-light`, `dark`, `light`, `cream`, `yellow`), the theme id (`deep-contrast-dark`) or the full name. `zt ` runs this script along with every other app. +`-Theme` takes a short name (`deep-dark`, `deep-light`, `hc-dark`, `hc-light`, `dark`, `light`, `cream`, `yellow`, `warm-dark`, `warm-light`), the theme id (`deep-contrast-dark`) or the full name. `zt ` runs this script along with every other app. To bring existing designs onto the theme too, name the project files or a folder of them. Only the colours inside each project change: @@ -38,7 +38,7 @@ The script prints each part as `changed`, `unchanged`, `removed` or `skipped`. R Every theme stays available without the script: -- **PCB layout and graphs:** **System > Set Colour Scheme** lists all eight Zacess sets (`ZACESS_DEEP_DARK`, `ZACESS_CREAM` and so on) beside Black Paper, White Paper and Monochrome. +- **PCB layout and graphs:** **System > Set Colour Scheme** lists all ten Zacess sets (`ZACESS_DEEP_DARK`, `ZACESS_CREAM` and so on) beside Black Paper, White Paper and Monochrome. - **Schematic:** **Template > Set Design Colours**, **Set Graphic Styles** and **Set Text Styles** change the open design. **Template > Apply Styles From Template** copies another template's styles into it. ## How the schematic part works @@ -68,4 +68,4 @@ Every colour is a Windows `COLORREF` (red, green, blue, zero). The layout was ma ## Validation -[`scripts/validate.py`](scripts/validate.py) runs in CI on Linux. It checks all eight themes exist with short, unique set names (Proteus cuts a set name to 20 characters when it saves), every PCB value is a colour, a number or a Yes/No flag and every theme's schematic colours cover exactly the default template's slots. +[`scripts/validate.py`](scripts/validate.py) runs in CI on Linux. It checks all ten themes exist with short, unique set names (Proteus cuts a set name to 20 characters when it saves), every PCB value is a colour, a number or a Yes/No flag and every theme's schematic colours cover exactly the default template's slots. diff --git a/editors/proteus/scripts/build-themes.py b/editors/proteus/scripts/build-themes.py index c313d32..41ff441 100644 --- a/editors/proteus/scripts/build-themes.py +++ b/editors/proteus/scripts/build-themes.py @@ -32,6 +32,8 @@ "zacess-light": ("Zacess Light", "light", "ZACESS_LIGHT"), "zacess-cream": ("Zacess Cream", "light", "ZACESS_CREAM"), "zacess-yellow-on-black": ("Zacess Yellow on Black", "dark", "ZACESS_YELLOW"), + "zacess-warm-dark": ("Zacess Warm Dark", "dark", "ZACESS_WARM_DARK"), + "zacess-warm-light": ("Zacess Warm Light", "light", "ZACESS_WARM_LIGHT"), } ANSI = ["Red", "Green", "Yellow", "Blue", "Magenta", "Cyan", "BrightRed", "BrightGreen", "BrightYellow", diff --git a/editors/proteus/scripts/validate.py b/editors/proteus/scripts/validate.py index 8a9d7f3..77a40fb 100644 --- a/editors/proteus/scripts/validate.py +++ b/editors/proteus/scripts/validate.py @@ -1,6 +1,6 @@ """Checks the Proteus folder without Proteus: run from anywhere, exits non-zero on a problem. -- shared/themes holds the eight Zacess themes with unique colour set names Proteus keeps whole +- shared/themes holds the ten Zacess themes with unique colour set names Proteus keeps whole (it cuts a name to 20 characters when it saves its settings) - every PCB and graph value is a "(0xRR,0xGG,0xBB)" string, a number or a Yes/No show flag - every theme's schematic colours cover exactly the slots in shared/base/schematic_default.json @@ -12,7 +12,8 @@ import sys NAMES = ["Zacess Deep Contrast Dark", "Zacess Deep Contrast Light", "Zacess High Contrast Dark", - "Zacess High Contrast Light", "Zacess Dark", "Zacess Light", "Zacess Cream", "Zacess Yellow on Black"] + "Zacess High Contrast Light", "Zacess Dark", "Zacess Light", "Zacess Cream", "Zacess Yellow on Black", + "Zacess Warm Dark", "Zacess Warm Light"] root = pathlib.Path(__file__).resolve().parent.parent problems = [] diff --git a/editors/proteus/shared/themes/Zacess Cream.json b/editors/proteus/shared/themes/Zacess Cream.json index 20796fb..7ff92a9 100644 --- a/editors/proteus/shared/themes/Zacess Cream.json +++ b/editors/proteus/shared/themes/Zacess Cream.json @@ -39,7 +39,7 @@ "Ratsnest Colour": "(0x00,0x81,0x20)", "Vector Colour": "(0x81,0x56,0x01)", "Pin Number Colour": "(0x00,0x00,0x00)", - "Empty Zone Colour": "(0xF3,0xEA,0xD2)", + "Empty Zone Colour": "(0xC8,0xDA,0xDD)", "Dimmed Colour": "(0xC8,0xA9,0xFF)", "Drag Cursor Colour": "(0x00,0x81,0x20)", "Paper Colour": "(0xFD,0xF6,0xE3)", @@ -100,17 +100,17 @@ "design.logic0": "#0069e3", "design.logicUnknown": "#3f382c", "style.COMPONENT.line": "#c1000a", - "style.COMPONENT.fill": "#f3ead2", - "style.COMPONENT.back": "#f3ead2", + "style.COMPONENT.fill": "#c8dadd", + "style.COMPONENT.back": "#c8dadd", "style.PIN.line": "#c1000a", - "style.PIN.fill": "#f3ead2", - "style.PIN.back": "#f3ead2", + "style.PIN.fill": "#c8dadd", + "style.PIN.back": "#c8dadd", "style.PORT.line": "#016f1b", - "style.PORT.fill": "#f3ead2", - "style.PORT.back": "#f3ead2", + "style.PORT.fill": "#c8dadd", + "style.PORT.back": "#c8dadd", "style.MARKER.line": "#015ac2", - "style.MARKER.fill": "#f3ead2", - "style.MARKER.back": "#f3ead2", + "style.MARKER.fill": "#c8dadd", + "style.MARKER.back": "#c8dadd", "style.ACTUATOR.line": "#df0010", "style.ACTUATOR.fill": "#c1000a", "style.ACTUATOR.back": "#c1000a", @@ -118,41 +118,41 @@ "style.INDICATOR.fill": "#016f1b", "style.INDICATOR.back": "#016f1b", "style.VPROBE.line": "#015ac2", - "style.VPROBE.fill": "#f3ead2", - "style.VPROBE.back": "#f3ead2", + "style.VPROBE.fill": "#c8dadd", + "style.VPROBE.back": "#c8dadd", "style.IPROBE.line": "#015ac2", - "style.IPROBE.fill": "#f3ead2", - "style.IPROBE.back": "#f3ead2", + "style.IPROBE.fill": "#c8dadd", + "style.IPROBE.back": "#c8dadd", "style.TAPE.line": "#015ac2", - "style.TAPE.fill": "#f3ead2", - "style.TAPE.back": "#f3ead2", + "style.TAPE.fill": "#c8dadd", + "style.TAPE.back": "#c8dadd", "style.GENERATOR.line": "#015ac2", - "style.GENERATOR.fill": "#f3ead2", - "style.GENERATOR.back": "#f3ead2", + "style.GENERATOR.fill": "#c8dadd", + "style.GENERATOR.back": "#c8dadd", "style.TERMINAL.line": "#016f1b", - "style.TERMINAL.fill": "#f3ead2", - "style.TERMINAL.back": "#f3ead2", + "style.TERMINAL.fill": "#c8dadd", + "style.TERMINAL.back": "#c8dadd", "style.SUBCIRCUIT.line": "#015ac2", - "style.SUBCIRCUIT.fill": "#f3ead2", - "style.SUBCIRCUIT.back": "#f3ead2", + "style.SUBCIRCUIT.fill": "#c8dadd", + "style.SUBCIRCUIT.back": "#c8dadd", "style.2D GRAPHIC.line": "#000000", - "style.2D GRAPHIC.fill": "#f3ead2", - "style.2D GRAPHIC.back": "#f3ead2", + "style.2D GRAPHIC.fill": "#c8dadd", + "style.2D GRAPHIC.back": "#c8dadd", "style.WIRE DOT.line": "#016f1b", "style.WIRE DOT.fill": "#016f1b", "style.WIRE DOT.back": "#016f1b", "style.WIRE.line": "#016f1b", - "style.WIRE.fill": "#f3ead2", - "style.WIRE.back": "#f3ead2", + "style.WIRE.fill": "#c8dadd", + "style.WIRE.back": "#c8dadd", "style.BUS WIRE.line": "#015ac2", - "style.BUS WIRE.fill": "#f3ead2", - "style.BUS WIRE.back": "#f3ead2", + "style.BUS WIRE.fill": "#c8dadd", + "style.BUS WIRE.back": "#c8dadd", "style.BORDER.line": "#027b7b", - "style.BORDER.fill": "#f3ead2", - "style.BORDER.back": "#f3ead2", + "style.BORDER.fill": "#c8dadd", + "style.BORDER.back": "#c8dadd", "style.TEMPLATE.line": "#015ac2", - "style.TEMPLATE.fill": "#f3ead2", - "style.TEMPLATE.back": "#f3ead2", + "style.TEMPLATE.fill": "#c8dadd", + "style.TEMPLATE.back": "#c8dadd", "text.COMPONENT ID": "#000000", "text.COMPONENT VALUE": "#000000", "text.PROPERTIES": "#000000", @@ -172,7 +172,7 @@ }, "fallback": { "line": "#000000", - "fill": "#f3ead2", + "fill": "#c8dadd", "text": "#000000" } } diff --git a/editors/proteus/shared/themes/Zacess Dark.json b/editors/proteus/shared/themes/Zacess Dark.json index 3153eee..b5647fd 100644 --- a/editors/proteus/shared/themes/Zacess Dark.json +++ b/editors/proteus/shared/themes/Zacess Dark.json @@ -39,7 +39,7 @@ "Ratsnest Colour": "(0x1B,0xDB,0x41)", "Vector Colour": "(0xF0,0xB4,0x0B)", "Pin Number Colour": "(0xF5,0xF5,0xF5)", - "Empty Zone Colour": "(0x1F,0x1F,0x1F)", + "Empty Zone Colour": "(0x2F,0x2F,0x2F)", "Dimmed Colour": "(0x00,0x47,0x69)", "Drag Cursor Colour": "(0x1B,0xDB,0x41)", "Paper Colour": "(0x12,0x12,0x12)", @@ -100,17 +100,17 @@ "design.logic0": "#90c1ff", "design.logicUnknown": "#c8c8c8", "style.COMPONENT.line": "#ffa79b", - "style.COMPONENT.fill": "#1f1f1f", - "style.COMPONENT.back": "#1f1f1f", + "style.COMPONENT.fill": "#2f2f2f", + "style.COMPONENT.back": "#2f2f2f", "style.PIN.line": "#ffa79b", - "style.PIN.fill": "#1f1f1f", - "style.PIN.back": "#1f1f1f", + "style.PIN.fill": "#2f2f2f", + "style.PIN.back": "#2f2f2f", "style.PORT.line": "#1bdb41", - "style.PORT.fill": "#1f1f1f", - "style.PORT.back": "#1f1f1f", + "style.PORT.fill": "#2f2f2f", + "style.PORT.back": "#2f2f2f", "style.MARKER.line": "#90c1ff", - "style.MARKER.fill": "#1f1f1f", - "style.MARKER.back": "#1f1f1f", + "style.MARKER.fill": "#2f2f2f", + "style.MARKER.back": "#2f2f2f", "style.ACTUATOR.line": "#ffa79b", "style.ACTUATOR.fill": "#ffa79b", "style.ACTUATOR.back": "#ffa79b", @@ -118,41 +118,41 @@ "style.INDICATOR.fill": "#1bdb41", "style.INDICATOR.back": "#1bdb41", "style.VPROBE.line": "#90c1ff", - "style.VPROBE.fill": "#1f1f1f", - "style.VPROBE.back": "#1f1f1f", + "style.VPROBE.fill": "#2f2f2f", + "style.VPROBE.back": "#2f2f2f", "style.IPROBE.line": "#90c1ff", - "style.IPROBE.fill": "#1f1f1f", - "style.IPROBE.back": "#1f1f1f", + "style.IPROBE.fill": "#2f2f2f", + "style.IPROBE.back": "#2f2f2f", "style.TAPE.line": "#90c1ff", - "style.TAPE.fill": "#1f1f1f", - "style.TAPE.back": "#1f1f1f", + "style.TAPE.fill": "#2f2f2f", + "style.TAPE.back": "#2f2f2f", "style.GENERATOR.line": "#90c1ff", - "style.GENERATOR.fill": "#1f1f1f", - "style.GENERATOR.back": "#1f1f1f", + "style.GENERATOR.fill": "#2f2f2f", + "style.GENERATOR.back": "#2f2f2f", "style.TERMINAL.line": "#1bdb41", - "style.TERMINAL.fill": "#1f1f1f", - "style.TERMINAL.back": "#1f1f1f", + "style.TERMINAL.fill": "#2f2f2f", + "style.TERMINAL.back": "#2f2f2f", "style.SUBCIRCUIT.line": "#90c1ff", - "style.SUBCIRCUIT.fill": "#1f1f1f", - "style.SUBCIRCUIT.back": "#1f1f1f", + "style.SUBCIRCUIT.fill": "#2f2f2f", + "style.SUBCIRCUIT.back": "#2f2f2f", "style.2D GRAPHIC.line": "#f5f5f5", - "style.2D GRAPHIC.fill": "#1f1f1f", - "style.2D GRAPHIC.back": "#1f1f1f", + "style.2D GRAPHIC.fill": "#2f2f2f", + "style.2D GRAPHIC.back": "#2f2f2f", "style.WIRE DOT.line": "#1bdb41", "style.WIRE DOT.fill": "#1bdb41", "style.WIRE DOT.back": "#1bdb41", "style.WIRE.line": "#1bdb41", - "style.WIRE.fill": "#1f1f1f", - "style.WIRE.back": "#1f1f1f", + "style.WIRE.fill": "#2f2f2f", + "style.WIRE.back": "#2f2f2f", "style.BUS WIRE.line": "#90c1ff", - "style.BUS WIRE.fill": "#1f1f1f", - "style.BUS WIRE.back": "#1f1f1f", + "style.BUS WIRE.fill": "#2f2f2f", + "style.BUS WIRE.back": "#2f2f2f", "style.BORDER.line": "#37d2cf", - "style.BORDER.fill": "#1f1f1f", - "style.BORDER.back": "#1f1f1f", + "style.BORDER.fill": "#2f2f2f", + "style.BORDER.back": "#2f2f2f", "style.TEMPLATE.line": "#90c1ff", - "style.TEMPLATE.fill": "#1f1f1f", - "style.TEMPLATE.back": "#1f1f1f", + "style.TEMPLATE.fill": "#2f2f2f", + "style.TEMPLATE.back": "#2f2f2f", "text.COMPONENT ID": "#f5f5f5", "text.COMPONENT VALUE": "#f5f5f5", "text.PROPERTIES": "#f5f5f5", @@ -172,7 +172,7 @@ }, "fallback": { "line": "#f5f5f5", - "fill": "#1f1f1f", + "fill": "#2f2f2f", "text": "#f5f5f5" } } diff --git a/editors/proteus/shared/themes/Zacess Deep Contrast Dark.json b/editors/proteus/shared/themes/Zacess Deep Contrast Dark.json index 0297883..0b26782 100644 --- a/editors/proteus/shared/themes/Zacess Deep Contrast Dark.json +++ b/editors/proteus/shared/themes/Zacess Deep Contrast Dark.json @@ -39,7 +39,7 @@ "Ratsnest Colour": "(0x00,0xFF,0x00)", "Vector Colour": "(0xFF,0xFF,0x00)", "Pin Number Colour": "(0xFF,0xFF,0xFF)", - "Empty Zone Colour": "(0x14,0x14,0x14)", + "Empty Zone Colour": "(0x26,0x26,0x26)", "Dimmed Colour": "(0xFF,0x70,0xFF)", "Drag Cursor Colour": "(0x00,0xCD,0x00)", "Paper Colour": "(0x00,0x00,0x00)", @@ -100,17 +100,17 @@ "design.logic0": "#8888ff", "design.logicUnknown": "#b3b3b3", "style.COMPONENT.line": "#ff5f5f", - "style.COMPONENT.fill": "#141414", - "style.COMPONENT.back": "#141414", + "style.COMPONENT.fill": "#262626", + "style.COMPONENT.back": "#262626", "style.PIN.line": "#ff5f5f", - "style.PIN.fill": "#141414", - "style.PIN.back": "#141414", + "style.PIN.fill": "#262626", + "style.PIN.back": "#262626", "style.PORT.line": "#00cd00", - "style.PORT.fill": "#141414", - "style.PORT.back": "#141414", + "style.PORT.fill": "#262626", + "style.PORT.back": "#262626", "style.MARKER.line": "#8888ff", - "style.MARKER.fill": "#141414", - "style.MARKER.back": "#141414", + "style.MARKER.fill": "#262626", + "style.MARKER.back": "#262626", "style.ACTUATOR.line": "#ff5f5f", "style.ACTUATOR.fill": "#ff5f5f", "style.ACTUATOR.back": "#ff5f5f", @@ -118,41 +118,41 @@ "style.INDICATOR.fill": "#00cd00", "style.INDICATOR.back": "#00cd00", "style.VPROBE.line": "#8888ff", - "style.VPROBE.fill": "#141414", - "style.VPROBE.back": "#141414", + "style.VPROBE.fill": "#262626", + "style.VPROBE.back": "#262626", "style.IPROBE.line": "#8888ff", - "style.IPROBE.fill": "#141414", - "style.IPROBE.back": "#141414", + "style.IPROBE.fill": "#262626", + "style.IPROBE.back": "#262626", "style.TAPE.line": "#8888ff", - "style.TAPE.fill": "#141414", - "style.TAPE.back": "#141414", + "style.TAPE.fill": "#262626", + "style.TAPE.back": "#262626", "style.GENERATOR.line": "#8888ff", - "style.GENERATOR.fill": "#141414", - "style.GENERATOR.back": "#141414", + "style.GENERATOR.fill": "#262626", + "style.GENERATOR.back": "#262626", "style.TERMINAL.line": "#00cd00", - "style.TERMINAL.fill": "#141414", - "style.TERMINAL.back": "#141414", + "style.TERMINAL.fill": "#262626", + "style.TERMINAL.back": "#262626", "style.SUBCIRCUIT.line": "#8888ff", - "style.SUBCIRCUIT.fill": "#141414", - "style.SUBCIRCUIT.back": "#141414", + "style.SUBCIRCUIT.fill": "#262626", + "style.SUBCIRCUIT.back": "#262626", "style.2D GRAPHIC.line": "#ffffff", - "style.2D GRAPHIC.fill": "#141414", - "style.2D GRAPHIC.back": "#141414", + "style.2D GRAPHIC.fill": "#262626", + "style.2D GRAPHIC.back": "#262626", "style.WIRE DOT.line": "#00cd00", "style.WIRE DOT.fill": "#00cd00", "style.WIRE DOT.back": "#00cd00", "style.WIRE.line": "#00cd00", - "style.WIRE.fill": "#141414", - "style.WIRE.back": "#141414", + "style.WIRE.fill": "#262626", + "style.WIRE.back": "#262626", "style.BUS WIRE.line": "#8888ff", - "style.BUS WIRE.fill": "#141414", - "style.BUS WIRE.back": "#141414", + "style.BUS WIRE.fill": "#262626", + "style.BUS WIRE.back": "#262626", "style.BORDER.line": "#00cdcd", - "style.BORDER.fill": "#141414", - "style.BORDER.back": "#141414", + "style.BORDER.fill": "#262626", + "style.BORDER.back": "#262626", "style.TEMPLATE.line": "#8888ff", - "style.TEMPLATE.fill": "#141414", - "style.TEMPLATE.back": "#141414", + "style.TEMPLATE.fill": "#262626", + "style.TEMPLATE.back": "#262626", "text.COMPONENT ID": "#ffffff", "text.COMPONENT VALUE": "#ffffff", "text.PROPERTIES": "#ffffff", @@ -172,7 +172,7 @@ }, "fallback": { "line": "#ffffff", - "fill": "#141414", + "fill": "#262626", "text": "#ffffff" } } diff --git a/editors/proteus/shared/themes/Zacess Deep Contrast Light.json b/editors/proteus/shared/themes/Zacess Deep Contrast Light.json index 56b8324..72cc202 100644 --- a/editors/proteus/shared/themes/Zacess Deep Contrast Light.json +++ b/editors/proteus/shared/themes/Zacess Deep Contrast Light.json @@ -39,7 +39,7 @@ "Ratsnest Colour": "(0x00,0x89,0x2E)", "Vector Colour": "(0x90,0x73,0x00)", "Pin Number Colour": "(0x00,0x00,0x00)", - "Empty Zone Colour": "(0xF5,0xF5,0xF5)", + "Empty Zone Colour": "(0xC8,0xDE,0xBD)", "Dimmed Colour": "(0x99,0x00,0x98)", "Drag Cursor Colour": "(0x00,0x89,0x2E)", "Paper Colour": "(0xFF,0xFF,0xFF)", @@ -100,17 +100,17 @@ "design.logic0": "#0d00ff", "design.logicUnknown": "#4d4d4d", "style.COMPONENT.line": "#ca0000", - "style.COMPONENT.fill": "#f5f5f5", - "style.COMPONENT.back": "#f5f5f5", + "style.COMPONENT.fill": "#c8debd", + "style.COMPONENT.back": "#c8debd", "style.PIN.line": "#ca0000", - "style.PIN.fill": "#f5f5f5", - "style.PIN.back": "#f5f5f5", + "style.PIN.fill": "#c8debd", + "style.PIN.back": "#c8debd", "style.PORT.line": "#00892e", - "style.PORT.fill": "#f5f5f5", - "style.PORT.back": "#f5f5f5", + "style.PORT.fill": "#c8debd", + "style.PORT.back": "#c8debd", "style.MARKER.line": "#0d00ff", - "style.MARKER.fill": "#f5f5f5", - "style.MARKER.back": "#f5f5f5", + "style.MARKER.fill": "#c8debd", + "style.MARKER.back": "#c8debd", "style.ACTUATOR.line": "#ca0000", "style.ACTUATOR.fill": "#ca0000", "style.ACTUATOR.back": "#ca0000", @@ -118,41 +118,41 @@ "style.INDICATOR.fill": "#00892e", "style.INDICATOR.back": "#00892e", "style.VPROBE.line": "#0d00ff", - "style.VPROBE.fill": "#f5f5f5", - "style.VPROBE.back": "#f5f5f5", + "style.VPROBE.fill": "#c8debd", + "style.VPROBE.back": "#c8debd", "style.IPROBE.line": "#0d00ff", - "style.IPROBE.fill": "#f5f5f5", - "style.IPROBE.back": "#f5f5f5", + "style.IPROBE.fill": "#c8debd", + "style.IPROBE.back": "#c8debd", "style.TAPE.line": "#0d00ff", - "style.TAPE.fill": "#f5f5f5", - "style.TAPE.back": "#f5f5f5", + "style.TAPE.fill": "#c8debd", + "style.TAPE.back": "#c8debd", "style.GENERATOR.line": "#0d00ff", - "style.GENERATOR.fill": "#f5f5f5", - "style.GENERATOR.back": "#f5f5f5", + "style.GENERATOR.fill": "#c8debd", + "style.GENERATOR.back": "#c8debd", "style.TERMINAL.line": "#00892e", - "style.TERMINAL.fill": "#f5f5f5", - "style.TERMINAL.back": "#f5f5f5", + "style.TERMINAL.fill": "#c8debd", + "style.TERMINAL.back": "#c8debd", "style.SUBCIRCUIT.line": "#0d00ff", - "style.SUBCIRCUIT.fill": "#f5f5f5", - "style.SUBCIRCUIT.back": "#f5f5f5", + "style.SUBCIRCUIT.fill": "#c8debd", + "style.SUBCIRCUIT.back": "#c8debd", "style.2D GRAPHIC.line": "#000000", - "style.2D GRAPHIC.fill": "#f5f5f5", - "style.2D GRAPHIC.back": "#f5f5f5", + "style.2D GRAPHIC.fill": "#c8debd", + "style.2D GRAPHIC.back": "#c8debd", "style.WIRE DOT.line": "#00892e", "style.WIRE DOT.fill": "#00892e", "style.WIRE DOT.back": "#00892e", "style.WIRE.line": "#00892e", - "style.WIRE.fill": "#f5f5f5", - "style.WIRE.back": "#f5f5f5", + "style.WIRE.fill": "#c8debd", + "style.WIRE.back": "#c8debd", "style.BUS WIRE.line": "#0d00ff", - "style.BUS WIRE.fill": "#f5f5f5", - "style.BUS WIRE.back": "#f5f5f5", + "style.BUS WIRE.fill": "#c8debd", + "style.BUS WIRE.back": "#c8debd", "style.BORDER.line": "#016e78", - "style.BORDER.fill": "#f5f5f5", - "style.BORDER.back": "#f5f5f5", + "style.BORDER.fill": "#c8debd", + "style.BORDER.back": "#c8debd", "style.TEMPLATE.line": "#0d00ff", - "style.TEMPLATE.fill": "#f5f5f5", - "style.TEMPLATE.back": "#f5f5f5", + "style.TEMPLATE.fill": "#c8debd", + "style.TEMPLATE.back": "#c8debd", "text.COMPONENT ID": "#000000", "text.COMPONENT VALUE": "#000000", "text.PROPERTIES": "#000000", @@ -172,7 +172,7 @@ }, "fallback": { "line": "#000000", - "fill": "#f5f5f5", + "fill": "#c8debd", "text": "#000000" } } diff --git a/editors/proteus/shared/themes/Zacess High Contrast Dark.json b/editors/proteus/shared/themes/Zacess High Contrast Dark.json index a5de1aa..7c79378 100644 --- a/editors/proteus/shared/themes/Zacess High Contrast Dark.json +++ b/editors/proteus/shared/themes/Zacess High Contrast Dark.json @@ -39,7 +39,7 @@ "Ratsnest Colour": "(0x26,0xF4,0x44)", "Vector Colour": "(0xF5,0xC4,0x00)", "Pin Number Colour": "(0xFF,0xFF,0xFF)", - "Empty Zone Colour": "(0x1A,0x1A,0x1A)", + "Empty Zone Colour": "(0x26,0x26,0x26)", "Dimmed Colour": "(0xBF,0x96,0xFF)", "Drag Cursor Colour": "(0x26,0xF4,0x44)", "Paper Colour": "(0x00,0x00,0x00)", @@ -100,17 +100,17 @@ "design.logic0": "#8fd0ff", "design.logicUnknown": "#e0e0e0", "style.COMPONENT.line": "#ff9e94", - "style.COMPONENT.fill": "#1a1a1a", - "style.COMPONENT.back": "#1a1a1a", + "style.COMPONENT.fill": "#262626", + "style.COMPONENT.back": "#262626", "style.PIN.line": "#ff9e94", - "style.PIN.fill": "#1a1a1a", - "style.PIN.back": "#1a1a1a", + "style.PIN.fill": "#262626", + "style.PIN.back": "#262626", "style.PORT.line": "#26f444", - "style.PORT.fill": "#1a1a1a", - "style.PORT.back": "#1a1a1a", + "style.PORT.fill": "#262626", + "style.PORT.back": "#262626", "style.MARKER.line": "#8fd0ff", - "style.MARKER.fill": "#1a1a1a", - "style.MARKER.back": "#1a1a1a", + "style.MARKER.fill": "#262626", + "style.MARKER.back": "#262626", "style.ACTUATOR.line": "#ff9e94", "style.ACTUATOR.fill": "#ff9e94", "style.ACTUATOR.back": "#ff9e94", @@ -118,41 +118,41 @@ "style.INDICATOR.fill": "#26f444", "style.INDICATOR.back": "#26f444", "style.VPROBE.line": "#8fd0ff", - "style.VPROBE.fill": "#1a1a1a", - "style.VPROBE.back": "#1a1a1a", + "style.VPROBE.fill": "#262626", + "style.VPROBE.back": "#262626", "style.IPROBE.line": "#8fd0ff", - "style.IPROBE.fill": "#1a1a1a", - "style.IPROBE.back": "#1a1a1a", + "style.IPROBE.fill": "#262626", + "style.IPROBE.back": "#262626", "style.TAPE.line": "#8fd0ff", - "style.TAPE.fill": "#1a1a1a", - "style.TAPE.back": "#1a1a1a", + "style.TAPE.fill": "#262626", + "style.TAPE.back": "#262626", "style.GENERATOR.line": "#8fd0ff", - "style.GENERATOR.fill": "#1a1a1a", - "style.GENERATOR.back": "#1a1a1a", + "style.GENERATOR.fill": "#262626", + "style.GENERATOR.back": "#262626", "style.TERMINAL.line": "#26f444", - "style.TERMINAL.fill": "#1a1a1a", - "style.TERMINAL.back": "#1a1a1a", + "style.TERMINAL.fill": "#262626", + "style.TERMINAL.back": "#262626", "style.SUBCIRCUIT.line": "#8fd0ff", - "style.SUBCIRCUIT.fill": "#1a1a1a", - "style.SUBCIRCUIT.back": "#1a1a1a", + "style.SUBCIRCUIT.fill": "#262626", + "style.SUBCIRCUIT.back": "#262626", "style.2D GRAPHIC.line": "#ffffff", - "style.2D GRAPHIC.fill": "#1a1a1a", - "style.2D GRAPHIC.back": "#1a1a1a", + "style.2D GRAPHIC.fill": "#262626", + "style.2D GRAPHIC.back": "#262626", "style.WIRE DOT.line": "#26f444", "style.WIRE DOT.fill": "#26f444", "style.WIRE DOT.back": "#26f444", "style.WIRE.line": "#26f444", - "style.WIRE.fill": "#1a1a1a", - "style.WIRE.back": "#1a1a1a", + "style.WIRE.fill": "#262626", + "style.WIRE.back": "#262626", "style.BUS WIRE.line": "#8fd0ff", - "style.BUS WIRE.fill": "#1a1a1a", - "style.BUS WIRE.back": "#1a1a1a", + "style.BUS WIRE.fill": "#262626", + "style.BUS WIRE.back": "#262626", "style.BORDER.line": "#00f4e0", - "style.BORDER.fill": "#1a1a1a", - "style.BORDER.back": "#1a1a1a", + "style.BORDER.fill": "#262626", + "style.BORDER.back": "#262626", "style.TEMPLATE.line": "#8fd0ff", - "style.TEMPLATE.fill": "#1a1a1a", - "style.TEMPLATE.back": "#1a1a1a", + "style.TEMPLATE.fill": "#262626", + "style.TEMPLATE.back": "#262626", "text.COMPONENT ID": "#ffffff", "text.COMPONENT VALUE": "#ffffff", "text.PROPERTIES": "#ffffff", @@ -172,7 +172,7 @@ }, "fallback": { "line": "#ffffff", - "fill": "#1a1a1a", + "fill": "#262626", "text": "#ffffff" } } diff --git a/editors/proteus/shared/themes/Zacess High Contrast Light.json b/editors/proteus/shared/themes/Zacess High Contrast Light.json index f713595..00b0e04 100644 --- a/editors/proteus/shared/themes/Zacess High Contrast Light.json +++ b/editors/proteus/shared/themes/Zacess High Contrast Light.json @@ -39,7 +39,7 @@ "Ratsnest Colour": "(0x01,0x87,0x26)", "Vector Colour": "(0x87,0x5B,0x00)", "Pin Number Colour": "(0x00,0x00,0x00)", - "Empty Zone Colour": "(0xF2,0xF2,0xF2)", + "Empty Zone Colour": "(0xC3,0xE5,0xFE)", "Dimmed Colour": "(0x01,0x5F,0x5E)", "Drag Cursor Colour": "(0x01,0x87,0x26)", "Paper Colour": "(0xFF,0xFF,0xFF)", @@ -100,17 +100,17 @@ "design.logic0": "#016eee", "design.logicUnknown": "#2e2e2e", "style.COMPONENT.line": "#ca0000", - "style.COMPONENT.fill": "#f2f2f2", - "style.COMPONENT.back": "#f2f2f2", + "style.COMPONENT.fill": "#c3e5fe", + "style.COMPONENT.back": "#c3e5fe", "style.PIN.line": "#ca0000", - "style.PIN.fill": "#f2f2f2", - "style.PIN.back": "#f2f2f2", + "style.PIN.fill": "#c3e5fe", + "style.PIN.back": "#c3e5fe", "style.PORT.line": "#017424", - "style.PORT.fill": "#f2f2f2", - "style.PORT.back": "#f2f2f2", + "style.PORT.fill": "#c3e5fe", + "style.PORT.back": "#c3e5fe", "style.MARKER.line": "#005bdc", - "style.MARKER.fill": "#f2f2f2", - "style.MARKER.back": "#f2f2f2", + "style.MARKER.fill": "#c3e5fe", + "style.MARKER.back": "#c3e5fe", "style.ACTUATOR.line": "#e90100", "style.ACTUATOR.fill": "#ca0000", "style.ACTUATOR.back": "#ca0000", @@ -118,41 +118,41 @@ "style.INDICATOR.fill": "#017424", "style.INDICATOR.back": "#017424", "style.VPROBE.line": "#005bdc", - "style.VPROBE.fill": "#f2f2f2", - "style.VPROBE.back": "#f2f2f2", + "style.VPROBE.fill": "#c3e5fe", + "style.VPROBE.back": "#c3e5fe", "style.IPROBE.line": "#005bdc", - "style.IPROBE.fill": "#f2f2f2", - "style.IPROBE.back": "#f2f2f2", + "style.IPROBE.fill": "#c3e5fe", + "style.IPROBE.back": "#c3e5fe", "style.TAPE.line": "#005bdc", - "style.TAPE.fill": "#f2f2f2", - "style.TAPE.back": "#f2f2f2", + "style.TAPE.fill": "#c3e5fe", + "style.TAPE.back": "#c3e5fe", "style.GENERATOR.line": "#005bdc", - "style.GENERATOR.fill": "#f2f2f2", - "style.GENERATOR.back": "#f2f2f2", + "style.GENERATOR.fill": "#c3e5fe", + "style.GENERATOR.back": "#c3e5fe", "style.TERMINAL.line": "#017424", - "style.TERMINAL.fill": "#f2f2f2", - "style.TERMINAL.back": "#f2f2f2", + "style.TERMINAL.fill": "#c3e5fe", + "style.TERMINAL.back": "#c3e5fe", "style.SUBCIRCUIT.line": "#005bdc", - "style.SUBCIRCUIT.fill": "#f2f2f2", - "style.SUBCIRCUIT.back": "#f2f2f2", + "style.SUBCIRCUIT.fill": "#c3e5fe", + "style.SUBCIRCUIT.back": "#c3e5fe", "style.2D GRAPHIC.line": "#000000", - "style.2D GRAPHIC.fill": "#f2f2f2", - "style.2D GRAPHIC.back": "#f2f2f2", + "style.2D GRAPHIC.fill": "#c3e5fe", + "style.2D GRAPHIC.back": "#c3e5fe", "style.WIRE DOT.line": "#017424", "style.WIRE DOT.fill": "#017424", "style.WIRE DOT.back": "#017424", "style.WIRE.line": "#017424", - "style.WIRE.fill": "#f2f2f2", - "style.WIRE.back": "#f2f2f2", + "style.WIRE.fill": "#c3e5fe", + "style.WIRE.back": "#c3e5fe", "style.BUS WIRE.line": "#005bdc", - "style.BUS WIRE.fill": "#f2f2f2", - "style.BUS WIRE.back": "#f2f2f2", + "style.BUS WIRE.fill": "#c3e5fe", + "style.BUS WIRE.back": "#c3e5fe", "style.BORDER.line": "#028181", - "style.BORDER.fill": "#f2f2f2", - "style.BORDER.back": "#f2f2f2", + "style.BORDER.fill": "#c3e5fe", + "style.BORDER.back": "#c3e5fe", "style.TEMPLATE.line": "#005bdc", - "style.TEMPLATE.fill": "#f2f2f2", - "style.TEMPLATE.back": "#f2f2f2", + "style.TEMPLATE.fill": "#c3e5fe", + "style.TEMPLATE.back": "#c3e5fe", "text.COMPONENT ID": "#000000", "text.COMPONENT VALUE": "#000000", "text.PROPERTIES": "#000000", @@ -172,7 +172,7 @@ }, "fallback": { "line": "#000000", - "fill": "#f2f2f2", + "fill": "#c3e5fe", "text": "#000000" } } diff --git a/editors/proteus/shared/themes/Zacess Light.json b/editors/proteus/shared/themes/Zacess Light.json index 00245f6..3587928 100644 --- a/editors/proteus/shared/themes/Zacess Light.json +++ b/editors/proteus/shared/themes/Zacess Light.json @@ -39,7 +39,7 @@ "Ratsnest Colour": "(0x01,0x75,0x1C)", "Vector Colour": "(0x88,0x5A,0x00)", "Pin Number Colour": "(0x11,0x11,0x11)", - "Empty Zone Colour": "(0xF0,0xF0,0xF0)", + "Empty Zone Colour": "(0xD6,0xDD,0xE8)", "Dimmed Colour": "(0x9B,0xC3,0xFF)", "Drag Cursor Colour": "(0x00,0x87,0x22)", "Paper Colour": "(0xFF,0xFF,0xFF)", @@ -100,17 +100,17 @@ "design.logic0": "#006eed", "design.logicUnknown": "#424242", "style.COMPONENT.line": "#ca010e", - "style.COMPONENT.fill": "#f0f0f0", - "style.COMPONENT.back": "#f0f0f0", + "style.COMPONENT.fill": "#d6dde8", + "style.COMPONENT.back": "#d6dde8", "style.PIN.line": "#ca010e", - "style.PIN.fill": "#f0f0f0", - "style.PIN.back": "#f0f0f0", + "style.PIN.fill": "#d6dde8", + "style.PIN.back": "#d6dde8", "style.PORT.line": "#01751c", - "style.PORT.fill": "#f0f0f0", - "style.PORT.back": "#f0f0f0", + "style.PORT.fill": "#d6dde8", + "style.PORT.back": "#d6dde8", "style.MARKER.line": "#005fcc", - "style.MARKER.fill": "#f0f0f0", - "style.MARKER.back": "#f0f0f0", + "style.MARKER.fill": "#d6dde8", + "style.MARKER.back": "#d6dde8", "style.ACTUATOR.line": "#e90112", "style.ACTUATOR.fill": "#ca010e", "style.ACTUATOR.back": "#ca010e", @@ -118,41 +118,41 @@ "style.INDICATOR.fill": "#01751c", "style.INDICATOR.back": "#01751c", "style.VPROBE.line": "#005fcc", - "style.VPROBE.fill": "#f0f0f0", - "style.VPROBE.back": "#f0f0f0", + "style.VPROBE.fill": "#d6dde8", + "style.VPROBE.back": "#d6dde8", "style.IPROBE.line": "#005fcc", - "style.IPROBE.fill": "#f0f0f0", - "style.IPROBE.back": "#f0f0f0", + "style.IPROBE.fill": "#d6dde8", + "style.IPROBE.back": "#d6dde8", "style.TAPE.line": "#005fcc", - "style.TAPE.fill": "#f0f0f0", - "style.TAPE.back": "#f0f0f0", + "style.TAPE.fill": "#d6dde8", + "style.TAPE.back": "#d6dde8", "style.GENERATOR.line": "#005fcc", - "style.GENERATOR.fill": "#f0f0f0", - "style.GENERATOR.back": "#f0f0f0", + "style.GENERATOR.fill": "#d6dde8", + "style.GENERATOR.back": "#d6dde8", "style.TERMINAL.line": "#01751c", - "style.TERMINAL.fill": "#f0f0f0", - "style.TERMINAL.back": "#f0f0f0", + "style.TERMINAL.fill": "#d6dde8", + "style.TERMINAL.back": "#d6dde8", "style.SUBCIRCUIT.line": "#005fcc", - "style.SUBCIRCUIT.fill": "#f0f0f0", - "style.SUBCIRCUIT.back": "#f0f0f0", + "style.SUBCIRCUIT.fill": "#d6dde8", + "style.SUBCIRCUIT.back": "#d6dde8", "style.2D GRAPHIC.line": "#111111", - "style.2D GRAPHIC.fill": "#f0f0f0", - "style.2D GRAPHIC.back": "#f0f0f0", + "style.2D GRAPHIC.fill": "#d6dde8", + "style.2D GRAPHIC.back": "#d6dde8", "style.WIRE DOT.line": "#01751c", "style.WIRE DOT.fill": "#01751c", "style.WIRE DOT.back": "#01751c", "style.WIRE.line": "#01751c", - "style.WIRE.fill": "#f0f0f0", - "style.WIRE.back": "#f0f0f0", + "style.WIRE.fill": "#d6dde8", + "style.WIRE.back": "#d6dde8", "style.BUS WIRE.line": "#005fcc", - "style.BUS WIRE.fill": "#f0f0f0", - "style.BUS WIRE.back": "#f0f0f0", + "style.BUS WIRE.fill": "#d6dde8", + "style.BUS WIRE.back": "#d6dde8", "style.BORDER.line": "#028181", - "style.BORDER.fill": "#f0f0f0", - "style.BORDER.back": "#f0f0f0", + "style.BORDER.fill": "#d6dde8", + "style.BORDER.back": "#d6dde8", "style.TEMPLATE.line": "#005fcc", - "style.TEMPLATE.fill": "#f0f0f0", - "style.TEMPLATE.back": "#f0f0f0", + "style.TEMPLATE.fill": "#d6dde8", + "style.TEMPLATE.back": "#d6dde8", "text.COMPONENT ID": "#111111", "text.COMPONENT VALUE": "#111111", "text.PROPERTIES": "#111111", @@ -172,7 +172,7 @@ }, "fallback": { "line": "#111111", - "fill": "#f0f0f0", + "fill": "#d6dde8", "text": "#111111" } } diff --git a/editors/proteus/shared/themes/Zacess Warm Dark.json b/editors/proteus/shared/themes/Zacess Warm Dark.json new file mode 100644 index 0000000..309788d --- /dev/null +++ b/editors/proteus/shared/themes/Zacess Warm Dark.json @@ -0,0 +1,179 @@ +{ + "name": "Zacess Warm Dark", + "set": "ZACESS_WARM_DARK", + "values": { + "Layer TOP Colour": "(0xFC,0x9A,0x8D)", + "Layer I1 Colour": "(0xE4,0xB3,0x5B)", + "Layer I2 Colour": "(0x73,0xC2,0xB8)", + "Layer I3 Colour": "(0xDF,0xA1,0xCA)", + "Layer I4 Colour": "(0xA2,0xBE,0x6F)", + "Layer I5 Colour": "(0xB9,0xB1,0xA9)", + "Layer I6 Colour": "(0x88,0xB9,0xE3)", + "Layer I7 Colour": "(0xA2,0xBE,0x6F)", + "Layer I8 Colour": "(0xFC,0x9A,0x8D)", + "Layer I9 Colour": "(0xA2,0xBE,0x6F)", + "Layer I10 Colour": "(0x73,0xC2,0xB8)", + "Layer I11 Colour": "(0xDF,0xA1,0xCA)", + "Layer I12 Colour": "(0xA2,0xBE,0x6F)", + "Layer I13 Colour": "(0xDF,0xA1,0xCA)", + "Layer I14 Colour": "(0x73,0xC2,0xB8)", + "Layer BOT Colour": "(0x88,0xB9,0xE3)", + "Layer TS Colour": "(0x73,0xC2,0xB8)", + "Layer BS Colour": "(0xDF,0xA1,0xCA)", + "Layer TR Colour": "(0xA2,0xBE,0x6F)", + "Layer BR Colour": "(0xA2,0xBE,0x6F)", + "Layer TM Colour": "(0xA2,0xBE,0x6F)", + "Layer BM Colour": "(0xA2,0xBE,0x6F)", + "Layer M1 Colour": "(0xB9,0xB1,0xA9)", + "Layer M2 Colour": "(0xFC,0x9A,0x8D)", + "Layer M3 Colour": "(0xA2,0xBE,0x6F)", + "Layer M4 Colour": "(0xA2,0xBE,0x6F)", + "Layer RIP Colour": "(0xFC,0x9A,0x8D)", + "Layer KO Colour": "(0xFC,0x9A,0x8D)", + "Layer ED Colour": "(0xA2,0xBE,0x6F)", + "Layer DRL Colour": "(0xB9,0xB1,0xA9)", + "Layer OC Colour": "(0xA2,0xBE,0x6F)", + "Pad Colour": "(0xDF,0xA1,0xCA)", + "Thru Via Colour": "(0xA2,0xBE,0x6F)", + "Buried Via Colour": "(0x73,0xC2,0xB8)", + "Ratsnest Colour": "(0xA2,0xBE,0x6F)", + "Vector Colour": "(0xA2,0xBE,0x6F)", + "Pin Number Colour": "(0xE5,0xD5,0xB6)", + "Empty Zone Colour": "(0x36,0x32,0x2D)", + "Dimmed Colour": "(0x2C,0x46,0x5C)", + "Drag Cursor Colour": "(0xA2,0xBE,0x6F)", + "Paper Colour": "(0x21,0x1B,0x17)", + "Hilite Colour": "(0xE9,0xB5,0x6A)", + "Edit Box Colour": "(0xA2,0xBE,0x6F)", + "World Box Colour": "(0x88,0xB9,0xE3)", + "Grid Colour": "(0xCA,0xBC,0xA9)", + "Ratsnest Show": "Yes", + "Force Vectors Show": "No", + "Full Resist Show": "No", + "Full Paste Show": "No", + "Layer TOP Show": "Yes", + "Layer I1 Show": "Yes", + "Layer I2 Show": "Yes", + "Layer I3 Show": "Yes", + "Layer I4 Show": "Yes", + "Layer I5 Show": "Yes", + "Layer I6 Show": "Yes", + "Layer I7 Show": "Yes", + "Layer I8 Show": "Yes", + "Layer I9 Show": "Yes", + "Layer I10 Show": "Yes", + "Layer I11 Show": "Yes", + "Layer I12 Show": "Yes", + "Layer I13 Show": "Yes", + "Layer I14 Show": "Yes", + "Layer BOT Show": "Yes", + "Layer TS Show": "Yes", + "Layer BS Show": "Yes", + "Layer TR Show": "Yes", + "Layer BR Show": "Yes", + "Layer TM Show": "Yes", + "Layer BM Show": "Yes", + "Layer M1 Show": "Yes", + "Layer M2 Show": "Yes", + "Layer M3 Show": "Yes", + "Layer M4 Show": "Yes", + "Layer RIP Show": "Yes", + "Layer KO Show": "Yes", + "Layer ED Show": "Yes", + "Layer DRL Show": "Yes", + "Layer OC Show": "Yes", + "Shortcut": -1 + }, + "schematic": { + "colours": { + "design.paper": "#211b17", + "design.grid": "#7d7368", + "design.workArea": "#a2be6f", + "design.worldBox": "#88b9e3", + "design.highlight": "#e9b56a", + "design.drag": "#dfa1ca", + "design.hidden": "#cabca9", + "design.positive": "#fc9a8d", + "design.ground": "#a2be6f", + "design.negative": "#88b9e3", + "design.logic1": "#fc9a8d", + "design.logic0": "#88b9e3", + "design.logicUnknown": "#cabca9", + "style.COMPONENT.line": "#fc9a8d", + "style.COMPONENT.fill": "#36322d", + "style.COMPONENT.back": "#36322d", + "style.PIN.line": "#fc9a8d", + "style.PIN.fill": "#36322d", + "style.PIN.back": "#36322d", + "style.PORT.line": "#a2be6f", + "style.PORT.fill": "#36322d", + "style.PORT.back": "#36322d", + "style.MARKER.line": "#88b9e3", + "style.MARKER.fill": "#36322d", + "style.MARKER.back": "#36322d", + "style.ACTUATOR.line": "#fc9a8d", + "style.ACTUATOR.fill": "#fc9a8d", + "style.ACTUATOR.back": "#fc9a8d", + "style.INDICATOR.line": "#a2be6f", + "style.INDICATOR.fill": "#a2be6f", + "style.INDICATOR.back": "#a2be6f", + "style.VPROBE.line": "#88b9e3", + "style.VPROBE.fill": "#36322d", + "style.VPROBE.back": "#36322d", + "style.IPROBE.line": "#88b9e3", + "style.IPROBE.fill": "#36322d", + "style.IPROBE.back": "#36322d", + "style.TAPE.line": "#88b9e3", + "style.TAPE.fill": "#36322d", + "style.TAPE.back": "#36322d", + "style.GENERATOR.line": "#88b9e3", + "style.GENERATOR.fill": "#36322d", + "style.GENERATOR.back": "#36322d", + "style.TERMINAL.line": "#a2be6f", + "style.TERMINAL.fill": "#36322d", + "style.TERMINAL.back": "#36322d", + "style.SUBCIRCUIT.line": "#88b9e3", + "style.SUBCIRCUIT.fill": "#36322d", + "style.SUBCIRCUIT.back": "#36322d", + "style.2D GRAPHIC.line": "#e5d5b6", + "style.2D GRAPHIC.fill": "#36322d", + "style.2D GRAPHIC.back": "#36322d", + "style.WIRE DOT.line": "#a2be6f", + "style.WIRE DOT.fill": "#a2be6f", + "style.WIRE DOT.back": "#a2be6f", + "style.WIRE.line": "#a2be6f", + "style.WIRE.fill": "#36322d", + "style.WIRE.back": "#36322d", + "style.BUS WIRE.line": "#88b9e3", + "style.BUS WIRE.fill": "#36322d", + "style.BUS WIRE.back": "#36322d", + "style.BORDER.line": "#73c2b8", + "style.BORDER.fill": "#36322d", + "style.BORDER.back": "#36322d", + "style.TEMPLATE.line": "#88b9e3", + "style.TEMPLATE.fill": "#36322d", + "style.TEMPLATE.back": "#36322d", + "text.COMPONENT ID": "#e5d5b6", + "text.COMPONENT VALUE": "#e5d5b6", + "text.PROPERTIES": "#e5d5b6", + "text.TERMINAL LABEL": "#e5d5b6", + "text.WIRE LABEL": "#e5d5b6", + "text.SUBCKT ID": "#e5d5b6", + "text.SUBCKT NAME": "#e5d5b6", + "text.SCRIPT": "#e5d5b6", + "text.PIN NAME": "#e5d5b6", + "text.PIN NUMBER": "#e5d5b6", + "text.VPROBE LABEL": "#88b9e3", + "text.IPROBE LABEL": "#88b9e3", + "text.GENERATOR LABEL": "#88b9e3", + "text.TAPE LABEL": "#88b9e3", + "text.ACTIVE READOUT": "#a2be6f", + "text.ACTIVE REGION": "#88b9e3" + }, + "fallback": { + "line": "#e5d5b6", + "fill": "#36322d", + "text": "#e5d5b6" + } + } +} diff --git a/editors/proteus/shared/themes/Zacess Warm Light.json b/editors/proteus/shared/themes/Zacess Warm Light.json new file mode 100644 index 0000000..e9a4064 --- /dev/null +++ b/editors/proteus/shared/themes/Zacess Warm Light.json @@ -0,0 +1,179 @@ +{ + "name": "Zacess Warm Light", + "set": "ZACESS_WARM_LIGHT", + "values": { + "Layer TOP Colour": "(0xA4,0x33,0x2B)", + "Layer I1 Colour": "(0xA4,0x33,0x2B)", + "Layer I2 Colour": "(0x06,0x66,0x62)", + "Layer I3 Colour": "(0x8A,0x40,0x74)", + "Layer I4 Colour": "(0x84,0x57,0x01)", + "Layer I5 Colour": "(0x60,0x57,0x4C)", + "Layer I6 Colour": "(0x11,0x5F,0x93)", + "Layer I7 Colour": "(0x38,0x66,0x16)", + "Layer I8 Colour": "(0x8C,0x1A,0x16)", + "Layer I9 Colour": "(0x38,0x66,0x16)", + "Layer I10 Colour": "(0x06,0x66,0x62)", + "Layer I11 Colour": "(0x74,0x2C,0x60)", + "Layer I12 Colour": "(0x84,0x57,0x01)", + "Layer I13 Colour": "(0x74,0x2C,0x60)", + "Layer I14 Colour": "(0x05,0x51,0x4D)", + "Layer BOT Colour": "(0x11,0x5F,0x93)", + "Layer TS Colour": "(0x06,0x66,0x62)", + "Layer BS Colour": "(0x8A,0x40,0x74)", + "Layer TR Colour": "(0x38,0x66,0x16)", + "Layer BR Colour": "(0x38,0x66,0x16)", + "Layer TM Colour": "(0x84,0x57,0x01)", + "Layer BM Colour": "(0x84,0x57,0x01)", + "Layer M1 Colour": "(0x60,0x57,0x4C)", + "Layer M2 Colour": "(0xA4,0x33,0x2B)", + "Layer M3 Colour": "(0x38,0x66,0x16)", + "Layer M4 Colour": "(0x84,0x57,0x01)", + "Layer RIP Colour": "(0xA4,0x33,0x2B)", + "Layer KO Colour": "(0xA4,0x33,0x2B)", + "Layer ED Colour": "(0x84,0x57,0x01)", + "Layer DRL Colour": "(0x60,0x57,0x4C)", + "Layer OC Colour": "(0x6A,0x46,0x03)", + "Pad Colour": "(0x8A,0x40,0x74)", + "Thru Via Colour": "(0x84,0x57,0x01)", + "Buried Via Colour": "(0x06,0x66,0x62)", + "Ratsnest Colour": "(0x38,0x66,0x16)", + "Vector Colour": "(0x84,0x57,0x01)", + "Pin Number Colour": "(0x34,0x24,0x10)", + "Empty Zone Colour": "(0xD0,0xCE,0xC0)", + "Dimmed Colour": "(0xA0,0xD2,0xFE)", + "Drag Cursor Colour": "(0x38,0x66,0x16)", + "Paper Colour": "(0xF4,0xEA,0xD5)", + "Hilite Colour": "(0x6D,0x3B,0x02)", + "Edit Box Colour": "(0x38,0x66,0x16)", + "World Box Colour": "(0x11,0x5F,0x93)", + "Grid Colour": "(0x48,0x3B,0x2C)", + "Ratsnest Show": "Yes", + "Force Vectors Show": "Yes", + "Full Resist Show": "No", + "Full Paste Show": "No", + "Layer TOP Show": "Yes", + "Layer I1 Show": "Yes", + "Layer I2 Show": "Yes", + "Layer I3 Show": "Yes", + "Layer I4 Show": "Yes", + "Layer I5 Show": "Yes", + "Layer I6 Show": "Yes", + "Layer I7 Show": "Yes", + "Layer I8 Show": "Yes", + "Layer I9 Show": "Yes", + "Layer I10 Show": "Yes", + "Layer I11 Show": "Yes", + "Layer I12 Show": "Yes", + "Layer I13 Show": "Yes", + "Layer I14 Show": "Yes", + "Layer BOT Show": "Yes", + "Layer TS Show": "Yes", + "Layer BS Show": "Yes", + "Layer TR Show": "Yes", + "Layer BR Show": "Yes", + "Layer TM Show": "Yes", + "Layer BM Show": "Yes", + "Layer M1 Show": "Yes", + "Layer M2 Show": "Yes", + "Layer M3 Show": "Yes", + "Layer M4 Show": "Yes", + "Layer RIP Show": "Yes", + "Layer KO Show": "Yes", + "Layer ED Show": "Yes", + "Layer DRL Show": "Yes", + "Layer OC Show": "Yes", + "Shortcut": -1 + }, + "schematic": { + "colours": { + "design.paper": "#f4ead5", + "design.grid": "#8a7e71", + "design.workArea": "#386616", + "design.worldBox": "#115f93", + "design.highlight": "#6d3b02", + "design.drag": "#8a4074", + "design.hidden": "#483b2c", + "design.positive": "#a4332b", + "design.ground": "#386616", + "design.negative": "#115f93", + "design.logic1": "#a4332b", + "design.logic0": "#115f93", + "design.logicUnknown": "#483b2c", + "style.COMPONENT.line": "#8c1a16", + "style.COMPONENT.fill": "#d0cec0", + "style.COMPONENT.back": "#d0cec0", + "style.PIN.line": "#8c1a16", + "style.PIN.fill": "#d0cec0", + "style.PIN.back": "#d0cec0", + "style.PORT.line": "#275200", + "style.PORT.fill": "#d0cec0", + "style.PORT.back": "#d0cec0", + "style.MARKER.line": "#014b79", + "style.MARKER.fill": "#d0cec0", + "style.MARKER.back": "#d0cec0", + "style.ACTUATOR.line": "#a4332b", + "style.ACTUATOR.fill": "#8c1a16", + "style.ACTUATOR.back": "#8c1a16", + "style.INDICATOR.line": "#386616", + "style.INDICATOR.fill": "#275200", + "style.INDICATOR.back": "#275200", + "style.VPROBE.line": "#115f93", + "style.VPROBE.fill": "#d0cec0", + "style.VPROBE.back": "#d0cec0", + "style.IPROBE.line": "#115f93", + "style.IPROBE.fill": "#d0cec0", + "style.IPROBE.back": "#d0cec0", + "style.TAPE.line": "#115f93", + "style.TAPE.fill": "#d0cec0", + "style.TAPE.back": "#d0cec0", + "style.GENERATOR.line": "#115f93", + "style.GENERATOR.fill": "#d0cec0", + "style.GENERATOR.back": "#d0cec0", + "style.TERMINAL.line": "#275200", + "style.TERMINAL.fill": "#d0cec0", + "style.TERMINAL.back": "#d0cec0", + "style.SUBCIRCUIT.line": "#014b79", + "style.SUBCIRCUIT.fill": "#d0cec0", + "style.SUBCIRCUIT.back": "#d0cec0", + "style.2D GRAPHIC.line": "#342410", + "style.2D GRAPHIC.fill": "#d0cec0", + "style.2D GRAPHIC.back": "#d0cec0", + "style.WIRE DOT.line": "#275200", + "style.WIRE DOT.fill": "#275200", + "style.WIRE DOT.back": "#275200", + "style.WIRE.line": "#275200", + "style.WIRE.fill": "#d0cec0", + "style.WIRE.back": "#d0cec0", + "style.BUS WIRE.line": "#115f93", + "style.BUS WIRE.fill": "#d0cec0", + "style.BUS WIRE.back": "#d0cec0", + "style.BORDER.line": "#066662", + "style.BORDER.fill": "#d0cec0", + "style.BORDER.back": "#d0cec0", + "style.TEMPLATE.line": "#014b79", + "style.TEMPLATE.fill": "#d0cec0", + "style.TEMPLATE.back": "#d0cec0", + "text.COMPONENT ID": "#342410", + "text.COMPONENT VALUE": "#342410", + "text.PROPERTIES": "#342410", + "text.TERMINAL LABEL": "#342410", + "text.WIRE LABEL": "#342410", + "text.SUBCKT ID": "#342410", + "text.SUBCKT NAME": "#342410", + "text.SCRIPT": "#342410", + "text.PIN NAME": "#342410", + "text.PIN NUMBER": "#342410", + "text.VPROBE LABEL": "#115f93", + "text.IPROBE LABEL": "#115f93", + "text.GENERATOR LABEL": "#115f93", + "text.TAPE LABEL": "#115f93", + "text.ACTIVE READOUT": "#386616", + "text.ACTIVE REGION": "#115f93" + }, + "fallback": { + "line": "#342410", + "fill": "#d0cec0", + "text": "#342410" + } + } +} diff --git a/editors/proteus/shared/themes/Zacess Yellow on Black.json b/editors/proteus/shared/themes/Zacess Yellow on Black.json index 4a1b1be..73d10be 100644 --- a/editors/proteus/shared/themes/Zacess Yellow on Black.json +++ b/editors/proteus/shared/themes/Zacess Yellow on Black.json @@ -39,7 +39,7 @@ "Ratsnest Colour": "(0x3C,0xFF,0x5D)", "Vector Colour": "(0xED,0xB6,0x18)", "Pin Number Colour": "(0xFF,0xEB,0x3B)", - "Empty Zone Colour": "(0x14,0x14,0x14)", + "Empty Zone Colour": "(0x26,0x26,0x26)", "Dimmed Colour": "(0x09,0xBC,0xC4)", "Drag Cursor Colour": "(0x01,0xDC,0x3F)", "Paper Colour": "(0x00,0x00,0x00)", @@ -100,17 +100,17 @@ "design.logic0": "#90c1ff", "design.logicUnknown": "#e6e6e6", "style.COMPONENT.line": "#ffa79b", - "style.COMPONENT.fill": "#141414", - "style.COMPONENT.back": "#141414", + "style.COMPONENT.fill": "#262626", + "style.COMPONENT.back": "#262626", "style.PIN.line": "#ffa79b", - "style.PIN.fill": "#141414", - "style.PIN.back": "#141414", + "style.PIN.fill": "#262626", + "style.PIN.back": "#262626", "style.PORT.line": "#01dc3f", - "style.PORT.fill": "#141414", - "style.PORT.back": "#141414", + "style.PORT.fill": "#262626", + "style.PORT.back": "#262626", "style.MARKER.line": "#90c1ff", - "style.MARKER.fill": "#141414", - "style.MARKER.back": "#141414", + "style.MARKER.fill": "#262626", + "style.MARKER.back": "#262626", "style.ACTUATOR.line": "#ffa79b", "style.ACTUATOR.fill": "#ffa79b", "style.ACTUATOR.back": "#ffa79b", @@ -118,41 +118,41 @@ "style.INDICATOR.fill": "#01dc3f", "style.INDICATOR.back": "#01dc3f", "style.VPROBE.line": "#90c1ff", - "style.VPROBE.fill": "#141414", - "style.VPROBE.back": "#141414", + "style.VPROBE.fill": "#262626", + "style.VPROBE.back": "#262626", "style.IPROBE.line": "#90c1ff", - "style.IPROBE.fill": "#141414", - "style.IPROBE.back": "#141414", + "style.IPROBE.fill": "#262626", + "style.IPROBE.back": "#262626", "style.TAPE.line": "#90c1ff", - "style.TAPE.fill": "#141414", - "style.TAPE.back": "#141414", + "style.TAPE.fill": "#262626", + "style.TAPE.back": "#262626", "style.GENERATOR.line": "#90c1ff", - "style.GENERATOR.fill": "#141414", - "style.GENERATOR.back": "#141414", + "style.GENERATOR.fill": "#262626", + "style.GENERATOR.back": "#262626", "style.TERMINAL.line": "#01dc3f", - "style.TERMINAL.fill": "#141414", - "style.TERMINAL.back": "#141414", + "style.TERMINAL.fill": "#262626", + "style.TERMINAL.back": "#262626", "style.SUBCIRCUIT.line": "#90c1ff", - "style.SUBCIRCUIT.fill": "#141414", - "style.SUBCIRCUIT.back": "#141414", + "style.SUBCIRCUIT.fill": "#262626", + "style.SUBCIRCUIT.back": "#262626", "style.2D GRAPHIC.line": "#ffeb3b", - "style.2D GRAPHIC.fill": "#141414", - "style.2D GRAPHIC.back": "#141414", + "style.2D GRAPHIC.fill": "#262626", + "style.2D GRAPHIC.back": "#262626", "style.WIRE DOT.line": "#01dc3f", "style.WIRE DOT.fill": "#01dc3f", "style.WIRE DOT.back": "#01dc3f", "style.WIRE.line": "#01dc3f", - "style.WIRE.fill": "#141414", - "style.WIRE.back": "#141414", + "style.WIRE.fill": "#262626", + "style.WIRE.back": "#262626", "style.BUS WIRE.line": "#90c1ff", - "style.BUS WIRE.fill": "#141414", - "style.BUS WIRE.back": "#141414", + "style.BUS WIRE.fill": "#262626", + "style.BUS WIRE.back": "#262626", "style.BORDER.line": "#1fd3d3", - "style.BORDER.fill": "#141414", - "style.BORDER.back": "#141414", + "style.BORDER.fill": "#262626", + "style.BORDER.back": "#262626", "style.TEMPLATE.line": "#90c1ff", - "style.TEMPLATE.fill": "#141414", - "style.TEMPLATE.back": "#141414", + "style.TEMPLATE.fill": "#262626", + "style.TEMPLATE.back": "#262626", "text.COMPONENT ID": "#ffeb3b", "text.COMPONENT VALUE": "#ffeb3b", "text.PROPERTIES": "#ffeb3b", @@ -172,7 +172,7 @@ }, "fallback": { "line": "#ffeb3b", - "fill": "#141414", + "fill": "#262626", "text": "#ffeb3b" } } diff --git a/editors/proteus/windows/apply.ps1 b/editors/proteus/windows/apply.ps1 index 9c59758..d6dce0f 100644 --- a/editors/proteus/windows/apply.ps1 +++ b/editors/proteus/windows/apply.ps1 @@ -1,13 +1,14 @@ # sets Proteus 8's schematic, PCB layout and graph viewer colours to one of the Zacess themes. # usage: .\apply.ps1 [-Theme ] [-Project <.pdsprj file or folder> ...] # -# -Theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# -Theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. -Theme proteus puts back Proteus's own colours: its default schematic colours and its # Black Paper set for the PCB layout and graphs. # # PCB layout and graphs: every theme in ..\shared\themes becomes a colour set beside Proteus's own -# Black Paper and White Paper, so all eight can be picked inside Proteus too. the chosen one +# Black Paper and White Paper, so all ten can be picked inside Proteus too. the chosen one # becomes the active set. Proteus's own sets are never touched. # # schematic: Proteus copies its colours from a design template into each new design, so the @@ -32,13 +33,14 @@ $themeNames = [ordered]@{ 'hc-light' = 'Zacess High Contrast Light'; 'high-contrast-light' = 'Zacess High Contrast Light' 'dark' = 'Zacess Dark'; 'light' = 'Zacess Light'; 'cream' = 'Zacess Cream' 'yellow' = 'Zacess Yellow on Black'; 'yellow-on-black' = 'Zacess Yellow on Black' + 'warm-dark' = 'Zacess Warm Dark'; 'warm-light' = 'Zacess Warm Light' } $key = ($Theme.ToLowerInvariant() -replace '^zacess[ -]', '') -replace ' ', '-' # "proteus" puts back Proteus's own colours: its default schematic colours and its Black Paper set $name = if ($key -in 'proteus', 'default') { 'Proteus' } else { $themeNames[$key] } if (-not $name) { [Console]::Error.WriteLine("Unknown theme: $Theme") - [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow or proteus.') + [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark, warm-light or proteus.') exit 1 } diff --git a/editors/stm32cubeide/ACCESSIBILITY.md b/editors/stm32cubeide/ACCESSIBILITY.md index 58c014b..4cc7670 100644 --- a/editors/stm32cubeide/ACCESSIBILITY.md +++ b/editors/stm32cubeide/ACCESSIBILITY.md @@ -9,7 +9,7 @@ Large editor text, autosave, colours that keep macros apart from functions and t - Editor and console text is GeistMono Nerd Font at 18 points on the Mac and 14 on Windows and Linux (the same size on screen), larger than STM32CubeIDE's default. The C editor uses the same font. `Ctrl+=` and `Ctrl+-` (`Cmd+=` and `Cmd+-` on the Mac) zoom the editor text. - The current line is highlighted and line numbers are always on, so the cursor and an error's line are quick to find. -- The editor uses Zacess Deep Contrast Dark from [Zacess Themes](https://github.com/zacesshq/themes) 0.5.0 with the **Dark** workbench theme: white on pure black with deep, fully saturated colours and a yellow outline on the focused tab. All eight Zacess themes are in `shared/theme/`; the apply scripts merge any of them with `--theme` (`-Theme` on Windows). Measured contrast is in the [Zacess Themes accessibility statement](https://github.com/zacesshq/themes/blob/main/ACCESSIBILITY.md). +- The editor uses Zacess Deep Contrast Dark from [Zacess Themes](https://github.com/zacesshq/themes) 1.0.0 with the **Dark** workbench theme: white on pure black with deep, fully saturated colours and a yellow outline on the focused tab. All ten Zacess themes are in `shared/theme/`; the apply scripts merge any of them with `--theme` (`-Theme` on Windows). Measured contrast is in the [Zacess Themes accessibility statement](https://github.com/zacesshq/themes/blob/main/ACCESSIBILITY.md). - Macros and directives have their own colour, separate from functions and keywords in every theme, so a HAL macro is never confused with a function call. Colour is never the only signal: keywords are also bold. - STM32CubeIDE cannot follow the system light and dark setting, so the theme stays fixed until another one is merged. - The Terminal uses the Mono build of the same font, so the prompt's symbols draw inside one cell. diff --git a/editors/stm32cubeide/README.md b/editors/stm32cubeide/README.md index 8cf9c57..34875c7 100644 --- a/editors/stm32cubeide/README.md +++ b/editors/stm32cubeide/README.md @@ -1,6 +1,6 @@ # stm32cubeide -> STM32CubeIDE preferences: the eight Zacess colour themes mapped to C, Geist Mono, 15 VS Code style key bindings and a merge script per platform that applies them to a workspace without touching anything else. +> STM32CubeIDE preferences: the ten Zacess colour themes mapped to C, Geist Mono, 15 VS Code style key bindings and a merge script per platform that applies them to a workspace without touching anything else. STM32CubeIDE is ST's Eclipse-based IDE for STM32 microcontrollers. It sits on Eclipse (4.38 in STM32CubeIDE 2.2) with CDT for C and C++, so like Eclipse it keeps preferences in `.prefs` files inside each workspace's `.metadata` folder, mixed in with values it writes for itself (window state, recent files, debug probes, toolchain paths). Copying those files over would wipe all of that, so this folder tracks only the keys that were deliberately changed and merges them in. The Eclipse IDE counterpart is [eclipse](../eclipse). STM32CubeIDE gets its own folder because it edits C through CDT and keeps its own workspace. @@ -8,7 +8,7 @@ STM32CubeIDE is ST's Eclipse-based IDE for STM32 microcontrollers. It sits on Ec - **`shared/prefs/`** - the tracked keys, one fragment per `.prefs` file: autosave every 20 seconds, line numbers, spaces for tabs at width 4, current line highlight, spell checking in British English (C files included) and the 15 key bindings. Every key explained in [guides/reference.md](guides/reference.md). - **`/prefs/`** - the editor, C editor and Terminal font for each platform: GeistMono Nerd Font at 18 points on the Mac and 14 on Windows and Linux, which matches on screen. The Terminal uses its Nerd Font Mono variant, whose icons fit one cell. -- **`shared/theme/`** - the eight Zacess themes for STM32CubeIDE, built by [`scripts/build-themes.py`](scripts/build-themes.py) from the Zacess Eclipse themes: editor colours, C syntax and semantic colours, Doxygen comments and the Terminal palette, plus tab outlines for the two Deep Contrast themes. The apply scripts merge Zacess Deep Contrast Dark by default. `--theme` picks another. +- **`shared/theme/`** - the ten Zacess themes for STM32CubeIDE, built by [`scripts/build-themes.py`](scripts/build-themes.py) from the Zacess Eclipse themes: editor colours, C syntax and semantic colours, Doxygen comments and the Terminal palette, plus tab outlines for the two Deep Contrast themes. The apply scripts merge Zacess Deep Contrast Dark by default. `--theme` picks another. - **`/apply.sh`** and **`windows/apply.ps1`** - find the workspace, merge the fragments and the chosen theme in key by key and print what changed. They refuse to run while STM32CubeIDE is open and make no backup: this folder holds every value they write and every other key is left as it was. - **`/README.md`** - installing STM32CubeIDE on that platform. @@ -34,7 +34,7 @@ Replace `` with `mac` or `linux`. On Windows run `pwsh -File "$HOME\de | --- | --- | | [`ACCESSIBILITY.md`](ACCESSIBILITY.md) | The Zacess theme, font size, autosave, spell checking and the key bindings | | [`shared/prefs/`](shared/prefs/) | The tracked keys, merged on every platform | -| [`shared/theme/`](shared/theme/) | The eight Zacess themes for STM32CubeIDE and the Deep Contrast tab outlines | +| [`shared/theme/`](shared/theme/) | The ten Zacess themes for STM32CubeIDE and the Deep Contrast tab outlines | | [`scripts/`](scripts/) | `build-themes.py`, which builds `shared/theme/` from the Zacess Eclipse themes | | [`mac/`](mac/) | Merge script, the Mac font and the install steps | | [`linux/`](linux/) | Merge script, font and the install steps for Fedora, Ubuntu and Debian | diff --git a/editors/stm32cubeide/guides/reference.md b/editors/stm32cubeide/guides/reference.md index 5000bb0..1f57263 100644 --- a/editors/stm32cubeide/guides/reference.md +++ b/editors/stm32cubeide/guides/reference.md @@ -73,7 +73,7 @@ The full binding list as stored, with the command and context ids, is the `org.e ## Colours -`shared/theme/` holds the eight Zacess themes for STM32CubeIDE (`Zacess .epf`) and the tab outline files for the two Deep Contrast themes. They are built by [`scripts/build-themes.py`](../scripts/build-themes.py) from the Zacess Eclipse themes in [Zacess Themes](https://github.com/zacesshq/themes) 0.5.0, so the palette and measured contrast are the same: +`shared/theme/` holds the ten Zacess themes for STM32CubeIDE (`Zacess .epf`) and the tab outline files for the two Deep Contrast themes. They are built by [`scripts/build-themes.py`](../scripts/build-themes.py) from the Zacess Eclipse themes in [Zacess Themes](https://github.com/zacesshq/themes) 1.0.0, so the palette and measured contrast are the same: - **Editor colours** (background, text, selection, current line, line numbers, markers) carry over unchanged. - **C syntax colours** come from the Java colour that plays the same part: keywords and types from Java keywords, strings and `#include` headers from strings, comments from comments and numbers from Java's number colour. @@ -99,6 +99,8 @@ The apply scripts merge a theme after the tracked keys: each `/instance/ | `light` | Zacess Light | Light | | `cream` | Zacess Cream | Light | | `yellow` | Zacess Yellow on Black | Dark | +| `warm-dark` | Zacess Warm Dark | Dark | +| `warm-light` | Zacess Warm Light | Light | STM32CubeIDE has no setting to follow the system light and dark appearance, so the theme stays fixed. By hand, **File > Import > General > Preferences** imports any `.epf`, then **General > Appearance** picks Light or Dark and STM32CubeIDE restarts. diff --git a/editors/stm32cubeide/linux/apply.sh b/editors/stm32cubeide/linux/apply.sh index 3d0a835..7005c9f 100755 --- a/editors/stm32cubeide/linux/apply.sh +++ b/editors/stm32cubeide/linux/apply.sh @@ -3,10 +3,11 @@ # usage: apply.sh [--theme | --no-theme] [workspace] # (defaults to the newest ~/STM32CubeIDE/workspace_ that STM32CubeIDE has opened) # -# --theme merges one of the eight Zacess themes from ../shared/theme (editor, C +# --theme merges one of the ten Zacess themes from ../shared/theme (editor, C # syntax and Terminal colours, plus the tab outlines for the two Deep Contrast # themes) and sets the matching Light or Dark workbench theme. It takes a short -# name (deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow), +# name (deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, +# warm-dark, warm-light), # an id (deep-contrast-dark) or the full name. the default is deep-dark. # # mac/apply.sh and linux/apply.sh are the same file. the values live in @@ -61,6 +62,8 @@ theme_name() { light) echo "Zacess Light|light" ;; cream) echo "Zacess Cream|light" ;; yellow|yellow-on-black) echo "Zacess Yellow on Black|dark" ;; + warm-dark) echo "Zacess Warm Dark|dark" ;; + warm-light) echo "Zacess Warm Light|light" ;; *) return 1 ;; esac } @@ -68,7 +71,7 @@ theme_name() { if [ -n "$theme" ]; then if ! picked="$(theme_name "$theme")"; then echo "Unknown theme: $theme" >&2 - echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow." >&2 + echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light." >&2 exit 1 fi fi diff --git a/editors/stm32cubeide/mac/apply.sh b/editors/stm32cubeide/mac/apply.sh index 3d0a835..7005c9f 100755 --- a/editors/stm32cubeide/mac/apply.sh +++ b/editors/stm32cubeide/mac/apply.sh @@ -3,10 +3,11 @@ # usage: apply.sh [--theme | --no-theme] [workspace] # (defaults to the newest ~/STM32CubeIDE/workspace_ that STM32CubeIDE has opened) # -# --theme merges one of the eight Zacess themes from ../shared/theme (editor, C +# --theme merges one of the ten Zacess themes from ../shared/theme (editor, C # syntax and Terminal colours, plus the tab outlines for the two Deep Contrast # themes) and sets the matching Light or Dark workbench theme. It takes a short -# name (deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow), +# name (deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, +# warm-dark, warm-light), # an id (deep-contrast-dark) or the full name. the default is deep-dark. # # mac/apply.sh and linux/apply.sh are the same file. the values live in @@ -61,6 +62,8 @@ theme_name() { light) echo "Zacess Light|light" ;; cream) echo "Zacess Cream|light" ;; yellow|yellow-on-black) echo "Zacess Yellow on Black|dark" ;; + warm-dark) echo "Zacess Warm Dark|dark" ;; + warm-light) echo "Zacess Warm Light|light" ;; *) return 1 ;; esac } @@ -68,7 +71,7 @@ theme_name() { if [ -n "$theme" ]; then if ! picked="$(theme_name "$theme")"; then echo "Unknown theme: $theme" >&2 - echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow." >&2 + echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light." >&2 exit 1 fi fi diff --git a/editors/stm32cubeide/scripts/build-themes.py b/editors/stm32cubeide/scripts/build-themes.py index d8f3fcc..09fdde2 100644 --- a/editors/stm32cubeide/scripts/build-themes.py +++ b/editors/stm32cubeide/scripts/build-themes.py @@ -15,7 +15,7 @@ THEMES = [ "Zacess Deep Contrast Dark", "Zacess Deep Contrast Light", "Zacess High Contrast Dark", "Zacess High Contrast Light", "Zacess Dark", "Zacess Light", "Zacess Cream", - "Zacess Yellow on Black", + "Zacess Yellow on Black", "Zacess Warm Dark", "Zacess Warm Light", ] # CDT syntax colour key: the JDT key it takes its colour and style from. CDT has no number diff --git a/editors/stm32cubeide/shared/theme/Zacess Cream.epf b/editors/stm32cubeide/shared/theme/Zacess Cream.epf index fc3628d..7f5f39a 100644 --- a/editors/stm32cubeide/shared/theme/Zacess Cream.epf +++ b/editors/stm32cubeide/shared/theme/Zacess Cream.epf @@ -9,7 +9,7 @@ file_export_version=3.0 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionBackground.SystemDefault=false /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground=253,246,227 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground.SystemDefault=false -/instance/org.eclipse.ui.editors/currentLineColor=243,234,210 +/instance/org.eclipse.ui.editors/currentLineColor=200,218,221 /instance/org.eclipse.ui.editors/lineNumberColor=74,67,55 /instance/org.eclipse.ui.editors/printMarginColor=133,123,105 /instance/org.eclipse.ui.editors/hyperlinkColor=0,68,152 @@ -28,7 +28,7 @@ file_export_version=3.0 /instance/org.eclipse.ui.editors/searchResultHighlighting=false /instance/org.eclipse.ui.editors/searchResultTextStyle=BOX /instance/org.eclipse.ui.editors/errorIndicationColor=119,0,4 -/instance/org.eclipse.ui.editors/warningIndicationColor=81,49,0 +/instance/org.eclipse.ui.editors/warningIndicationColor=128,50,0 /instance/org.eclipse.ui.editors/infoIndicationColor=0,53,122 /instance/org.eclipse.ui.editors/spellingIndicationColor=0,53,122 /instance/org.eclipse.ui.editors/changeIndicationColor=0,21,56 diff --git a/editors/stm32cubeide/shared/theme/Zacess Dark.epf b/editors/stm32cubeide/shared/theme/Zacess Dark.epf index 36b6825..d4a8291 100644 --- a/editors/stm32cubeide/shared/theme/Zacess Dark.epf +++ b/editors/stm32cubeide/shared/theme/Zacess Dark.epf @@ -9,7 +9,7 @@ file_export_version=3.0 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionBackground.SystemDefault=false /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground=18,18,18 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground.SystemDefault=false -/instance/org.eclipse.ui.editors/currentLineColor=31,31,31 +/instance/org.eclipse.ui.editors/currentLineColor=47,47,47 /instance/org.eclipse.ui.editors/lineNumberColor=184,184,184 /instance/org.eclipse.ui.editors/printMarginColor=107,107,107 /instance/org.eclipse.ui.editors/hyperlinkColor=140,188,255 @@ -28,7 +28,7 @@ file_export_version=3.0 /instance/org.eclipse.ui.editors/searchResultHighlighting=false /instance/org.eclipse.ui.editors/searchResultTextStyle=BOX /instance/org.eclipse.ui.editors/errorIndicationColor=255,204,196 -/instance/org.eclipse.ui.editors/warningIndicationColor=255,209,130 +/instance/org.eclipse.ui.editors/warningIndicationColor=237,192,113 /instance/org.eclipse.ui.editors/infoIndicationColor=189,218,255 /instance/org.eclipse.ui.editors/spellingIndicationColor=189,218,255 /instance/org.eclipse.ui.editors/changeIndicationColor=201,224,255 diff --git a/editors/stm32cubeide/shared/theme/Zacess Deep Contrast Dark.epf b/editors/stm32cubeide/shared/theme/Zacess Deep Contrast Dark.epf index 5387031..a5cac77 100644 --- a/editors/stm32cubeide/shared/theme/Zacess Deep Contrast Dark.epf +++ b/editors/stm32cubeide/shared/theme/Zacess Deep Contrast Dark.epf @@ -9,7 +9,7 @@ file_export_version=3.0 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionBackground.SystemDefault=false /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground=0,0,0 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground.SystemDefault=false -/instance/org.eclipse.ui.editors/currentLineColor=20,20,20 +/instance/org.eclipse.ui.editors/currentLineColor=38,38,38 /instance/org.eclipse.ui.editors/lineNumberColor=255,255,255 /instance/org.eclipse.ui.editors/printMarginColor=140,140,140 /instance/org.eclipse.ui.editors/hyperlinkColor=29,180,255 diff --git a/editors/stm32cubeide/shared/theme/Zacess Deep Contrast Light.epf b/editors/stm32cubeide/shared/theme/Zacess Deep Contrast Light.epf index 95e8e76..add06fa 100644 --- a/editors/stm32cubeide/shared/theme/Zacess Deep Contrast Light.epf +++ b/editors/stm32cubeide/shared/theme/Zacess Deep Contrast Light.epf @@ -9,7 +9,7 @@ file_export_version=3.0 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionBackground.SystemDefault=false /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground=255,255,255 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground.SystemDefault=false -/instance/org.eclipse.ui.editors/currentLineColor=245,245,245 +/instance/org.eclipse.ui.editors/currentLineColor=200,222,189 /instance/org.eclipse.ui.editors/lineNumberColor=0,0,0 /instance/org.eclipse.ui.editors/printMarginColor=110,110,110 /instance/org.eclipse.ui.editors/hyperlinkColor=0,61,246 @@ -28,7 +28,7 @@ file_export_version=3.0 /instance/org.eclipse.ui.editors/searchResultHighlighting=false /instance/org.eclipse.ui.editors/searchResultTextStyle=BOX /instance/org.eclipse.ui.editors/errorIndicationColor=170,0,0 -/instance/org.eclipse.ui.editors/warningIndicationColor=103,65,0 +/instance/org.eclipse.ui.editors/warningIndicationColor=100,38,0 /instance/org.eclipse.ui.editors/infoIndicationColor=0,46,194 /instance/org.eclipse.ui.editors/spellingIndicationColor=0,46,194 /instance/org.eclipse.ui.editors/changeIndicationColor=0,46,194 diff --git a/editors/stm32cubeide/shared/theme/Zacess High Contrast Dark.epf b/editors/stm32cubeide/shared/theme/Zacess High Contrast Dark.epf index f4c45bc..cb3afb3 100644 --- a/editors/stm32cubeide/shared/theme/Zacess High Contrast Dark.epf +++ b/editors/stm32cubeide/shared/theme/Zacess High Contrast Dark.epf @@ -9,7 +9,7 @@ file_export_version=3.0 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionBackground.SystemDefault=false /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground=0,0,0 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground.SystemDefault=false -/instance/org.eclipse.ui.editors/currentLineColor=26,26,26 +/instance/org.eclipse.ui.editors/currentLineColor=38,38,38 /instance/org.eclipse.ui.editors/lineNumberColor=230,230,230 /instance/org.eclipse.ui.editors/printMarginColor=140,140,140 /instance/org.eclipse.ui.editors/hyperlinkColor=143,208,255 diff --git a/editors/stm32cubeide/shared/theme/Zacess High Contrast Light.epf b/editors/stm32cubeide/shared/theme/Zacess High Contrast Light.epf index a868c94..6046639 100644 --- a/editors/stm32cubeide/shared/theme/Zacess High Contrast Light.epf +++ b/editors/stm32cubeide/shared/theme/Zacess High Contrast Light.epf @@ -9,7 +9,7 @@ file_export_version=3.0 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionBackground.SystemDefault=false /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground=255,255,255 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground.SystemDefault=false -/instance/org.eclipse.ui.editors/currentLineColor=242,242,242 +/instance/org.eclipse.ui.editors/currentLineColor=195,229,254 /instance/org.eclipse.ui.editors/lineNumberColor=38,38,38 /instance/org.eclipse.ui.editors/printMarginColor=110,110,110 /instance/org.eclipse.ui.editors/hyperlinkColor=0,61,153 @@ -28,7 +28,7 @@ file_export_version=3.0 /instance/org.eclipse.ui.editors/searchResultHighlighting=false /instance/org.eclipse.ui.editors/searchResultTextStyle=BOX /instance/org.eclipse.ui.editors/errorIndicationColor=139,0,0 -/instance/org.eclipse.ui.editors/warningIndicationColor=90,58,0 +/instance/org.eclipse.ui.editors/warningIndicationColor=78,28,0 /instance/org.eclipse.ui.editors/infoIndicationColor=0,51,127 /instance/org.eclipse.ui.editors/spellingIndicationColor=0,51,127 /instance/org.eclipse.ui.editors/changeIndicationColor=0,48,122 diff --git a/editors/stm32cubeide/shared/theme/Zacess Light.epf b/editors/stm32cubeide/shared/theme/Zacess Light.epf index 82d11a7..bf5e11f 100644 --- a/editors/stm32cubeide/shared/theme/Zacess Light.epf +++ b/editors/stm32cubeide/shared/theme/Zacess Light.epf @@ -9,7 +9,7 @@ file_export_version=3.0 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionBackground.SystemDefault=false /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground=255,255,255 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground.SystemDefault=false -/instance/org.eclipse.ui.editors/currentLineColor=240,240,240 +/instance/org.eclipse.ui.editors/currentLineColor=214,221,232 /instance/org.eclipse.ui.editors/lineNumberColor=77,77,77 /instance/org.eclipse.ui.editors/printMarginColor=138,138,138 /instance/org.eclipse.ui.editors/hyperlinkColor=0,73,163 @@ -28,7 +28,7 @@ file_export_version=3.0 /instance/org.eclipse.ui.editors/searchResultHighlighting=false /instance/org.eclipse.ui.editors/searchResultTextStyle=BOX /instance/org.eclipse.ui.editors/errorIndicationColor=129,0,5 -/instance/org.eclipse.ui.editors/warningIndicationColor=88,54,0 +/instance/org.eclipse.ui.editors/warningIndicationColor=132,56,0 /instance/org.eclipse.ui.editors/infoIndicationColor=0,58,132 /instance/org.eclipse.ui.editors/spellingIndicationColor=0,58,132 /instance/org.eclipse.ui.editors/changeIndicationColor=0,25,64 diff --git a/editors/stm32cubeide/shared/theme/Zacess Warm Dark.epf b/editors/stm32cubeide/shared/theme/Zacess Warm Dark.epf new file mode 100644 index 0000000..5a576a4 --- /dev/null +++ b/editors/stm32cubeide/shared/theme/Zacess Warm Dark.epf @@ -0,0 +1,276 @@ +# Zacess Warm Dark for STM32CubeIDE, built by scripts/build-themes.py from the Zacess Eclipse theme, +# do not edit by hand. editor, C syntax and Terminal colours; merged by the apply scripts +file_export_version=3.0 +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.Background=33,27,23 +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.Background.SystemDefault=false +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.Foreground=229,213,182 +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.Foreground.SystemDefault=false +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionBackground=122,186,211 +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionBackground.SystemDefault=false +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground=33,27,23 +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground.SystemDefault=false +/instance/org.eclipse.ui.editors/currentLineColor=54,50,45 +/instance/org.eclipse.ui.editors/lineNumberColor=187,175,160 +/instance/org.eclipse.ui.editors/printMarginColor=125,115,104 +/instance/org.eclipse.ui.editors/hyperlinkColor=233,181,106 +/instance/org.eclipse.ui.editors/hyperlinkColor.SystemDefault=false +/instance/org.eclipse.ui.editors/org.eclipse.ui.editors.stickyLinesSeparatorColor=152,140,126 +/instance/org.eclipse.ui.editors/occurrenceIndicationColor=245,233,163 +/instance/org.eclipse.ui.editors/occurrenceIndication=true +/instance/org.eclipse.ui.editors/occurrenceHighlighting=false +/instance/org.eclipse.ui.editors/occurrenceTextStyle=BOX +/instance/org.eclipse.ui.editors/writeOccurrenceIndicationColor=245,233,163 +/instance/org.eclipse.ui.editors/writeOccurrenceIndication=true +/instance/org.eclipse.ui.editors/writeOccurrenceHighlighting=false +/instance/org.eclipse.ui.editors/writeOccurrenceTextStyle=BOX +/instance/org.eclipse.ui.editors/searchResultIndicationColor=245,233,163 +/instance/org.eclipse.ui.editors/searchResultIndication=true +/instance/org.eclipse.ui.editors/searchResultHighlighting=false +/instance/org.eclipse.ui.editors/searchResultTextStyle=BOX +/instance/org.eclipse.ui.editors/errorIndicationColor=252,168,161 +/instance/org.eclipse.ui.editors/warningIndicationColor=250,201,124 +/instance/org.eclipse.ui.editors/infoIndicationColor=170,211,241 +/instance/org.eclipse.ui.editors/spellingIndicationColor=170,211,241 +/instance/org.eclipse.ui.editors/changeIndicationColor=182,219,252 +/instance/org.eclipse.ui.editors/additionIndicationColor=148,190,125 +/instance/org.eclipse.ui.editors/deletionIndicationColor=255,177,170 +/instance/org.eclipse.ui.editors/linked.slave.color=63,51,40 +/instance/org.eclipse.ui.workbench/org.eclipse.ui.editors.inlineAnnotationColor=202,188,169 +/instance/org.eclipse.terminal.control/BLACK=173,163,152 +/instance/org.eclipse.tm.terminal.control/BLACK=173,163,152 +/instance/org.eclipse.terminal.control/RED=252,154,141 +/instance/org.eclipse.tm.terminal.control/RED=252,154,141 +/instance/org.eclipse.terminal.control/GREEN=162,190,111 +/instance/org.eclipse.tm.terminal.control/GREEN=162,190,111 +/instance/org.eclipse.terminal.control/YELLOW=228,179,91 +/instance/org.eclipse.tm.terminal.control/YELLOW=228,179,91 +/instance/org.eclipse.terminal.control/BLUE=136,185,227 +/instance/org.eclipse.tm.terminal.control/BLUE=136,185,227 +/instance/org.eclipse.terminal.control/MAGENTA=223,161,202 +/instance/org.eclipse.tm.terminal.control/MAGENTA=223,161,202 +/instance/org.eclipse.terminal.control/CYAN=115,194,184 +/instance/org.eclipse.tm.terminal.control/CYAN=115,194,184 +/instance/org.eclipse.terminal.control/WHITE=203,193,177 +/instance/org.eclipse.tm.terminal.control/WHITE=203,193,177 +/instance/org.eclipse.terminal.control/BRIGHT_BLACK=185,177,169 +/instance/org.eclipse.tm.terminal.control/BRIGHT_BLACK=185,177,169 +/instance/org.eclipse.terminal.control/BRIGHT_RED=254,228,224 +/instance/org.eclipse.tm.terminal.control/BRIGHT_RED=254,228,224 +/instance/org.eclipse.terminal.control/BRIGHT_GREEN=217,242,176 +/instance/org.eclipse.tm.terminal.control/BRIGHT_GREEN=217,242,176 +/instance/org.eclipse.terminal.control/BRIGHT_YELLOW=255,233,182 +/instance/org.eclipse.tm.terminal.control/BRIGHT_YELLOW=255,233,182 +/instance/org.eclipse.terminal.control/BRIGHT_BLUE=215,236,255 +/instance/org.eclipse.tm.terminal.control/BRIGHT_BLUE=215,236,255 +/instance/org.eclipse.terminal.control/BRIGHT_MAGENTA=255,225,244 +/instance/org.eclipse.tm.terminal.control/BRIGHT_MAGENTA=255,225,244 +/instance/org.eclipse.terminal.control/BRIGHT_CYAN=177,247,237 +/instance/org.eclipse.tm.terminal.control/BRIGHT_CYAN=177,247,237 +/instance/org.eclipse.terminal.control/BRIGHT_WHITE=251,241,220 +/instance/org.eclipse.tm.terminal.control/BRIGHT_WHITE=251,241,220 +/instance/org.eclipse.terminal.control/FOREGROUND=229,213,182 +/instance/org.eclipse.tm.terminal.control/FOREGROUND=229,213,182 +/instance/org.eclipse.terminal.control/BACKGROUND=33,27,23 +/instance/org.eclipse.tm.terminal.control/BACKGROUND=33,27,23 +/instance/org.eclipse.terminal.control/SELECTION_FOREGROUND=33,27,23 +/instance/org.eclipse.tm.terminal.control/SELECTION_FOREGROUND=33,27,23 +/instance/org.eclipse.terminal.control/SELECTION_BACKGROUND=122,186,211 +/instance/org.eclipse.tm.terminal.control/SELECTION_BACKGROUND=122,186,211 +/instance/org.eclipse.cdt.ui/c_default=229,213,182 +/instance/org.eclipse.cdt.ui/c_default_bold=false +/instance/org.eclipse.cdt.ui/c_default_italic=false +/instance/org.eclipse.cdt.ui/c_default_underline=false +/instance/org.eclipse.cdt.ui/c_default_strikethrough=false +/instance/org.eclipse.cdt.ui/c_keyword=246,157,116 +/instance/org.eclipse.cdt.ui/c_keyword_bold=true +/instance/org.eclipse.cdt.ui/c_keyword_italic=false +/instance/org.eclipse.cdt.ui/c_keyword_underline=false +/instance/org.eclipse.cdt.ui/c_keyword_strikethrough=false +/instance/org.eclipse.cdt.ui/c_type=246,157,116 +/instance/org.eclipse.cdt.ui/c_type_bold=true +/instance/org.eclipse.cdt.ui/c_type_italic=false +/instance/org.eclipse.cdt.ui/c_type_underline=false +/instance/org.eclipse.cdt.ui/c_type_strikethrough=false +/instance/org.eclipse.cdt.ui/c_string=171,186,111 +/instance/org.eclipse.cdt.ui/c_string_bold=false +/instance/org.eclipse.cdt.ui/c_string_italic=false +/instance/org.eclipse.cdt.ui/c_string_underline=false +/instance/org.eclipse.cdt.ui/c_string_strikethrough=false +/instance/org.eclipse.cdt.ui/c_operators=229,213,182 +/instance/org.eclipse.cdt.ui/c_operators_bold=false +/instance/org.eclipse.cdt.ui/c_operators_italic=false +/instance/org.eclipse.cdt.ui/c_operators_underline=false +/instance/org.eclipse.cdt.ui/c_operators_strikethrough=false +/instance/org.eclipse.cdt.ui/c_braces=229,213,182 +/instance/org.eclipse.cdt.ui/c_braces_bold=false +/instance/org.eclipse.cdt.ui/c_braces_italic=false +/instance/org.eclipse.cdt.ui/c_braces_underline=false +/instance/org.eclipse.cdt.ui/c_braces_strikethrough=false +/instance/org.eclipse.cdt.ui/c_numbers=236,180,216 +/instance/org.eclipse.cdt.ui/c_numbers_bold=false +/instance/org.eclipse.cdt.ui/c_numbers_italic=false +/instance/org.eclipse.cdt.ui/c_numbers_underline=false +/instance/org.eclipse.cdt.ui/c_numbers_strikethrough=false +/instance/org.eclipse.cdt.ui/c_single_line_comment=190,177,158 +/instance/org.eclipse.cdt.ui/c_single_line_comment_bold=false +/instance/org.eclipse.cdt.ui/c_single_line_comment_italic=true +/instance/org.eclipse.cdt.ui/c_single_line_comment_underline=false +/instance/org.eclipse.cdt.ui/c_single_line_comment_strikethrough=false +/instance/org.eclipse.cdt.ui/c_multi_line_comment=190,177,158 +/instance/org.eclipse.cdt.ui/c_multi_line_comment_bold=false +/instance/org.eclipse.cdt.ui/c_multi_line_comment_italic=true +/instance/org.eclipse.cdt.ui/c_multi_line_comment_underline=false +/instance/org.eclipse.cdt.ui/c_multi_line_comment_strikethrough=false +/instance/org.eclipse.cdt.ui/c_comment_task_tag=255,175,192 +/instance/org.eclipse.cdt.ui/c_comment_task_tag_bold=true +/instance/org.eclipse.cdt.ui/c_comment_task_tag_italic=true +/instance/org.eclipse.cdt.ui/c_comment_task_tag_underline=false +/instance/org.eclipse.cdt.ui/c_comment_task_tag_strikethrough=false +/instance/org.eclipse.cdt.ui/pp_default=229,213,182 +/instance/org.eclipse.cdt.ui/pp_default_bold=false +/instance/org.eclipse.cdt.ui/pp_default_italic=false +/instance/org.eclipse.cdt.ui/pp_default_underline=false +/instance/org.eclipse.cdt.ui/pp_default_strikethrough=false +/instance/org.eclipse.cdt.ui/pp_directive=255,175,192 +/instance/org.eclipse.cdt.ui/pp_directive_bold=true +/instance/org.eclipse.cdt.ui/pp_directive_italic=false +/instance/org.eclipse.cdt.ui/pp_directive_underline=false +/instance/org.eclipse.cdt.ui/pp_directive_strikethrough=false +/instance/org.eclipse.cdt.ui/pp_header=171,186,111 +/instance/org.eclipse.cdt.ui/pp_header_bold=false +/instance/org.eclipse.cdt.ui/pp_header_italic=false +/instance/org.eclipse.cdt.ui/pp_header_underline=false +/instance/org.eclipse.cdt.ui/pp_header_strikethrough=false +/instance/org.eclipse.cdt.ui/asm_directive=246,157,116 +/instance/org.eclipse.cdt.ui/asm_directive_bold=true +/instance/org.eclipse.cdt.ui/asm_directive_italic=false +/instance/org.eclipse.cdt.ui/asm_directive_underline=false +/instance/org.eclipse.cdt.ui/asm_directive_strikethrough=false +/instance/org.eclipse.cdt.ui/asm_label=255,232,161 +/instance/org.eclipse.cdt.ui/asm_label_bold=false +/instance/org.eclipse.cdt.ui/asm_label_italic=false +/instance/org.eclipse.cdt.ui/asm_label_underline=false +/instance/org.eclipse.cdt.ui/asm_label_strikethrough=false +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.multi=190,177,158 +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.multi_bold=false +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.multi_italic=true +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.multi_underline=false +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.multi_strikethrough=false +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.single=190,177,158 +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.single_bold=false +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.single_italic=true +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.single_underline=false +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.single_strikethrough=false +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.recognizedTag=190,177,158 +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.recognizedTag_bold=false +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.recognizedTag_italic=true +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.recognizedTag_underline=false +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.recognizedTag_strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.class.color=113,192,182 +/instance/org.eclipse.cdt.ui/semanticHighlighting.class.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.class.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.class.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.class.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.class.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.enum.color=113,192,182 +/instance/org.eclipse.cdt.ui/semanticHighlighting.enum.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.enum.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.enum.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.enum.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.enum.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.enumerator.color=236,180,216 +/instance/org.eclipse.cdt.ui/semanticHighlighting.enumerator.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.enumerator.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.enumerator.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.enumerator.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.enumerator.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.field.color=164,201,233 +/instance/org.eclipse.cdt.ui/semanticHighlighting.field.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.field.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.field.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.field.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.field.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.staticField.color=164,201,233 +/instance/org.eclipse.cdt.ui/semanticHighlighting.staticField.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.staticField.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.staticField.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.staticField.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.staticField.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.globalVariable.color=164,201,233 +/instance/org.eclipse.cdt.ui/semanticHighlighting.globalVariable.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.globalVariable.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.globalVariable.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.globalVariable.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.globalVariable.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.function.color=255,232,161 +/instance/org.eclipse.cdt.ui/semanticHighlighting.function.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.function.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.function.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.function.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.function.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.functionDeclaration.color=255,232,161 +/instance/org.eclipse.cdt.ui/semanticHighlighting.functionDeclaration.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.functionDeclaration.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.functionDeclaration.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.functionDeclaration.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.functionDeclaration.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.method.color=255,232,161 +/instance/org.eclipse.cdt.ui/semanticHighlighting.method.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.method.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.method.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.method.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.method.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.methodDeclaration.color=255,232,161 +/instance/org.eclipse.cdt.ui/semanticHighlighting.methodDeclaration.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.methodDeclaration.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.methodDeclaration.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.methodDeclaration.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.methodDeclaration.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.staticMethod.color=255,232,161 +/instance/org.eclipse.cdt.ui/semanticHighlighting.staticMethod.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.staticMethod.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.staticMethod.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.staticMethod.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.staticMethod.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.localVariable.color=229,213,182 +/instance/org.eclipse.cdt.ui/semanticHighlighting.localVariable.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.localVariable.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.localVariable.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.localVariable.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.localVariable.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.localVariableDeclaration.color=229,213,182 +/instance/org.eclipse.cdt.ui/semanticHighlighting.localVariableDeclaration.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.localVariableDeclaration.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.localVariableDeclaration.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.localVariableDeclaration.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.localVariableDeclaration.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.parameterVariable.color=255,209,173 +/instance/org.eclipse.cdt.ui/semanticHighlighting.parameterVariable.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.parameterVariable.italic=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.parameterVariable.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.parameterVariable.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.parameterVariable.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.macroDefinition.color=255,175,192 +/instance/org.eclipse.cdt.ui/semanticHighlighting.macroDefinition.bold=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.macroDefinition.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.macroDefinition.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.macroDefinition.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.macroDefinition.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.macroSubstitution.color=255,175,192 +/instance/org.eclipse.cdt.ui/semanticHighlighting.macroSubstitution.bold=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.macroSubstitution.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.macroSubstitution.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.macroSubstitution.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.macroSubstitution.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.templateParameter.color=113,192,182 +/instance/org.eclipse.cdt.ui/semanticHighlighting.templateParameter.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.templateParameter.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.templateParameter.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.templateParameter.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.templateParameter.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.typedef.color=113,192,182 +/instance/org.eclipse.cdt.ui/semanticHighlighting.typedef.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.typedef.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.typedef.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.typedef.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.typedef.enabled=true diff --git a/editors/stm32cubeide/shared/theme/Zacess Warm Light.epf b/editors/stm32cubeide/shared/theme/Zacess Warm Light.epf new file mode 100644 index 0000000..46fce49 --- /dev/null +++ b/editors/stm32cubeide/shared/theme/Zacess Warm Light.epf @@ -0,0 +1,276 @@ +# Zacess Warm Light for STM32CubeIDE, built by scripts/build-themes.py from the Zacess Eclipse theme, +# do not edit by hand. editor, C syntax and Terminal colours; merged by the apply scripts +file_export_version=3.0 +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.Background=244,234,213 +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.Background.SystemDefault=false +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.Foreground=52,36,16 +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.Foreground.SystemDefault=false +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionBackground=33,87,121 +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionBackground.SystemDefault=false +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground=244,234,213 +/instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground.SystemDefault=false +/instance/org.eclipse.ui.editors/currentLineColor=208,206,192 +/instance/org.eclipse.ui.editors/lineNumberColor=81,70,57 +/instance/org.eclipse.ui.editors/printMarginColor=138,126,113 +/instance/org.eclipse.ui.editors/hyperlinkColor=109,59,2 +/instance/org.eclipse.ui.editors/hyperlinkColor.SystemDefault=false +/instance/org.eclipse.ui.editors/org.eclipse.ui.editors.stickyLinesSeparatorColor=126,111,95 +/instance/org.eclipse.ui.editors/occurrenceIndicationColor=44,21,1 +/instance/org.eclipse.ui.editors/occurrenceIndication=true +/instance/org.eclipse.ui.editors/occurrenceHighlighting=false +/instance/org.eclipse.ui.editors/occurrenceTextStyle=BOX +/instance/org.eclipse.ui.editors/writeOccurrenceIndicationColor=44,21,1 +/instance/org.eclipse.ui.editors/writeOccurrenceIndication=true +/instance/org.eclipse.ui.editors/writeOccurrenceHighlighting=false +/instance/org.eclipse.ui.editors/writeOccurrenceTextStyle=BOX +/instance/org.eclipse.ui.editors/searchResultIndicationColor=44,21,1 +/instance/org.eclipse.ui.editors/searchResultIndication=true +/instance/org.eclipse.ui.editors/searchResultHighlighting=false +/instance/org.eclipse.ui.editors/searchResultTextStyle=BOX +/instance/org.eclipse.ui.editors/errorIndicationColor=113,2,5 +/instance/org.eclipse.ui.editors/warningIndicationColor=98,61,2 +/instance/org.eclipse.ui.editors/infoIndicationColor=1,56,92 +/instance/org.eclipse.ui.editors/spellingIndicationColor=1,56,92 +/instance/org.eclipse.ui.editors/changeIndicationColor=4,72,141 +/instance/org.eclipse.ui.editors/additionIndicationColor=8,101,27 +/instance/org.eclipse.ui.editors/deletionIndicationColor=121,4,17 +/instance/org.eclipse.ui.editors/linked.slave.color=231,214,179 +/instance/org.eclipse.ui.workbench/org.eclipse.ui.editors.inlineAnnotationColor=72,59,44 +/instance/org.eclipse.terminal.control/BLACK=52,36,16 +/instance/org.eclipse.tm.terminal.control/BLACK=52,36,16 +/instance/org.eclipse.terminal.control/RED=140,26,22 +/instance/org.eclipse.tm.terminal.control/RED=140,26,22 +/instance/org.eclipse.terminal.control/GREEN=39,82,0 +/instance/org.eclipse.tm.terminal.control/GREEN=39,82,0 +/instance/org.eclipse.terminal.control/YELLOW=106,70,3 +/instance/org.eclipse.tm.terminal.control/YELLOW=106,70,3 +/instance/org.eclipse.terminal.control/BLUE=1,75,121 +/instance/org.eclipse.tm.terminal.control/BLUE=1,75,121 +/instance/org.eclipse.terminal.control/MAGENTA=116,44,96 +/instance/org.eclipse.tm.terminal.control/MAGENTA=116,44,96 +/instance/org.eclipse.terminal.control/CYAN=5,81,77 +/instance/org.eclipse.tm.terminal.control/CYAN=5,81,77 +/instance/org.eclipse.terminal.control/WHITE=87,78,68 +/instance/org.eclipse.tm.terminal.control/WHITE=87,78,68 +/instance/org.eclipse.terminal.control/BRIGHT_BLACK=96,87,76 +/instance/org.eclipse.tm.terminal.control/BRIGHT_BLACK=96,87,76 +/instance/org.eclipse.terminal.control/BRIGHT_RED=164,51,43 +/instance/org.eclipse.tm.terminal.control/BRIGHT_RED=164,51,43 +/instance/org.eclipse.terminal.control/BRIGHT_GREEN=56,102,22 +/instance/org.eclipse.tm.terminal.control/BRIGHT_GREEN=56,102,22 +/instance/org.eclipse.terminal.control/BRIGHT_YELLOW=132,87,1 +/instance/org.eclipse.tm.terminal.control/BRIGHT_YELLOW=132,87,1 +/instance/org.eclipse.terminal.control/BRIGHT_BLUE=17,95,147 +/instance/org.eclipse.tm.terminal.control/BRIGHT_BLUE=17,95,147 +/instance/org.eclipse.terminal.control/BRIGHT_MAGENTA=138,64,116 +/instance/org.eclipse.tm.terminal.control/BRIGHT_MAGENTA=138,64,116 +/instance/org.eclipse.terminal.control/BRIGHT_CYAN=6,102,98 +/instance/org.eclipse.tm.terminal.control/BRIGHT_CYAN=6,102,98 +/instance/org.eclipse.terminal.control/BRIGHT_WHITE=52,36,16 +/instance/org.eclipse.tm.terminal.control/BRIGHT_WHITE=52,36,16 +/instance/org.eclipse.terminal.control/FOREGROUND=52,36,16 +/instance/org.eclipse.tm.terminal.control/FOREGROUND=52,36,16 +/instance/org.eclipse.terminal.control/BACKGROUND=244,234,213 +/instance/org.eclipse.tm.terminal.control/BACKGROUND=244,234,213 +/instance/org.eclipse.terminal.control/SELECTION_FOREGROUND=244,234,213 +/instance/org.eclipse.tm.terminal.control/SELECTION_FOREGROUND=244,234,213 +/instance/org.eclipse.terminal.control/SELECTION_BACKGROUND=33,87,121 +/instance/org.eclipse.tm.terminal.control/SELECTION_BACKGROUND=33,87,121 +/instance/org.eclipse.cdt.ui/c_default=52,36,16 +/instance/org.eclipse.cdt.ui/c_default_bold=false +/instance/org.eclipse.cdt.ui/c_default_italic=false +/instance/org.eclipse.cdt.ui/c_default_underline=false +/instance/org.eclipse.cdt.ui/c_default_strikethrough=false +/instance/org.eclipse.cdt.ui/c_keyword=131,42,1 +/instance/org.eclipse.cdt.ui/c_keyword_bold=true +/instance/org.eclipse.cdt.ui/c_keyword_italic=false +/instance/org.eclipse.cdt.ui/c_keyword_underline=false +/instance/org.eclipse.cdt.ui/c_keyword_strikethrough=false +/instance/org.eclipse.cdt.ui/c_type=131,42,1 +/instance/org.eclipse.cdt.ui/c_type_bold=true +/instance/org.eclipse.cdt.ui/c_type_italic=false +/instance/org.eclipse.cdt.ui/c_type_underline=false +/instance/org.eclipse.cdt.ui/c_type_strikethrough=false +/instance/org.eclipse.cdt.ui/c_string=4,82,58 +/instance/org.eclipse.cdt.ui/c_string_bold=false +/instance/org.eclipse.cdt.ui/c_string_italic=false +/instance/org.eclipse.cdt.ui/c_string_underline=false +/instance/org.eclipse.cdt.ui/c_string_strikethrough=false +/instance/org.eclipse.cdt.ui/c_operators=52,36,16 +/instance/org.eclipse.cdt.ui/c_operators_bold=false +/instance/org.eclipse.cdt.ui/c_operators_italic=false +/instance/org.eclipse.cdt.ui/c_operators_underline=false +/instance/org.eclipse.cdt.ui/c_operators_strikethrough=false +/instance/org.eclipse.cdt.ui/c_braces=52,36,16 +/instance/org.eclipse.cdt.ui/c_braces_bold=false +/instance/org.eclipse.cdt.ui/c_braces_italic=false +/instance/org.eclipse.cdt.ui/c_braces_underline=false +/instance/org.eclipse.cdt.ui/c_braces_strikethrough=false +/instance/org.eclipse.cdt.ui/c_numbers=150,43,112 +/instance/org.eclipse.cdt.ui/c_numbers_bold=false +/instance/org.eclipse.cdt.ui/c_numbers_italic=false +/instance/org.eclipse.cdt.ui/c_numbers_underline=false +/instance/org.eclipse.cdt.ui/c_numbers_strikethrough=false +/instance/org.eclipse.cdt.ui/c_single_line_comment=98,82,64 +/instance/org.eclipse.cdt.ui/c_single_line_comment_bold=false +/instance/org.eclipse.cdt.ui/c_single_line_comment_italic=true +/instance/org.eclipse.cdt.ui/c_single_line_comment_underline=false +/instance/org.eclipse.cdt.ui/c_single_line_comment_strikethrough=false +/instance/org.eclipse.cdt.ui/c_multi_line_comment=98,82,64 +/instance/org.eclipse.cdt.ui/c_multi_line_comment_bold=false +/instance/org.eclipse.cdt.ui/c_multi_line_comment_italic=true +/instance/org.eclipse.cdt.ui/c_multi_line_comment_underline=false +/instance/org.eclipse.cdt.ui/c_multi_line_comment_strikethrough=false +/instance/org.eclipse.cdt.ui/c_comment_task_tag=118,2,68 +/instance/org.eclipse.cdt.ui/c_comment_task_tag_bold=true +/instance/org.eclipse.cdt.ui/c_comment_task_tag_italic=true +/instance/org.eclipse.cdt.ui/c_comment_task_tag_underline=false +/instance/org.eclipse.cdt.ui/c_comment_task_tag_strikethrough=false +/instance/org.eclipse.cdt.ui/pp_default=52,36,16 +/instance/org.eclipse.cdt.ui/pp_default_bold=false +/instance/org.eclipse.cdt.ui/pp_default_italic=false +/instance/org.eclipse.cdt.ui/pp_default_underline=false +/instance/org.eclipse.cdt.ui/pp_default_strikethrough=false +/instance/org.eclipse.cdt.ui/pp_directive=118,2,68 +/instance/org.eclipse.cdt.ui/pp_directive_bold=true +/instance/org.eclipse.cdt.ui/pp_directive_italic=false +/instance/org.eclipse.cdt.ui/pp_directive_underline=false +/instance/org.eclipse.cdt.ui/pp_directive_strikethrough=false +/instance/org.eclipse.cdt.ui/pp_header=4,82,58 +/instance/org.eclipse.cdt.ui/pp_header_bold=false +/instance/org.eclipse.cdt.ui/pp_header_italic=false +/instance/org.eclipse.cdt.ui/pp_header_underline=false +/instance/org.eclipse.cdt.ui/pp_header_strikethrough=false +/instance/org.eclipse.cdt.ui/asm_directive=131,42,1 +/instance/org.eclipse.cdt.ui/asm_directive_bold=true +/instance/org.eclipse.cdt.ui/asm_directive_italic=false +/instance/org.eclipse.cdt.ui/asm_directive_underline=false +/instance/org.eclipse.cdt.ui/asm_directive_strikethrough=false +/instance/org.eclipse.cdt.ui/asm_label=116,79,1 +/instance/org.eclipse.cdt.ui/asm_label_bold=false +/instance/org.eclipse.cdt.ui/asm_label_italic=false +/instance/org.eclipse.cdt.ui/asm_label_underline=false +/instance/org.eclipse.cdt.ui/asm_label_strikethrough=false +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.multi=98,82,64 +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.multi_bold=false +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.multi_italic=true +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.multi_underline=false +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.multi_strikethrough=false +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.single=98,82,64 +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.single_bold=false +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.single_italic=true +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.single_underline=false +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.single_strikethrough=false +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.recognizedTag=98,82,64 +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.recognizedTag_bold=false +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.recognizedTag_italic=true +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.recognizedTag_underline=false +/instance/org.eclipse.cdt.ui/org.eclipse.cdt.internal.ui.text.doctools.doxygen.recognizedTag_strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.class.color=4,82,71 +/instance/org.eclipse.cdt.ui/semanticHighlighting.class.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.class.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.class.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.class.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.class.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.enum.color=4,82,71 +/instance/org.eclipse.cdt.ui/semanticHighlighting.enum.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.enum.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.enum.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.enum.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.enum.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.enumerator.color=150,43,112 +/instance/org.eclipse.cdt.ui/semanticHighlighting.enumerator.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.enumerator.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.enumerator.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.enumerator.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.enumerator.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.field.color=2,49,141 +/instance/org.eclipse.cdt.ui/semanticHighlighting.field.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.field.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.field.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.field.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.field.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.staticField.color=2,49,141 +/instance/org.eclipse.cdt.ui/semanticHighlighting.staticField.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.staticField.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.staticField.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.staticField.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.staticField.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.globalVariable.color=2,49,141 +/instance/org.eclipse.cdt.ui/semanticHighlighting.globalVariable.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.globalVariable.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.globalVariable.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.globalVariable.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.globalVariable.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.function.color=116,79,1 +/instance/org.eclipse.cdt.ui/semanticHighlighting.function.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.function.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.function.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.function.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.function.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.functionDeclaration.color=116,79,1 +/instance/org.eclipse.cdt.ui/semanticHighlighting.functionDeclaration.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.functionDeclaration.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.functionDeclaration.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.functionDeclaration.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.functionDeclaration.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.method.color=116,79,1 +/instance/org.eclipse.cdt.ui/semanticHighlighting.method.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.method.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.method.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.method.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.method.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.methodDeclaration.color=116,79,1 +/instance/org.eclipse.cdt.ui/semanticHighlighting.methodDeclaration.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.methodDeclaration.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.methodDeclaration.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.methodDeclaration.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.methodDeclaration.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.staticMethod.color=116,79,1 +/instance/org.eclipse.cdt.ui/semanticHighlighting.staticMethod.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.staticMethod.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.staticMethod.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.staticMethod.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.staticMethod.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.localVariable.color=52,36,16 +/instance/org.eclipse.cdt.ui/semanticHighlighting.localVariable.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.localVariable.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.localVariable.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.localVariable.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.localVariable.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.localVariableDeclaration.color=52,36,16 +/instance/org.eclipse.cdt.ui/semanticHighlighting.localVariableDeclaration.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.localVariableDeclaration.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.localVariableDeclaration.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.localVariableDeclaration.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.localVariableDeclaration.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.parameterVariable.color=114,57,2 +/instance/org.eclipse.cdt.ui/semanticHighlighting.parameterVariable.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.parameterVariable.italic=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.parameterVariable.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.parameterVariable.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.parameterVariable.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.macroDefinition.color=118,2,68 +/instance/org.eclipse.cdt.ui/semanticHighlighting.macroDefinition.bold=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.macroDefinition.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.macroDefinition.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.macroDefinition.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.macroDefinition.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.macroSubstitution.color=118,2,68 +/instance/org.eclipse.cdt.ui/semanticHighlighting.macroSubstitution.bold=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.macroSubstitution.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.macroSubstitution.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.macroSubstitution.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.macroSubstitution.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.templateParameter.color=4,82,71 +/instance/org.eclipse.cdt.ui/semanticHighlighting.templateParameter.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.templateParameter.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.templateParameter.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.templateParameter.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.templateParameter.enabled=true +/instance/org.eclipse.cdt.ui/semanticHighlighting.typedef.color=4,82,71 +/instance/org.eclipse.cdt.ui/semanticHighlighting.typedef.bold=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.typedef.italic=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.typedef.underline=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.typedef.strikethrough=false +/instance/org.eclipse.cdt.ui/semanticHighlighting.typedef.enabled=true diff --git a/editors/stm32cubeide/shared/theme/Zacess Yellow on Black.epf b/editors/stm32cubeide/shared/theme/Zacess Yellow on Black.epf index d56c415..e13e893 100644 --- a/editors/stm32cubeide/shared/theme/Zacess Yellow on Black.epf +++ b/editors/stm32cubeide/shared/theme/Zacess Yellow on Black.epf @@ -9,7 +9,7 @@ file_export_version=3.0 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionBackground.SystemDefault=false /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground=0,0,0 /instance/org.eclipse.ui.editors/AbstractTextEditor.Color.SelectionForeground.SystemDefault=false -/instance/org.eclipse.ui.editors/currentLineColor=20,20,20 +/instance/org.eclipse.ui.editors/currentLineColor=38,38,38 /instance/org.eclipse.ui.editors/lineNumberColor=217,217,217 /instance/org.eclipse.ui.editors/printMarginColor=140,140,140 /instance/org.eclipse.ui.editors/hyperlinkColor=27,228,237 @@ -68,8 +68,8 @@ file_export_version=3.0 /instance/org.eclipse.tm.terminal.control/BRIGHT_CYAN=0,247,245 /instance/org.eclipse.terminal.control/BRIGHT_WHITE=255,255,255 /instance/org.eclipse.tm.terminal.control/BRIGHT_WHITE=255,255,255 -/instance/org.eclipse.terminal.control/FOREGROUND=255,255,255 -/instance/org.eclipse.tm.terminal.control/FOREGROUND=255,255,255 +/instance/org.eclipse.terminal.control/FOREGROUND=255,235,59 +/instance/org.eclipse.tm.terminal.control/FOREGROUND=255,235,59 /instance/org.eclipse.terminal.control/BACKGROUND=0,0,0 /instance/org.eclipse.tm.terminal.control/BACKGROUND=0,0,0 /instance/org.eclipse.terminal.control/SELECTION_FOREGROUND=0,0,0 diff --git a/editors/stm32cubeide/windows/apply.ps1 b/editors/stm32cubeide/windows/apply.ps1 index 259ff15..3915b37 100644 --- a/editors/stm32cubeide/windows/apply.ps1 +++ b/editors/stm32cubeide/windows/apply.ps1 @@ -3,10 +3,11 @@ # (the workspace defaults to the newest %USERPROFILE%\STM32CubeIDE\workspace_ # that STM32CubeIDE has opened) # -# -Theme merges one of the eight Zacess themes from ..\shared\theme (editor, C +# -Theme merges one of the ten Zacess themes from ..\shared\theme (editor, C # syntax and Terminal colours, plus the tab outlines for the two Deep Contrast # themes) and sets the matching Light or Dark workbench theme. It takes a short -# name (deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow), +# name (deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, +# warm-dark, warm-light), # an id (deep-contrast-dark) or the full name. the default is deep-dark. # # the values live in ..\shared\prefs, the same files mac/apply.sh and @@ -47,6 +48,7 @@ $themeNames = [ordered]@{ 'hc-light' = @('Zacess High Contrast Light', 'light'); 'high-contrast-light' = @('Zacess High Contrast Light', 'light') 'dark' = @('Zacess Dark', 'dark'); 'light' = @('Zacess Light', 'light'); 'cream' = @('Zacess Cream', 'light') 'yellow' = @('Zacess Yellow on Black', 'dark'); 'yellow-on-black' = @('Zacess Yellow on Black', 'dark') + 'warm-dark' = @('Zacess Warm Dark', 'dark'); 'warm-light' = @('Zacess Warm Light', 'light') } $picked = $null if (-not $NoTheme) { @@ -54,7 +56,7 @@ if (-not $NoTheme) { $picked = $themeNames[$key] if (-not $picked) { [Console]::Error.WriteLine("Unknown theme: $Theme") - [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow.') + [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light.') exit 1 } } diff --git a/editors/thonny/ACCESSIBILITY.md b/editors/thonny/ACCESSIBILITY.md index 2adc59c..b422aa1 100644 --- a/editors/thonny/ACCESSIBILITY.md +++ b/editors/thonny/ACCESSIBILITY.md @@ -5,7 +5,7 @@ Larger text, a high contrast theme across the whole window and a visible current ## Vision - Editor and shell text are Geist Mono at 16 points, larger than Thonny's default. macOS uses GeistMono Nerd Font Mono, whose icons keep a fixed width. -- The default is Zacess Deep Contrast Dark for both the interface and the code. All eight Zacess themes are available, light ones included, from **Tools > Options > Theme & Font**. Measured contrast is in the [Zacess Themes accessibility statement](https://github.com/zacesshq/themes/blob/main/ACCESSIBILITY.md). +- The default is Zacess Deep Contrast Dark for both the interface and the code. All ten Zacess themes are available, light ones included, from **Tools > Options > Theme & Font**. Measured contrast is in the [Zacess Themes accessibility statement](https://github.com/zacesshq/themes/blob/main/ACCESSIBILITY.md). - The current line is highlighted and line numbers are on, so the cursor is easy to find. - Errors in the shell are also written as text tracebacks, so colour is never the only signal. diff --git a/editors/thonny/README.md b/editors/thonny/README.md index fdbe663..71e34ce 100644 --- a/editors/thonny/README.md +++ b/editors/thonny/README.md @@ -1,12 +1,12 @@ # thonny -Thonny settings: all eight Zacess themes as a Thonny plugin, Geist Mono and larger editor text. +Thonny settings: all ten Zacess themes as a Thonny plugin, Geist Mono and larger editor text. ## What it sets | Setting | Value | Why | | --- | --- | --- | -| `[view] ui_theme` and `syntax_theme` | `Zacess Deep Contrast Dark` | The default theme. `-Theme` (`--theme` on Linux) picks any of the eight | +| `[view] ui_theme` and `syntax_theme` | `Zacess Deep Contrast Dark` | The default theme. `-Theme` (`--theme` on Linux) picks any of the ten | | `[view] editor_font_family` and `io_font_family` | `GeistMono NF` on Windows, `GeistMono Nerd Font` elsewhere | Geist Mono's Nerd Font build. Tk on Windows looks fonts up by their short GDI name | | `[view] editor_font_size` and `io_font_size` | `16` | Larger than the default | | `[view] highlight_current_line` and `show_line_numbers` | `True` | Easier to keep your place | @@ -54,4 +54,4 @@ Thonny starts in `~/dev/projects/python` (`[run] working_directory`), the projec ## Validation -[`scripts/validate.py`](scripts/validate.py) runs in CI on Linux. It checks the plugin and apply script parse, the plugin defines all eight themes and every platform's settings name a Zacess theme and Geist Mono. +[`scripts/validate.py`](scripts/validate.py) runs in CI on Linux. It checks the plugin and apply script parse, the plugin defines all ten themes and every platform's settings name a Zacess theme and Geist Mono. diff --git a/editors/thonny/linux/apply.sh b/editors/thonny/linux/apply.sh index ae08268..e820638 100644 --- a/editors/thonny/linux/apply.sh +++ b/editors/thonny/linux/apply.sh @@ -2,8 +2,9 @@ # installs the Zacess themes into Thonny and sets its theme, font and editor settings. # usage: apply.sh [--theme ] # -# --theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# --theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # the work is done by ../shared/apply.py run with the Python that has Thonny installed (the @@ -39,12 +40,14 @@ theme_name() { light) echo "Zacess Light" ;; cream) echo "Zacess Cream" ;; yellow|yellow-on-black) echo "Zacess Yellow on Black" ;; + warm-dark) echo "Zacess Warm Dark" ;; + warm-light) echo "Zacess Warm Light" ;; *) return 1 ;; esac } if ! name="$(theme_name "$theme")"; then echo "Unknown theme: $theme" >&2 - echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow." >&2 + echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light." >&2 exit 1 fi diff --git a/editors/thonny/mac/apply.sh b/editors/thonny/mac/apply.sh index fea1cac..142ec03 100755 --- a/editors/thonny/mac/apply.sh +++ b/editors/thonny/mac/apply.sh @@ -3,8 +3,9 @@ # usage: apply.sh [--theme ] [path to Thonny.app] # (the app defaults to /Applications/Thonny.app, then ~/Applications/Thonny.app) # -# --theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# --theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # the work is done by ../shared/apply.py run with the Python bundled inside Thonny.app, which @@ -38,12 +39,14 @@ theme_name() { light) echo "Zacess Light" ;; cream) echo "Zacess Cream" ;; yellow|yellow-on-black) echo "Zacess Yellow on Black" ;; + warm-dark) echo "Zacess Warm Dark" ;; + warm-light) echo "Zacess Warm Light" ;; *) return 1 ;; esac } if ! name="$(theme_name "$theme")"; then echo "Unknown theme: $theme" >&2 - echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow." >&2 + echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light." >&2 exit 1 fi diff --git a/editors/thonny/scripts/build-themes.py b/editors/thonny/scripts/build-themes.py index 020ed9e..bdb783d 100644 --- a/editors/thonny/scripts/build-themes.py +++ b/editors/thonny/scripts/build-themes.py @@ -24,6 +24,8 @@ "zacess-light": ("Zacess Light", "light"), "zacess-cream": ("Zacess Cream", "light"), "zacess-yellow-on-black": ("Zacess Yellow on Black", "dark"), + "zacess-warm-dark": ("Zacess Warm Dark", "dark"), + "zacess-warm-light": ("Zacess Warm Light", "light"), } @@ -152,7 +154,7 @@ def main(): themes = {key: json.loads(z.read(f"extension/themes/{key}-color-theme.json")) for key in THEMES} entries = {name: (mode, syntax(themes[key]), ui(themes[key]), tabs(themes[key])) for key, (name, mode) in THEMES.items()} body = pprint.pformat(entries, width=100, sort_dicts=False) - source = f'''"""The eight Zacess themes for Thonny, built by scripts/build-themes.py from the Zacess VS Code + source = f'''"""The ten Zacess themes for Thonny, built by scripts/build-themes.py from the Zacess VS Code themes, do not edit by hand. Each registers a syntax theme and a UI theme of the same name.""" from thonny import get_workbench diff --git a/editors/thonny/scripts/validate.py b/editors/thonny/scripts/validate.py index 8fb2be9..f5e31fc 100644 --- a/editors/thonny/scripts/validate.py +++ b/editors/thonny/scripts/validate.py @@ -1,7 +1,7 @@ """Checks the Thonny folder without Thonny: run from anywhere, exits non-zero on a problem. - the generated plugin and shared/apply.py parse as Python -- the plugin defines all eight Zacess themes +- the plugin defines all ten Zacess themes - shared/settings.json names a Zacess theme and every platform's overlay names Geist Mono """ @@ -11,7 +11,8 @@ import sys NAMES = ["Zacess Deep Contrast Dark", "Zacess Deep Contrast Light", "Zacess High Contrast Dark", - "Zacess High Contrast Light", "Zacess Dark", "Zacess Light", "Zacess Cream", "Zacess Yellow on Black"] + "Zacess High Contrast Light", "Zacess Dark", "Zacess Light", "Zacess Cream", "Zacess Yellow on Black", + "Zacess Warm Dark", "Zacess Warm Light"] root = pathlib.Path(__file__).resolve().parent.parent problems = [] diff --git a/editors/thonny/shared/thonnycontrib/zacess_themes/__init__.py b/editors/thonny/shared/thonnycontrib/zacess_themes/__init__.py index fde287a..711a02a 100644 --- a/editors/thonny/shared/thonnycontrib/zacess_themes/__init__.py +++ b/editors/thonny/shared/thonnycontrib/zacess_themes/__init__.py @@ -1,4 +1,4 @@ -"""The eight Zacess themes for Thonny, built by scripts/build-themes.py from the Zacess VS Code +"""The ten Zacess themes for Thonny, built by scripts/build-themes.py from the Zacess VS Code themes, do not edit by hand. Each registers a syntax theme and a UI theme of the same name.""" from thonny import get_workbench @@ -9,15 +9,15 @@ 'insertbackground': '#ffff00', 'background': '#000000'}, 'GUTTER': {'foreground': '#ffffff', 'background': '#000000'}, - 'current_line': {'background': '#141414'}, + 'current_line': {'background': '#262626'}, 'definition': {'foreground': '#ffdf5a', 'font': 'BoldEditorFont'}, 'string': {'foreground': '#ffaa7c'}, 'string3': {'foreground': '#ffaa7c', 'background': None, 'font': 'EditorFont'}, - 'open_string': {'foreground': '#ffaa7c', 'background': '#141414'}, + 'open_string': {'foreground': '#ffaa7c', 'background': '#262626'}, 'open_string3': {'foreground': '#ffaa7c', - 'background': '#141414', + 'background': '#262626', 'font': 'EditorFont'}, 'keyword': {'foreground': '#67aeff', 'font': 'BoldEditorFont'}, 'builtin': {'foreground': '#ffdf5a'}, @@ -33,7 +33,7 @@ 'hyperlink': {'foreground': '#1db4ff', 'underline': True}, 'surrounding_parens': {'foreground': '#ffabfd', 'font': 'BoldEditorFont'}, - 'unclosed_expression': {'background': '#141414'}, + 'unclosed_expression': {'background': '#262626'}, 'matched_name': {'background': '#ff70ff'}, 'found': {'foreground': '#ffffff', 'underline': True}, 'current_found': {'foreground': '#ffffff', @@ -52,15 +52,15 @@ 'insertbackground': '#000000', 'background': '#ffffff'}, 'GUTTER': {'foreground': '#000000', 'background': '#ffffff'}, - 'current_line': {'background': '#f5f5f5'}, + 'current_line': {'background': '#c8debd'}, 'definition': {'foreground': '#824100', 'font': 'BoldEditorFont'}, 'string': {'foreground': '#870000'}, 'string3': {'foreground': '#870000', 'background': None, 'font': 'EditorFont'}, - 'open_string': {'foreground': '#870000', 'background': '#f5f5f5'}, + 'open_string': {'foreground': '#870000', 'background': '#c8debd'}, 'open_string3': {'foreground': '#870000', - 'background': '#f5f5f5', + 'background': '#c8debd', 'font': 'EditorFont'}, 'keyword': {'foreground': '#002ec2', 'font': 'BoldEditorFont'}, 'builtin': {'foreground': '#824100'}, @@ -76,7 +76,7 @@ 'hyperlink': {'foreground': '#003df6', 'underline': True}, 'surrounding_parens': {'foreground': '#950094', 'font': 'BoldEditorFont'}, - 'unclosed_expression': {'background': '#f5f5f5'}, + 'unclosed_expression': {'background': '#c8debd'}, 'matched_name': {'background': '#990098'}, 'found': {'foreground': '#000000', 'underline': True}, 'current_found': {'foreground': '#000000', @@ -95,15 +95,15 @@ 'insertbackground': '#f5c400', 'background': '#000000'}, 'GUTTER': {'foreground': '#e6e6e6', 'background': '#000000'}, - 'current_line': {'background': '#1a1a1a'}, + 'current_line': {'background': '#262626'}, 'definition': {'foreground': '#8fd0ff', 'font': 'BoldEditorFont'}, 'string': {'foreground': '#20fe34'}, 'string3': {'foreground': '#20fe34', 'background': None, 'font': 'EditorFont'}, - 'open_string': {'foreground': '#20fe34', 'background': '#1a1a1a'}, + 'open_string': {'foreground': '#20fe34', 'background': '#262626'}, 'open_string3': {'foreground': '#20fe34', - 'background': '#1a1a1a', + 'background': '#262626', 'font': 'EditorFont'}, 'keyword': {'foreground': '#f5c400', 'font': 'BoldEditorFont'}, 'builtin': {'foreground': '#8fd0ff'}, @@ -119,7 +119,7 @@ 'hyperlink': {'foreground': '#8fd0ff', 'underline': True}, 'surrounding_parens': {'foreground': '#ffcdf0', 'font': 'BoldEditorFont'}, - 'unclosed_expression': {'background': '#1a1a1a'}, + 'unclosed_expression': {'background': '#262626'}, 'matched_name': {'background': '#bf96ff'}, 'found': {'foreground': '#ffffff', 'underline': True}, 'current_found': {'foreground': '#ffffff', @@ -138,15 +138,15 @@ 'insertbackground': '#000000', 'background': '#ffffff'}, 'GUTTER': {'foreground': '#262626', 'background': '#ffffff'}, - 'current_line': {'background': '#f2f2f2'}, + 'current_line': {'background': '#c3e5fe'}, 'definition': {'foreground': '#00347f', 'font': 'BoldEditorFont'}, 'string': {'foreground': '#005518'}, 'string3': {'foreground': '#005518', 'background': None, 'font': 'EditorFont'}, - 'open_string': {'foreground': '#005518', 'background': '#f2f2f2'}, + 'open_string': {'foreground': '#005518', 'background': '#c3e5fe'}, 'open_string3': {'foreground': '#005518', - 'background': '#f2f2f2', + 'background': '#c3e5fe', 'font': 'EditorFont'}, 'keyword': {'foreground': '#4b0091', 'font': 'BoldEditorFont'}, 'builtin': {'foreground': '#00347f'}, @@ -162,7 +162,7 @@ 'hyperlink': {'foreground': '#003d99', 'underline': True}, 'surrounding_parens': {'foreground': '#8a0046', 'font': 'BoldEditorFont'}, - 'unclosed_expression': {'background': '#f2f2f2'}, + 'unclosed_expression': {'background': '#c3e5fe'}, 'matched_name': {'background': '#015f5e'}, 'found': {'foreground': '#000000', 'underline': True}, 'current_found': {'foreground': '#000000', @@ -181,13 +181,13 @@ 'insertbackground': '#ffd400', 'background': '#121212'}, 'GUTTER': {'foreground': '#b8b8b8', 'background': '#121212'}, - 'current_line': {'background': '#1f1f1f'}, + 'current_line': {'background': '#2f2f2f'}, 'definition': {'foreground': '#84b7fa', 'font': 'BoldEditorFont'}, 'string': {'foreground': '#1ee646'}, 'string3': {'foreground': '#1ee646', 'background': None, 'font': 'EditorFont'}, - 'open_string': {'foreground': '#1ee646', 'background': '#1f1f1f'}, + 'open_string': {'foreground': '#1ee646', 'background': '#2f2f2f'}, 'open_string3': {'foreground': '#1ee646', - 'background': '#1f1f1f', + 'background': '#2f2f2f', 'font': 'EditorFont'}, 'keyword': {'foreground': '#d3bdff', 'font': 'BoldEditorFont'}, 'builtin': {'foreground': '#84b7fa'}, @@ -202,7 +202,7 @@ 'value': {'foreground': '#84b7fa'}, 'hyperlink': {'foreground': '#8cbcff', 'underline': True}, 'surrounding_parens': {'foreground': '#ffd2e6', 'font': 'BoldEditorFont'}, - 'unclosed_expression': {'background': '#1f1f1f'}, + 'unclosed_expression': {'background': '#2f2f2f'}, 'matched_name': {'background': '#004769'}, 'found': {'foreground': '#f5f5f5', 'underline': True}, 'current_found': {'foreground': '#f5f5f5', 'background': '#004769'}}, @@ -220,13 +220,13 @@ 'insertbackground': '#111111', 'background': '#ffffff'}, 'GUTTER': {'foreground': '#4d4d4d', 'background': '#ffffff'}, - 'current_line': {'background': '#f0f0f0'}, + 'current_line': {'background': '#d6dde8'}, 'definition': {'foreground': '#0049a3', 'font': 'BoldEditorFont'}, 'string': {'foreground': '#004a0e'}, 'string3': {'foreground': '#004a0e', 'background': None, 'font': 'EditorFont'}, - 'open_string': {'foreground': '#004a0e', 'background': '#f0f0f0'}, + 'open_string': {'foreground': '#004a0e', 'background': '#d6dde8'}, 'open_string3': {'foreground': '#004a0e', - 'background': '#f0f0f0', + 'background': '#d6dde8', 'font': 'EditorFont'}, 'keyword': {'foreground': '#59029f', 'font': 'BoldEditorFont'}, 'builtin': {'foreground': '#0049a3'}, @@ -241,7 +241,7 @@ 'value': {'foreground': '#0049a3'}, 'hyperlink': {'foreground': '#0049a3', 'underline': True}, 'surrounding_parens': {'foreground': '#5e003c', 'font': 'BoldEditorFont'}, - 'unclosed_expression': {'background': '#f0f0f0'}, + 'unclosed_expression': {'background': '#d6dde8'}, 'matched_name': {'background': '#9bc3ff'}, 'found': {'foreground': '#111111', 'underline': True}, 'current_found': {'foreground': '#111111', 'background': '#9bc3ff'}}, @@ -259,13 +259,13 @@ 'insertbackground': '#000000', 'background': '#fdf6e3'}, 'GUTTER': {'foreground': '#4a4337', 'background': '#fdf6e3'}, - 'current_line': {'background': '#f3ead2'}, + 'current_line': {'background': '#c8dadd'}, 'definition': {'foreground': '#004498', 'font': 'BoldEditorFont'}, 'string': {'foreground': '#00440c'}, 'string3': {'foreground': '#00440c', 'background': None, 'font': 'EditorFont'}, - 'open_string': {'foreground': '#00440c', 'background': '#f3ead2'}, + 'open_string': {'foreground': '#00440c', 'background': '#c8dadd'}, 'open_string3': {'foreground': '#00440c', - 'background': '#f3ead2', + 'background': '#c8dadd', 'font': 'EditorFont'}, 'keyword': {'foreground': '#530093', 'font': 'BoldEditorFont'}, 'builtin': {'foreground': '#004498'}, @@ -280,7 +280,7 @@ 'value': {'foreground': '#004498'}, 'hyperlink': {'foreground': '#004498', 'underline': True}, 'surrounding_parens': {'foreground': '#550036', 'font': 'BoldEditorFont'}, - 'unclosed_expression': {'background': '#f3ead2'}, + 'unclosed_expression': {'background': '#c8dadd'}, 'matched_name': {'background': '#c8a9ff'}, 'found': {'foreground': '#000000', 'underline': True}, 'current_found': {'foreground': '#000000', 'background': '#c8a9ff'}}, @@ -298,15 +298,15 @@ 'insertbackground': '#ffffff', 'background': '#000000'}, 'GUTTER': {'foreground': '#d9d9d9', 'background': '#000000'}, - 'current_line': {'background': '#141414'}, + 'current_line': {'background': '#262626'}, 'definition': {'foreground': '#88c3ff', 'font': 'BoldEditorFont'}, 'string': {'foreground': '#43f480'}, 'string3': {'foreground': '#43f480', 'background': None, 'font': 'EditorFont'}, - 'open_string': {'foreground': '#43f480', 'background': '#141414'}, + 'open_string': {'foreground': '#43f480', 'background': '#262626'}, 'open_string3': {'foreground': '#43f480', - 'background': '#141414', + 'background': '#262626', 'font': 'EditorFont'}, 'keyword': {'foreground': '#ffffff', 'font': 'BoldEditorFont'}, 'builtin': {'foreground': '#88c3ff'}, @@ -322,7 +322,7 @@ 'hyperlink': {'foreground': '#1be4ed', 'underline': True}, 'surrounding_parens': {'foreground': '#0cedf6', 'font': 'BoldEditorFont'}, - 'unclosed_expression': {'background': '#141414'}, + 'unclosed_expression': {'background': '#262626'}, 'matched_name': {'background': '#09bcc4'}, 'found': {'foreground': '#ffeb3b', 'underline': True}, 'current_found': {'foreground': '#ffeb3b', 'background': '#09bcc4'}}, @@ -334,7 +334,89 @@ 'normal_foreground': '#ffeb3b', 'high_foreground': '#ffeb3b', 'low_foreground': '#e6e6e6'}, - {'selected': '#000000', 'active': '#000000'})} + {'selected': '#000000', 'active': '#000000'}), + 'Zacess Warm Dark': ('dark', + {'TEXT': {'foreground': '#e5d5b6', + 'insertbackground': '#fec9a7', + 'background': '#211b17'}, + 'GUTTER': {'foreground': '#bbafa0', 'background': '#211b17'}, + 'current_line': {'background': '#36322d'}, + 'definition': {'foreground': '#ffe8a1', 'font': 'BoldEditorFont'}, + 'string': {'foreground': '#abba6f'}, + 'string3': {'foreground': '#abba6f', + 'background': None, + 'font': 'EditorFont'}, + 'open_string': {'foreground': '#abba6f', 'background': '#36322d'}, + 'open_string3': {'foreground': '#abba6f', + 'background': '#36322d', + 'font': 'EditorFont'}, + 'keyword': {'foreground': '#f69d74', 'font': 'BoldEditorFont'}, + 'builtin': {'foreground': '#ffe8a1'}, + 'number': {'foreground': '#ecb4d8'}, + 'comment': {'foreground': '#beb19e', 'font': 'ItalicEditorFont'}, + 'welcome': {'foreground': '#beb19e'}, + 'magic': {'foreground': '#beb19e'}, + 'prompt': {'foreground': '#ffafc0', 'font': 'BoldEditorFont'}, + 'stdin': {'foreground': '#abba6f'}, + 'stdout': {'foreground': '#e5d5b6'}, + 'stderr': {'foreground': '#fca8a1'}, + 'value': {'foreground': '#ffe8a1'}, + 'hyperlink': {'foreground': '#e9b56a', 'underline': True}, + 'surrounding_parens': {'foreground': '#ffafc0', 'font': 'BoldEditorFont'}, + 'unclosed_expression': {'background': '#36322d'}, + 'matched_name': {'background': '#2c465c'}, + 'found': {'foreground': '#e5d5b6', 'underline': True}, + 'current_found': {'foreground': '#e5d5b6', 'background': '#2c465c'}}, + {'frame_background': '#2c241f', + 'text_background': '#211b17', + 'normal_detail': '#988c7e', + 'high_detail': '#e9b56a', + 'low_detail': '#7d7368', + 'normal_foreground': '#e5d5b6', + 'high_foreground': '#e5d5b6', + 'low_foreground': '#cabca9'}, + {'selected': '#211b17', 'active': '#211b17'}), + 'Zacess Warm Light': ('light', + {'TEXT': {'foreground': '#342410', + 'insertbackground': '#5b1301', + 'background': '#f4ead5'}, + 'GUTTER': {'foreground': '#514639', 'background': '#f4ead5'}, + 'current_line': {'background': '#d0cec0'}, + 'definition': {'foreground': '#744f01', 'font': 'BoldEditorFont'}, + 'string': {'foreground': '#04523a'}, + 'string3': {'foreground': '#04523a', + 'background': None, + 'font': 'EditorFont'}, + 'open_string': {'foreground': '#04523a', 'background': '#d0cec0'}, + 'open_string3': {'foreground': '#04523a', + 'background': '#d0cec0', + 'font': 'EditorFont'}, + 'keyword': {'foreground': '#832a01', 'font': 'BoldEditorFont'}, + 'builtin': {'foreground': '#744f01'}, + 'number': {'foreground': '#962b70'}, + 'comment': {'foreground': '#625240', 'font': 'ItalicEditorFont'}, + 'welcome': {'foreground': '#625240'}, + 'magic': {'foreground': '#625240'}, + 'prompt': {'foreground': '#760244', 'font': 'BoldEditorFont'}, + 'stdin': {'foreground': '#04523a'}, + 'stdout': {'foreground': '#342410'}, + 'stderr': {'foreground': '#710205'}, + 'value': {'foreground': '#744f01'}, + 'hyperlink': {'foreground': '#6d3b02', 'underline': True}, + 'surrounding_parens': {'foreground': '#760244', 'font': 'BoldEditorFont'}, + 'unclosed_expression': {'background': '#d0cec0'}, + 'matched_name': {'background': '#a0d2fe'}, + 'found': {'foreground': '#342410', 'underline': True}, + 'current_found': {'foreground': '#342410', 'background': '#a0d2fe'}}, + {'frame_background': '#e4d8be', + 'text_background': '#f4ead5', + 'normal_detail': '#7e6f5f', + 'high_detail': '#6d3b02', + 'low_detail': '#8a7e71', + 'normal_foreground': '#342410', + 'high_foreground': '#342410', + 'low_foreground': '#483b2c'}, + {'selected': '#ffffff', 'active': '#f4ead5'})} def load_plugin() -> None: diff --git a/editors/thonny/windows/apply.ps1 b/editors/thonny/windows/apply.ps1 index dfb3d3e..ab968d8 100644 --- a/editors/thonny/windows/apply.ps1 +++ b/editors/thonny/windows/apply.ps1 @@ -1,8 +1,9 @@ # installs the Zacess theme plugin into Thonny and sets its theme and font. # usage: .\apply.ps1 [-Theme ] [-Thonny ] # -# -Theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# -Theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # the work is done by ..\shared\apply.py run with Thonny's own Python, which knows where that @@ -27,12 +28,13 @@ $themeNames = [ordered]@{ 'hc-light' = 'Zacess High Contrast Light'; 'high-contrast-light' = 'Zacess High Contrast Light' 'dark' = 'Zacess Dark'; 'light' = 'Zacess Light'; 'cream' = 'Zacess Cream' 'yellow' = 'Zacess Yellow on Black'; 'yellow-on-black' = 'Zacess Yellow on Black' + 'warm-dark' = 'Zacess Warm Dark'; 'warm-light' = 'Zacess Warm Light' } $key = ($Theme.ToLowerInvariant() -replace '^zacess[ -]', '') -replace ' ', '-' $name = $themeNames[$key] if (-not $name) { [Console]::Error.WriteLine("Unknown theme: $Theme") - [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow.') + [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light.') exit 1 } diff --git a/editors/vivado/ACCESSIBILITY.md b/editors/vivado/ACCESSIBILITY.md index d51c4df..cad92d5 100644 --- a/editors/vivado/ACCESSIBILITY.md +++ b/editors/vivado/ACCESSIBILITY.md @@ -7,7 +7,7 @@ A high contrast text editor for HDL, Tcl and constraints with Geist Mono, so Viv ## Vision -- The text editor uses Zacess Deep Contrast Dark from [Zacess Themes](https://github.com/zacesshq/themes) 0.5.0: white on pure black with deep, fully saturated syntax colours. Any of the eight Zacess themes can be applied with `--theme` (`-Theme` on Windows). +- The text editor uses Zacess Deep Contrast Dark from [Zacess Themes](https://github.com/zacesshq/themes) 1.0.0: white on pure black with deep, fully saturated syntax colours. Any of the ten Zacess themes can be applied with `--theme` (`-Theme` on Windows). - Every text style is at least 7:1 on the background and the current line in the Deep Contrast and High Contrast themes and at least 4.5:1 in the others. The selection is a fill under the style's own colour, held to 4.5:1 in every theme, Zacess Themes' selection rule. - Colour is never the only signal: keywords and control flow are bold while comments are italic. - Editor text is Geist Mono at the size already set in **Tools > Settings > Text Editor**. diff --git a/editors/vivado/README.md b/editors/vivado/README.md index ac1710e..db94743 100644 --- a/editors/vivado/README.md +++ b/editors/vivado/README.md @@ -1,6 +1,6 @@ # vivado -AMD Vivado text editor setup for Windows and Linux: the eight Zacess themes for HDL, Tcl and constraint files, built from the Zacess palette, with Geist Mono as the editor font. +AMD Vivado text editor setup for Windows and Linux: the ten Zacess themes for HDL, Tcl and constraint files, built from the Zacess palette, with Geist Mono as the editor font. > [!WARNING] > None of this has run against a real Vivado install yet. The file names and keys come from AMD's documentation and from a published Vivado theme, listed under [Sources](#sources). Check the result the first time Vivado is installed and fix anything that does not hold. @@ -19,7 +19,7 @@ The font size already in `vivado.xml` is kept. That `vivado.xml` holds the **Too ## The themes -[`scripts/build-themes.py`](scripts/build-themes.py) builds [`shared/themes/`](shared/themes/) from the palette of [Zacess Themes](https://github.com/zacesshq/themes) 0.5.0, downloaded and checked against its SHA-256 digest. Each theme is a small JSON file holding the editor colours and the 21 syntax styles. The token order follows the jEdit text area Vivado's editor descends from: +[`scripts/build-themes.py`](scripts/build-themes.py) builds [`shared/themes/`](shared/themes/) from the palette of [Zacess Themes](https://github.com/zacesshq/themes) 1.0.0, downloaded and checked against its SHA-256 digest. Each theme is a small JSON file holding the editor colours and the 21 syntax styles. The token order follows the jEdit text area Vivado's editor descends from: | Style | Token | Zacess colour | | --- | --- | --- | diff --git a/editors/vivado/linux/apply.sh b/editors/vivado/linux/apply.sh index 2f81d85..ae0b21c 100755 --- a/editors/vivado/linux/apply.sh +++ b/editors/vivado/linux/apply.sh @@ -1,10 +1,11 @@ #!/usr/bin/env bash -# gives the AMD Vivado text editor one of the eight Zacess themes and Geist Mono. +# gives the AMD Vivado text editor one of the ten Zacess themes and Geist Mono. # usage: apply.sh [--theme ] [--config-dir ] # (the config folder defaults to the newest ~/.Xilinx/Vivado/) # -# --theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# --theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # Vivado keeps Tools > Settings in /vivado.xml and writes it back on exit. this merges the @@ -42,13 +43,15 @@ theme_id() { light) echo "light" ;; cream) echo "cream" ;; yellow|yellow-on-black) echo "yellow-on-black" ;; + warm-dark) echo "warm-dark" ;; + warm-light) echo "warm-light" ;; *) return 1 ;; esac } if ! id="$(theme_id "$theme")"; then echo "Unknown theme: $theme" >&2 - echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow." >&2 + echo "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light." >&2 exit 1 fi diff --git a/editors/vivado/scripts/build-themes.py b/editors/vivado/scripts/build-themes.py index 76cdfc8..8460f00 100644 --- a/editors/vivado/scripts/build-themes.py +++ b/editors/vivado/scripts/build-themes.py @@ -1,4 +1,4 @@ -"""Builds the eight Zacess text editor themes for AMD Vivado in shared/themes from the Zacess palette. +"""Builds the ten Zacess text editor themes for AMD Vivado in shared/themes from the Zacess palette. usage: python3 scripts/build-themes.py [palette.json] @@ -21,10 +21,10 @@ import sys import urllib.request -PALETTE_URL = "https://raw.githubusercontent.com/zacesshq/themes/v0.5.0/palette/zacess.json" -PALETTE_SHA256 = "4fe26dbd819605ec5a17141eb5994ef5e0cb0eb7a2fc5fab93cdc82a21cf40cf" +PALETTE_URL = "https://raw.githubusercontent.com/zacesshq/themes/v1.0.0/palette/zacess.json" +PALETTE_SHA256 = "7fd99f1a321df8270c32fa1eac2a6d27dbf5fc3bdf923756a2a8bc52669607a6" ORDER = ["deep-contrast-dark", "deep-contrast-light", "high-contrast-dark", "high-contrast-light", - "dark", "light", "cream", "yellow-on-black"] + "dark", "light", "cream", "yellow-on-black", "warm-dark", "warm-light"] # jEdit token order, then the styles Vivado adds; italic is font_style 2 and bold 1 (Java's Font) TOKENS = ["foreground", "comment", "comment", "string", "number", "attribute", "keyword", "type", "control", "operator", "invalid"] @@ -93,7 +93,7 @@ def main(): token_styles = {name: token["style"] for name, token in palette["tokens"].items()} themes = {t["id"]: t for t in palette["themes"]} if sorted(themes) != sorted(ORDER): - sys.exit("the palette does not hold the eight expected Zacess themes") + sys.exit("the palette does not hold the ten expected Zacess themes") target = pathlib.Path(__file__).resolve().parent.parent / "shared" / "themes" target.mkdir(parents=True, exist_ok=True) for theme_id in ORDER: diff --git a/editors/vivado/scripts/validate.py b/editors/vivado/scripts/validate.py index 68e6cf8..16b1a00 100644 --- a/editors/vivado/scripts/validate.py +++ b/editors/vivado/scripts/validate.py @@ -1,10 +1,11 @@ """Checks the Vivado folder without Vivado: run from anywhere, exits non-zero on a problem. -- shared/themes holds the eight Zacess themes, each with the eight CODE_EDITOR_* colours as +- shared/themes holds the ten Zacess themes, each with the eight CODE_EDITOR_* colours as Vivado's short hex and syntax styles 0 to 20 with colours as signed Java ARGB integers -- every text style is at least 7:1 on the editor background and the current line in the Deep - Contrast and High Contrast themes and at least 4.5:1 in the others; the selection fill is held to - 4.5:1 in every theme, Zacess Themes' own selection rule +- every text style is at least 7:1 on the editor background in the Deep Contrast and High Contrast + themes and at least 4.5:1 in the others; on the current line every text style is held to 4.5:1, + the rule Zacess Themes 0.6.0 sets for syntax. The selection fill is held to 4.5:1 in every + theme, Zacess Themes' own selection rule """ import json @@ -16,7 +17,7 @@ problems = [] IDS = ["deep-contrast-dark", "deep-contrast-light", "high-contrast-dark", "high-contrast-light", - "dark", "light", "cream", "yellow-on-black"] + "dark", "light", "cream", "yellow-on-black", "warm-dark", "warm-light"] COLOURS = ["CODE_EDITOR_BACKGROUND", "CODE_EDITOR_FOREGROUND", "CODE_EDITOR_CURSOR_COLOR", "CODE_EDITOR_LINE_HIGHLIGHT", "CODE_EDITOR_SELECTION_BACKGROUND", "CODE_EDITOR_FIND_HIGHLIGHT_BACKGROUND", "CODE_EDITOR_MATCHING_WORD_HIGHLIGHT_BACKGROUND", @@ -68,8 +69,9 @@ def contrast(a, b): floor = 7 if theme_id.startswith(("deep-", "high-")) else 4.5 for surface in ("CODE_EDITOR_BACKGROUND", "CODE_EDITOR_LINE_HIGHLIGHT", "CODE_EDITOR_SELECTION_BACKGROUND"): bg = rgb_of_hex(colours[surface]) - # the selection is a fill under the style's own colour, held to Zacess Themes' 4.5:1 selection rule - limit = 4.5 if surface == "CODE_EDITOR_SELECTION_BACKGROUND" else floor + # the selection is a fill under the style's own colour, held to Zacess Themes' 4.5:1 selection rule; + # the current line band takes Zacess Themes 0.6.0's 4.5:1 rule for syntax on it + limit = 4.5 if surface in ("CODE_EDITOR_SELECTION_BACKGROUND", "CODE_EDITOR_LINE_HIGHLIGHT") else floor for index in TEXT_STYLES: ratio = contrast(rgb_of_argb(styles[index]["foreground_color"]), bg) if ratio < limit: diff --git a/editors/vivado/shared/themes/zacess-cream.json b/editors/vivado/shared/themes/zacess-cream.json index 8b6b901..37fb6c9 100644 --- a/editors/vivado/shared/themes/zacess-cream.json +++ b/editors/vivado/shared/themes/zacess-cream.json @@ -5,7 +5,7 @@ "CODE_EDITOR_BACKGROUND": "fdf6e3", "CODE_EDITOR_FOREGROUND": "0", "CODE_EDITOR_CURSOR_COLOR": "0", - "CODE_EDITOR_LINE_HIGHLIGHT": "f3ead2", + "CODE_EDITOR_LINE_HIGHLIGHT": "c8dadd", "CODE_EDITOR_SELECTION_BACKGROUND": "c8a9ff", "CODE_EDITOR_FIND_HIGHLIGHT_BACKGROUND": "ffd400", "CODE_EDITOR_MATCHING_WORD_HIGHLIGHT_BACKGROUND": "c8a9ff", @@ -127,12 +127,12 @@ "font_style": "0", "effect": "0", "effect_color": "null", - "stripe_color": "-11456256" + "stripe_color": "-8375808" }, { "style_index": "13", "foreground_color": "-16777216", - "background_color": "-791854", + "background_color": "-3613987", "font_style": "0", "effect": "0", "effect_color": "null", diff --git a/editors/vivado/shared/themes/zacess-dark.json b/editors/vivado/shared/themes/zacess-dark.json index 4c336d8..a613819 100644 --- a/editors/vivado/shared/themes/zacess-dark.json +++ b/editors/vivado/shared/themes/zacess-dark.json @@ -5,9 +5,9 @@ "CODE_EDITOR_BACKGROUND": "121212", "CODE_EDITOR_FOREGROUND": "f5f5f5", "CODE_EDITOR_CURSOR_COLOR": "ffd400", - "CODE_EDITOR_LINE_HIGHLIGHT": "1f1f1f", + "CODE_EDITOR_LINE_HIGHLIGHT": "2f2f2f", "CODE_EDITOR_SELECTION_BACKGROUND": "4769", - "CODE_EDITOR_FIND_HIGHLIGHT_BACKGROUND": "332a00", + "CODE_EDITOR_FIND_HIGHLIGHT_BACKGROUND": "4d4000", "CODE_EDITOR_MATCHING_WORD_HIGHLIGHT_BACKGROUND": "4769", "CODE_EDITOR_BREAKPOINT_BACKGROUND": "331414" }, @@ -127,12 +127,12 @@ "font_style": "0", "effect": "0", "effect_color": "null", - "stripe_color": "-11902" + "stripe_color": "-1195919" }, { "style_index": "13", "foreground_color": "-657931", - "background_color": "-14737633", + "background_color": "-13684945", "font_style": "0", "effect": "0", "effect_color": "null", diff --git a/editors/vivado/shared/themes/zacess-deep-contrast-dark.json b/editors/vivado/shared/themes/zacess-deep-contrast-dark.json index 349da90..279b6a1 100644 --- a/editors/vivado/shared/themes/zacess-deep-contrast-dark.json +++ b/editors/vivado/shared/themes/zacess-deep-contrast-dark.json @@ -5,9 +5,9 @@ "CODE_EDITOR_BACKGROUND": "0", "CODE_EDITOR_FOREGROUND": "ffffff", "CODE_EDITOR_CURSOR_COLOR": "ffff00", - "CODE_EDITOR_LINE_HIGHLIGHT": "141414", + "CODE_EDITOR_LINE_HIGHLIGHT": "262626", "CODE_EDITOR_SELECTION_BACKGROUND": "720072", - "CODE_EDITOR_FIND_HIGHLIGHT_BACKGROUND": "403300", + "CODE_EDITOR_FIND_HIGHLIGHT_BACKGROUND": "453800", "CODE_EDITOR_MATCHING_WORD_HIGHLIGHT_BACKGROUND": "720072", "CODE_EDITOR_BREAKPOINT_BACKGROUND": "330000" }, @@ -132,7 +132,7 @@ { "style_index": "13", "foreground_color": "-1", - "background_color": "-15461356", + "background_color": "-14277082", "font_style": "0", "effect": "0", "effect_color": "null", diff --git a/editors/vivado/shared/themes/zacess-deep-contrast-light.json b/editors/vivado/shared/themes/zacess-deep-contrast-light.json index ea0e24f..dcd847e 100644 --- a/editors/vivado/shared/themes/zacess-deep-contrast-light.json +++ b/editors/vivado/shared/themes/zacess-deep-contrast-light.json @@ -5,7 +5,7 @@ "CODE_EDITOR_BACKGROUND": "ffffff", "CODE_EDITOR_FOREGROUND": "0", "CODE_EDITOR_CURSOR_COLOR": "0", - "CODE_EDITOR_LINE_HIGHLIGHT": "f5f5f5", + "CODE_EDITOR_LINE_HIGHLIGHT": "c8debd", "CODE_EDITOR_SELECTION_BACKGROUND": "ffbcfa", "CODE_EDITOR_FIND_HIGHLIGHT_BACKGROUND": "fff1a0", "CODE_EDITOR_MATCHING_WORD_HIGHLIGHT_BACKGROUND": "ffbcfa", @@ -127,12 +127,12 @@ "font_style": "0", "effect": "0", "effect_color": "null", - "stripe_color": "-10010368" + "stripe_color": "-10213888" }, { "style_index": "13", "foreground_color": "-16777216", - "background_color": "-657931", + "background_color": "-3612995", "font_style": "0", "effect": "0", "effect_color": "null", diff --git a/editors/vivado/shared/themes/zacess-high-contrast-dark.json b/editors/vivado/shared/themes/zacess-high-contrast-dark.json index eb71f03..818efc2 100644 --- a/editors/vivado/shared/themes/zacess-high-contrast-dark.json +++ b/editors/vivado/shared/themes/zacess-high-contrast-dark.json @@ -5,9 +5,9 @@ "CODE_EDITOR_BACKGROUND": "0", "CODE_EDITOR_FOREGROUND": "ffffff", "CODE_EDITOR_CURSOR_COLOR": "f5c400", - "CODE_EDITOR_LINE_HIGHLIGHT": "1a1a1a", + "CODE_EDITOR_LINE_HIGHLIGHT": "262626", "CODE_EDITOR_SELECTION_BACKGROUND": "6501ae", - "CODE_EDITOR_FIND_HIGHLIGHT_BACKGROUND": "403300", + "CODE_EDITOR_FIND_HIGHLIGHT_BACKGROUND": "493900", "CODE_EDITOR_MATCHING_WORD_HIGHLIGHT_BACKGROUND": "6501ae", "CODE_EDITOR_BREAKPOINT_BACKGROUND": "3d0008" }, @@ -132,7 +132,7 @@ { "style_index": "13", "foreground_color": "-1", - "background_color": "-15066598", + "background_color": "-14277082", "font_style": "0", "effect": "0", "effect_color": "null", diff --git a/editors/vivado/shared/themes/zacess-high-contrast-light.json b/editors/vivado/shared/themes/zacess-high-contrast-light.json index d6f1a90..eb66cd3 100644 --- a/editors/vivado/shared/themes/zacess-high-contrast-light.json +++ b/editors/vivado/shared/themes/zacess-high-contrast-light.json @@ -5,7 +5,7 @@ "CODE_EDITOR_BACKGROUND": "ffffff", "CODE_EDITOR_FOREGROUND": "0", "CODE_EDITOR_CURSOR_COLOR": "0", - "CODE_EDITOR_LINE_HIGHLIGHT": "f2f2f2", + "CODE_EDITOR_LINE_HIGHLIGHT": "c3e5fe", "CODE_EDITOR_SELECTION_BACKGROUND": "d3d0", "CODE_EDITOR_FIND_HIGHLIGHT_BACKGROUND": "ffd400", "CODE_EDITOR_MATCHING_WORD_HIGHLIGHT_BACKGROUND": "d3d0", @@ -127,12 +127,12 @@ "font_style": "0", "effect": "0", "effect_color": "null", - "stripe_color": "-10864128" + "stripe_color": "-11658240" }, { "style_index": "13", "foreground_color": "-16777216", - "background_color": "-855310", + "background_color": "-3938818", "font_style": "0", "effect": "0", "effect_color": "null", diff --git a/editors/vivado/shared/themes/zacess-light.json b/editors/vivado/shared/themes/zacess-light.json index bce4afc..1c6a207 100644 --- a/editors/vivado/shared/themes/zacess-light.json +++ b/editors/vivado/shared/themes/zacess-light.json @@ -5,7 +5,7 @@ "CODE_EDITOR_BACKGROUND": "ffffff", "CODE_EDITOR_FOREGROUND": "111111", "CODE_EDITOR_CURSOR_COLOR": "111111", - "CODE_EDITOR_LINE_HIGHLIGHT": "f0f0f0", + "CODE_EDITOR_LINE_HIGHLIGHT": "d6dde8", "CODE_EDITOR_SELECTION_BACKGROUND": "9bc3ff", "CODE_EDITOR_FIND_HIGHLIGHT_BACKGROUND": "ffd400", "CODE_EDITOR_MATCHING_WORD_HIGHLIGHT_BACKGROUND": "9bc3ff", @@ -127,12 +127,12 @@ "font_style": "0", "effect": "0", "effect_color": "null", - "stripe_color": "-10996224" + "stripe_color": "-8112128" }, { "style_index": "13", "foreground_color": "-15658735", - "background_color": "-986896", + "background_color": "-2695704", "font_style": "0", "effect": "0", "effect_color": "null", diff --git a/editors/vivado/shared/themes/zacess-warm-dark.json b/editors/vivado/shared/themes/zacess-warm-dark.json new file mode 100644 index 0000000..c8f09d4 --- /dev/null +++ b/editors/vivado/shared/themes/zacess-warm-dark.json @@ -0,0 +1,205 @@ +{ + "name": "Zacess Warm Dark", + "appearance": "dark", + "general_color": { + "CODE_EDITOR_BACKGROUND": "211b17", + "CODE_EDITOR_FOREGROUND": "e5d5b6", + "CODE_EDITOR_CURSOR_COLOR": "fec9a7", + "CODE_EDITOR_LINE_HIGHLIGHT": "36322d", + "CODE_EDITOR_SELECTION_BACKGROUND": "2c465c", + "CODE_EDITOR_FIND_HIGHLIGHT_BACKGROUND": "5f3e02", + "CODE_EDITOR_MATCHING_WORD_HIGHLIGHT_BACKGROUND": "2c465c", + "CODE_EDITOR_BREAKPOINT_BACKGROUND": "39201d" + }, + "syntax_styles": [ + { + "style_index": "0", + "foreground_color": "-1714762", + "background_color": "null", + "font_style": "0", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "1", + "foreground_color": "-4279906", + "background_color": "null", + "font_style": "2", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "2", + "foreground_color": "-4279906", + "background_color": "null", + "font_style": "2", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "3", + "foreground_color": "-5522833", + "background_color": "null", + "font_style": "0", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "4", + "foreground_color": "-1264424", + "background_color": "null", + "font_style": "0", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "5", + "foreground_color": "-12641", + "background_color": "null", + "font_style": "0", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "6", + "foreground_color": "-615052", + "background_color": "null", + "font_style": "1", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "7", + "foreground_color": "-9322314", + "background_color": "null", + "font_style": "0", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "8", + "foreground_color": "-20544", + "background_color": "null", + "font_style": "1", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "9", + "foreground_color": "-1714762", + "background_color": "null", + "font_style": "0", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "10", + "foreground_color": "-20054", + "background_color": "null", + "font_style": "1", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "11", + "foreground_color": "null", + "background_color": "null", + "font_style": "0", + "effect": "2", + "effect_color": "-218975", + "stripe_color": "-218975" + }, + { + "style_index": "12", + "foreground_color": "-1714762", + "background_color": "-13875620", + "font_style": "0", + "effect": "0", + "effect_color": "null", + "stripe_color": "-341636" + }, + { + "style_index": "13", + "foreground_color": "-1714762", + "background_color": "-13225427", + "font_style": "0", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "14", + "foreground_color": "-1714762", + "background_color": "-13875620", + "font_style": "0", + "effect": "0", + "effect_color": "null", + "stripe_color": "-5581839" + }, + { + "style_index": "15", + "foreground_color": "-9322314", + "background_color": "null", + "font_style": "2", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "16", + "foreground_color": "-5977623", + "background_color": "null", + "font_style": "2", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "17", + "foreground_color": "-5522833", + "background_color": "null", + "font_style": "2", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "18", + "foreground_color": "-1264424", + "background_color": "null", + "font_style": "2", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "19", + "foreground_color": "-615052", + "background_color": "null", + "font_style": "2", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "20", + "foreground_color": "-20544", + "background_color": "null", + "font_style": "2", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + } + ] +} diff --git a/editors/vivado/shared/themes/zacess-warm-light.json b/editors/vivado/shared/themes/zacess-warm-light.json new file mode 100644 index 0000000..d9f53fb --- /dev/null +++ b/editors/vivado/shared/themes/zacess-warm-light.json @@ -0,0 +1,205 @@ +{ + "name": "Zacess Warm Light", + "appearance": "light", + "general_color": { + "CODE_EDITOR_BACKGROUND": "f4ead5", + "CODE_EDITOR_FOREGROUND": "342410", + "CODE_EDITOR_CURSOR_COLOR": "5b1301", + "CODE_EDITOR_LINE_HIGHLIGHT": "d0cec0", + "CODE_EDITOR_SELECTION_BACKGROUND": "a0d2fe", + "CODE_EDITOR_FIND_HIGHLIGHT_BACKGROUND": "fdc436", + "CODE_EDITOR_MATCHING_WORD_HIGHLIGHT_BACKGROUND": "a0d2fe", + "CODE_EDITOR_BREAKPOINT_BACKGROUND": "fdddda" + }, + "syntax_styles": [ + { + "style_index": "0", + "foreground_color": "-13360112", + "background_color": "null", + "font_style": "0", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "1", + "foreground_color": "-10333632", + "background_color": "null", + "font_style": "2", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "2", + "foreground_color": "-10333632", + "background_color": "null", + "font_style": "2", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "3", + "foreground_color": "-16494022", + "background_color": "null", + "font_style": "0", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "4", + "foreground_color": "-6935696", + "background_color": "null", + "font_style": "0", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "5", + "foreground_color": "-7585531", + "background_color": "null", + "font_style": "0", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "6", + "foreground_color": "-8181247", + "background_color": "null", + "font_style": "1", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "7", + "foreground_color": "-16494009", + "background_color": "null", + "font_style": "0", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "8", + "foreground_color": "-9043388", + "background_color": "null", + "font_style": "1", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "9", + "foreground_color": "-13360112", + "background_color": "null", + "font_style": "0", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "10", + "foreground_color": "-10354165", + "background_color": "null", + "font_style": "1", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "11", + "foreground_color": "null", + "background_color": "null", + "font_style": "0", + "effect": "2", + "effect_color": "-9371131", + "stripe_color": "-9371131" + }, + { + "style_index": "12", + "foreground_color": "-13360112", + "background_color": "-6237442", + "font_style": "0", + "effect": "0", + "effect_color": "null", + "stripe_color": "-10339070" + }, + { + "style_index": "13", + "foreground_color": "-13360112", + "background_color": "-3092800", + "font_style": "0", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "14", + "foreground_color": "-13360112", + "background_color": "-6237442", + "font_style": "0", + "effect": "0", + "effect_color": "null", + "stripe_color": "-16697252" + }, + { + "style_index": "15", + "foreground_color": "-16494009", + "background_color": "null", + "font_style": "2", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "16", + "foreground_color": "-16633459", + "background_color": "null", + "font_style": "2", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "17", + "foreground_color": "-16494022", + "background_color": "null", + "font_style": "2", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "18", + "foreground_color": "-6935696", + "background_color": "null", + "font_style": "2", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "19", + "foreground_color": "-8181247", + "background_color": "null", + "font_style": "2", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + }, + { + "style_index": "20", + "foreground_color": "-9043388", + "background_color": "null", + "font_style": "2", + "effect": "0", + "effect_color": "null", + "stripe_color": "null" + } + ] +} diff --git a/editors/vivado/shared/themes/zacess-yellow-on-black.json b/editors/vivado/shared/themes/zacess-yellow-on-black.json index e3cda0d..76a9383 100644 --- a/editors/vivado/shared/themes/zacess-yellow-on-black.json +++ b/editors/vivado/shared/themes/zacess-yellow-on-black.json @@ -5,9 +5,9 @@ "CODE_EDITOR_BACKGROUND": "0", "CODE_EDITOR_FOREGROUND": "ffeb3b", "CODE_EDITOR_CURSOR_COLOR": "ffffff", - "CODE_EDITOR_LINE_HIGHLIGHT": "141414", + "CODE_EDITOR_LINE_HIGHLIGHT": "262626", "CODE_EDITOR_SELECTION_BACKGROUND": "24b4e", - "CODE_EDITOR_FIND_HIGHLIGHT_BACKGROUND": "3d3000", + "CODE_EDITOR_FIND_HIGHLIGHT_BACKGROUND": "4b3a00", "CODE_EDITOR_MATCHING_WORD_HIGHLIGHT_BACKGROUND": "24b4e", "CODE_EDITOR_BREAKPOINT_BACKGROUND": "3a0e0e" }, @@ -132,7 +132,7 @@ { "style_index": "13", "foreground_color": "-5317", - "background_color": "-15461356", + "background_color": "-14277082", "font_style": "0", "effect": "0", "effect_color": "null", diff --git a/editors/vivado/windows/apply.ps1 b/editors/vivado/windows/apply.ps1 index e92dd4e..57087e5 100644 --- a/editors/vivado/windows/apply.ps1 +++ b/editors/vivado/windows/apply.ps1 @@ -1,9 +1,10 @@ -# gives the AMD Vivado text editor one of the eight Zacess themes and Geist Mono. +# gives the AMD Vivado text editor one of the ten Zacess themes and Geist Mono. # usage: .\apply.ps1 [-Theme ] [-ConfigDir ] # (the config folder defaults to the newest %APPDATA%\Xilinx\Vivado\) # -# -Theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# -Theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # Vivado keeps Tools > Settings in \vivado.xml and writes it back on exit. this merges the @@ -29,12 +30,13 @@ $themeIds = [ordered]@{ 'hc-light' = 'high-contrast-light'; 'high-contrast-light' = 'high-contrast-light' 'dark' = 'dark'; 'light' = 'light'; 'cream' = 'cream' 'yellow' = 'yellow-on-black'; 'yellow-on-black' = 'yellow-on-black' + 'warm-dark' = 'warm-dark'; 'warm-light' = 'warm-light' } $key = ($Theme.ToLowerInvariant() -replace '^zacess[ -]', '') -replace ' ', '-' $id = $themeIds[$key] if (-not $id) { [Console]::Error.WriteLine("Unknown theme: $Theme") - [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow.') + [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light.') exit 1 } diff --git a/editors/vscode/ACCESSIBILITY.md b/editors/vscode/ACCESSIBILITY.md index a9f3571..b97ee17 100644 --- a/editors/vscode/ACCESSIBILITY.md +++ b/editors/vscode/ACCESSIBILITY.md @@ -15,7 +15,7 @@ The settings put readability first and every custom shortcut follows one pattern - Text in the integrated terminal is held to 4.5:1 on whatever sits behind it (`terminal.integrated.minimumContrastRatio`), so a program's own colour pairs can never vanish. > [!TIP] -> The theme stays on `Zacess Deep Contrast Dark` whatever the system appearance, since `window.autoDetectColorScheme` is `false`. All eight Zacess themes are in the theme picker (`Cmd+K Cmd+T`, `Ctrl+K Ctrl+T` on Windows and Linux). Set `window.autoDetectColorScheme` to `true` to switch between `Zacess Deep Contrast Dark` and `Zacess Deep Contrast Light` with the system instead. +> The theme stays on `Zacess Deep Contrast Dark` whatever the system appearance, since `window.autoDetectColorScheme` is `false`. All ten Zacess themes are in the theme picker (`Cmd+K Cmd+T`, `Ctrl+K Ctrl+T` on Windows and Linux). Set `window.autoDetectColorScheme` to `true` to switch between `Zacess Deep Contrast Dark` and `Zacess Deep Contrast Light` with the system instead. ## Keyboard diff --git a/editors/vscode/README.md b/editors/vscode/README.md index aeb65cf..6d90c09 100644 --- a/editors/vscode/README.md +++ b/editors/vscode/README.md @@ -17,7 +17,7 @@ ## In action -VS Code in each of the eight Zacess themes, with the same file open. +VS Code in each of the ten Zacess themes, with the same file open. | Deep Contrast Dark | Deep Contrast Light | | --- | --- | diff --git a/editors/vscode/extensions.txt b/editors/vscode/extensions.txt index 0fd3cbf..ffea7ff 100644 --- a/editors/vscode/extensions.txt +++ b/editors/vscode/extensions.txt @@ -93,7 +93,7 @@ ms-azuretools.vscode-containers@2.5.0 ms-edgedevtools.vscode-edge-devtools@2.1.10 // Themes -zacess.zacess-themes@0.12.0 +zacess.zacess-themes@1.0.0 // Editor quality of life redhat.vscode-yaml@1.24.0 diff --git a/editors/vscode/guides/extensions.md b/editors/vscode/guides/extensions.md index 5b86483..6573dda 100644 --- a/editors/vscode/guides/extensions.md +++ b/editors/vscode/guides/extensions.md @@ -90,7 +90,7 @@ What every installed extension does and when it actually gets used. Grouped the ## Themes -- **`zacess.zacess-themes`** - the eight Zacess colour themes. `Zacess Deep Contrast Dark` is the theme `settings.json` sets; the other seven, `Zacess Deep Contrast Light` among them, are in the theme picker. +- **`zacess.zacess-themes`** - the ten Zacess colour themes. `Zacess Deep Contrast Dark` is the theme `settings.json` sets; the other seven, `Zacess Deep Contrast Light` among them, are in the theme picker. ## Editor quality of life diff --git a/editors/xcode/ACCESSIBILITY.md b/editors/xcode/ACCESSIBILITY.md index 3831cac..b01318e 100644 --- a/editors/xcode/ACCESSIBILITY.md +++ b/editors/xcode/ACCESSIBILITY.md @@ -12,9 +12,10 @@ other editors. - The editor uses Zacess Deep Contrast Dark from [Zacess Themes](https://github.com/zacesshq/themes) in Xcode 27: white on pure black with deep, - fully saturated colours. All eight Zacess themes are in `theme/` and the script installs every + fully saturated colours. All ten Zacess themes are in `theme/` and the script installs every one: Light, Dark, Yellow on Black, Cream, High Contrast Dark, High Contrast Light, Deep Contrast - Dark and Deep Contrast Light. Measured contrast is in the + Dark, Deep Contrast Light, Warm Dark and Warm Light. The Warm pair is the gentler option with a + 4.5:1 floor; the other eight keep 7:1. Measured contrast is in the [Zacess Themes accessibility statement](https://github.com/zacesshq/themes/blob/main/ACCESSIBILITY.md). - Colour is never the only signal in the themes: keywords are bold, comments are italic and documentation tags are bold italic. diff --git a/editors/xcode/README.md b/editors/xcode/README.md index 3848265..78a7f2d 100644 --- a/editors/xcode/README.md +++ b/editors/xcode/README.md @@ -1,6 +1,6 @@ # xcode -> Xcode preferences for macOS: the eight Zacess colour themes, the recorded editor settings, the +> Xcode preferences for macOS: the ten Zacess colour themes, the recorded editor settings, the > key bindings file and one script that installs them all. Xcode keeps its preferences in the `com.apple.dt.Xcode` defaults domain, mixed in with a long list @@ -13,7 +13,7 @@ one key at a time. - [`prefs.txt`](prefs.txt) - the preferences, read from Xcode 27.1: the light and dark editor themes for Xcode 26 and earlier, the Xcode 27 theme setting, the key bindings set, predictive code completion off and automatic string catalog comments off. -- [`theme/`](theme/) - the eight Zacess Xcode themes from +- [`theme/`](theme/) - the ten Zacess Xcode themes from [Zacess Themes](https://github.com/zacesshq/themes) as `.xccolortheme` files, plus Zacess Deep Contrast Dark in Xcode 27's own `.xcworkspacecolortheme` format. - [`KeyBindings/`](KeyBindings/) - the key bindings set Xcode keeps in diff --git a/editors/xcode/apply.sh b/editors/xcode/apply.sh index 8b483c9..116f982 100755 --- a/editors/xcode/apply.sh +++ b/editors/xcode/apply.sh @@ -55,7 +55,7 @@ copy_file() { changes=$((changes + 1)) } -# the eight classic .xccolortheme files sit beside the .xcworkspacecolortheme +# the ten classic .xccolortheme files sit beside the .xcworkspacecolortheme # that xcode 27 writes when one of them is imported, so a new mac needs no # manual import for the theme recorded in DVTWorkspaceThemeSettings echo "Themes" diff --git a/editors/xcode/guides/reference.md b/editors/xcode/guides/reference.md index 7eea21a..5928a66 100644 --- a/editors/xcode/guides/reference.md +++ b/editors/xcode/guides/reference.md @@ -28,7 +28,7 @@ Every other editor setting, such as line numbers, the page guide, trimming white ## Themes -[`theme/`](../theme/) holds the eight Zacess Xcode themes from [Zacess Themes](https://github.com/zacesshq/themes), generated there from its palette. Each sets the colour and font of every syntax type Xcode colours, the editor background, cursor, selection and current line, the console and the scroll bar marks. +[`theme/`](../theme/) holds the ten Zacess Xcode themes from [Zacess Themes](https://github.com/zacesshq/themes), generated there from its palette. Each sets the colour and font of every syntax type Xcode colours, the editor background, cursor, selection and current line, the console and the scroll bar marks. | Theme | macOS appearance | | --- | --- | @@ -40,6 +40,8 @@ Every other editor setting, such as line numbers, the page guide, trimming white | Zacess High Contrast Light | Light | | Zacess Deep Contrast Dark | Dark | | Zacess Deep Contrast Light | Light | +| Zacess Warm Dark | Dark | +| Zacess Warm Light | Light | Xcode 27 has a new theme system. A classic `.xccolortheme` file only shows up once it is brought in through **Settings...**, **Themes**, **Import Classic Theme**, which writes a `.xcworkspacecolortheme` file and records the choice in `DVTWorkspaceThemeSettings`. Zacess Deep Contrast Dark is included in both forms, as Xcode wrote them on import, so `apply.sh` sets it up on a new Mac without importing again. It is marked to show in every appearance. diff --git a/editors/xcode/guides/setup.md b/editors/xcode/guides/setup.md index 702255d..4103393 100644 --- a/editors/xcode/guides/setup.md +++ b/editors/xcode/guides/setup.md @@ -24,7 +24,7 @@ The script: 1. refuses to run while a process called `Xcode` is open (a dry run is allowed, since it writes nothing) -2. copies the eight `.xccolortheme` files and the Xcode 27 `.xcworkspacecolortheme` file from +2. copies the ten `.xccolortheme` files and the Xcode 27 `.xcworkspacecolortheme` file from [`theme/`](../theme/) into `~/Library/Developer/Xcode/UserData/FontAndColorThemes` 3. copies [`KeyBindings/Default.idekeybindings`](../KeyBindings/Default.idekeybindings) into `~/Library/Developer/Xcode/UserData/KeyBindings` diff --git a/editors/xcode/theme/Zacess Warm Dark.xccolortheme b/editors/xcode/theme/Zacess Warm Dark.xccolortheme new file mode 100644 index 0000000..9c25e7b --- /dev/null +++ b/editors/xcode/theme/Zacess Warm Dark.xccolortheme @@ -0,0 +1,219 @@ + + + + + + DVTConsoleDebuggerInputTextColor + 0.898039 0.835294 0.713725 1 + DVTConsoleDebuggerInputTextFont + SFMono-Bold - 12.0 + DVTConsoleDebuggerOutputTextColor + 0.792157 0.737255 0.662745 1 + DVTConsoleDebuggerOutputTextFont + SFMono-Regular - 12.0 + DVTConsoleDebuggerPromptTextColor + 0.913725 0.709804 0.415686 1 + DVTConsoleDebuggerPromptTextFont + SFMono-Bold - 12.0 + DVTConsoleExectuableInputTextColor + 0.898039 0.835294 0.713725 1 + DVTConsoleExectuableInputTextFont + SFMono-Bold - 12.0 + DVTConsoleExectuableOutputTextColor + 0.898039 0.835294 0.713725 1 + DVTConsoleExectuableOutputTextFont + SFMono-Regular - 12.0 + DVTConsoleTextBackgroundColor + 0.129412 0.105882 0.090196 1 + DVTConsoleTextInsertionPointColor + 0.996078 0.788235 0.654902 1 + DVTConsoleTextSelectionColor + 0.172549 0.27451 0.360784 1 + DVTDebuggerInstructionPointerColor + 0.113725 0.164706 0.086275 1 + DVTFontAndColorVersion + 1 + DVTLineSpacing + 1.1 + DVTMarkupTextBackgroundColor + 0.101961 0.082353 0.070588 1 + DVTMarkupTextBorderColor + 0.596078 0.54902 0.494118 1 + DVTMarkupTextCodeFont + SFMono-Regular - 10.0 + DVTMarkupTextEmphasisColor + 0.898039 0.835294 0.713725 1 + DVTMarkupTextEmphasisFont + .AppleSystemUIFontItalic - 10.0 + DVTMarkupTextInlineCodeColor + 0.898039 0.835294 0.713725 1 + DVTMarkupTextLinkColor + 0.913725 0.709804 0.415686 1 + DVTMarkupTextLinkFont + .AppleSystemUIFont - 10.0 + DVTMarkupTextNormalColor + 0.898039 0.835294 0.713725 1 + DVTMarkupTextNormalFont + .AppleSystemUIFont - 10.0 + DVTMarkupTextOtherHeadingColor + 0.792157 0.737255 0.662745 1 + DVTMarkupTextOtherHeadingFont + .AppleSystemUIFont - 14.0 + DVTMarkupTextPrimaryHeadingColor + 0.898039 0.835294 0.713725 1 + DVTMarkupTextPrimaryHeadingFont + .AppleSystemUIFont - 24.0 + DVTMarkupTextSecondaryHeadingColor + 0.898039 0.835294 0.713725 1 + DVTMarkupTextSecondaryHeadingFont + .AppleSystemUIFont - 18.0 + DVTMarkupTextStrongColor + 0.898039 0.835294 0.713725 1 + DVTMarkupTextStrongFont + .AppleSystemUIFontBold - 10.0 + DVTScrollbarMarkerAnalyzerColor + 0.666667 0.827451 0.945098 1 + DVTScrollbarMarkerBreakpointColor + 0.913725 0.709804 0.415686 1 + DVTScrollbarMarkerDiffColor + 0.713725 0.858824 0.988235 1 + DVTScrollbarMarkerDiffConflictColor + 0.988235 0.658824 0.631373 1 + DVTScrollbarMarkerErrorColor + 0.988235 0.658824 0.631373 1 + DVTScrollbarMarkerRuntimeIssueColor + 0.964706 0.615686 0.454902 1 + DVTScrollbarMarkerWarningColor + 0.980392 0.788235 0.486275 1 + DVTSourceTextBackground + 0.129412 0.105882 0.090196 1 + DVTSourceTextBlockDimBackgroundColor + 0.172549 0.141176 0.121569 1 + DVTSourceTextCurrentLineHighlightColor + 0.211765 0.196078 0.176471 1 + DVTSourceTextInsertionPointColor + 0.996078 0.788235 0.654902 1 + DVTSourceTextInvisiblesColor + 0.521569 0.486275 0.443137 1 + DVTSourceTextSelectionColor + 0.172549 0.27451 0.360784 1 + DVTSourceTextSyntaxColors + + xcode.syntax.attribute + 1 0.807843 0.623529 1 + xcode.syntax.character + 0.670588 0.729412 0.435294 1 + xcode.syntax.comment + 0.745098 0.694118 0.619608 1 + xcode.syntax.comment.doc + 0.745098 0.694118 0.619608 1 + xcode.syntax.comment.doc.keyword + 0.745098 0.694118 0.619608 1 + xcode.syntax.declaration.other + 1 0.909804 0.631373 1 + xcode.syntax.declaration.type + 0.443137 0.752941 0.713725 1 + xcode.syntax.identifier.class + 0.443137 0.752941 0.713725 1 + xcode.syntax.identifier.class.system + 0.443137 0.752941 0.713725 1 + xcode.syntax.identifier.constant + 0.92549 0.705882 0.847059 1 + xcode.syntax.identifier.constant.system + 0.92549 0.705882 0.847059 1 + xcode.syntax.identifier.function + 1 0.909804 0.631373 1 + xcode.syntax.identifier.function.system + 1 0.909804 0.631373 1 + xcode.syntax.identifier.macro + 1 0.909804 0.631373 1 + xcode.syntax.identifier.macro.system + 1 0.909804 0.631373 1 + xcode.syntax.identifier.type + 0.443137 0.752941 0.713725 1 + xcode.syntax.identifier.type.system + 0.443137 0.752941 0.713725 1 + xcode.syntax.identifier.variable + 0.643137 0.788235 0.913725 1 + xcode.syntax.identifier.variable.system + 0.643137 0.788235 0.913725 1 + xcode.syntax.keyword + 0.964706 0.615686 0.454902 1 + xcode.syntax.mark + 1 0.686275 0.752941 1 + xcode.syntax.markup.aside.kind + 0.964706 0.615686 0.454902 1 + xcode.syntax.markup.code + 0.898039 0.835294 0.713725 1 + xcode.syntax.number + 0.92549 0.705882 0.847059 1 + xcode.syntax.plain + 0.898039 0.835294 0.713725 1 + xcode.syntax.preprocessor + 1 0.686275 0.752941 1 + xcode.syntax.string + 0.670588 0.729412 0.435294 1 + xcode.syntax.url + 1 0.909804 0.631373 1 + + DVTSourceTextSyntaxFonts + + xcode.syntax.attribute + SFMono-Regular - 12.0 + xcode.syntax.character + SFMono-Regular - 12.0 + xcode.syntax.comment + SFMono-RegularItalic - 12.0 + xcode.syntax.comment.doc + SFMono-RegularItalic - 12.0 + xcode.syntax.comment.doc.keyword + SFMono-BoldItalic - 12.0 + xcode.syntax.declaration.other + SFMono-Regular - 12.0 + xcode.syntax.declaration.type + SFMono-Regular - 12.0 + xcode.syntax.identifier.class + SFMono-Regular - 12.0 + xcode.syntax.identifier.class.system + SFMono-Regular - 12.0 + xcode.syntax.identifier.constant + SFMono-Regular - 12.0 + xcode.syntax.identifier.constant.system + SFMono-Regular - 12.0 + xcode.syntax.identifier.function + SFMono-Regular - 12.0 + xcode.syntax.identifier.function.system + SFMono-Regular - 12.0 + xcode.syntax.identifier.macro + SFMono-Regular - 12.0 + xcode.syntax.identifier.macro.system + SFMono-Regular - 12.0 + xcode.syntax.identifier.type + SFMono-Regular - 12.0 + xcode.syntax.identifier.type.system + SFMono-Regular - 12.0 + xcode.syntax.identifier.variable + SFMono-Regular - 12.0 + xcode.syntax.identifier.variable.system + SFMono-Regular - 12.0 + xcode.syntax.keyword + SFMono-Bold - 12.0 + xcode.syntax.mark + SFMono-BoldItalic - 12.0 + xcode.syntax.markup.aside.kind + SFMono-BoldItalic - 12.0 + xcode.syntax.markup.code + SFMono-Regular - 12.0 + xcode.syntax.number + SFMono-Regular - 12.0 + xcode.syntax.plain + SFMono-Regular - 12.0 + xcode.syntax.preprocessor + SFMono-Bold - 12.0 + xcode.syntax.string + SFMono-Regular - 12.0 + xcode.syntax.url + SFMono-Regular - 12.0 + + + diff --git a/editors/xcode/theme/Zacess Warm Light.xccolortheme b/editors/xcode/theme/Zacess Warm Light.xccolortheme new file mode 100644 index 0000000..a2819f5 --- /dev/null +++ b/editors/xcode/theme/Zacess Warm Light.xccolortheme @@ -0,0 +1,219 @@ + + + + + + DVTConsoleDebuggerInputTextColor + 0.203922 0.141176 0.062745 1 + DVTConsoleDebuggerInputTextFont + SFMono-Bold - 12.0 + DVTConsoleDebuggerOutputTextColor + 0.282353 0.231373 0.172549 1 + DVTConsoleDebuggerOutputTextFont + SFMono-Regular - 12.0 + DVTConsoleDebuggerPromptTextColor + 0.427451 0.231373 0.007843 1 + DVTConsoleDebuggerPromptTextFont + SFMono-Bold - 12.0 + DVTConsoleExectuableInputTextColor + 0.203922 0.141176 0.062745 1 + DVTConsoleExectuableInputTextFont + SFMono-Bold - 12.0 + DVTConsoleExectuableOutputTextColor + 0.203922 0.141176 0.062745 1 + DVTConsoleExectuableOutputTextFont + SFMono-Regular - 12.0 + DVTConsoleTextBackgroundColor + 0.956863 0.917647 0.835294 1 + DVTConsoleTextInsertionPointColor + 0.356863 0.07451 0.003922 1 + DVTConsoleTextSelectionColor + 0.627451 0.823529 0.996078 1 + DVTDebuggerInstructionPointerColor + 0.854902 0.913725 0.823529 1 + DVTFontAndColorVersion + 1 + DVTLineSpacing + 1.1 + DVTMarkupTextBackgroundColor + 0.92549 0.882353 0.792157 1 + DVTMarkupTextBorderColor + 0.494118 0.435294 0.372549 1 + DVTMarkupTextCodeFont + SFMono-Regular - 10.0 + DVTMarkupTextEmphasisColor + 0.203922 0.141176 0.062745 1 + DVTMarkupTextEmphasisFont + .AppleSystemUIFontItalic - 10.0 + DVTMarkupTextInlineCodeColor + 0.203922 0.141176 0.062745 1 + DVTMarkupTextLinkColor + 0.427451 0.231373 0.007843 1 + DVTMarkupTextLinkFont + .AppleSystemUIFont - 10.0 + DVTMarkupTextNormalColor + 0.203922 0.141176 0.062745 1 + DVTMarkupTextNormalFont + .AppleSystemUIFont - 10.0 + DVTMarkupTextOtherHeadingColor + 0.282353 0.231373 0.172549 1 + DVTMarkupTextOtherHeadingFont + .AppleSystemUIFont - 14.0 + DVTMarkupTextPrimaryHeadingColor + 0.203922 0.141176 0.062745 1 + DVTMarkupTextPrimaryHeadingFont + .AppleSystemUIFont - 24.0 + DVTMarkupTextSecondaryHeadingColor + 0.203922 0.141176 0.062745 1 + DVTMarkupTextSecondaryHeadingFont + .AppleSystemUIFont - 18.0 + DVTMarkupTextStrongColor + 0.203922 0.141176 0.062745 1 + DVTMarkupTextStrongFont + .AppleSystemUIFontBold - 10.0 + DVTScrollbarMarkerAnalyzerColor + 0.003922 0.219608 0.360784 1 + DVTScrollbarMarkerBreakpointColor + 0.427451 0.231373 0.007843 1 + DVTScrollbarMarkerDiffColor + 0.015686 0.282353 0.552941 1 + DVTScrollbarMarkerDiffConflictColor + 0.443137 0.007843 0.019608 1 + DVTScrollbarMarkerErrorColor + 0.443137 0.007843 0.019608 1 + DVTScrollbarMarkerRuntimeIssueColor + 0.513725 0.164706 0.003922 1 + DVTScrollbarMarkerWarningColor + 0.384314 0.239216 0.007843 1 + DVTSourceTextBackground + 0.956863 0.917647 0.835294 1 + DVTSourceTextBlockDimBackgroundColor + 0.894118 0.847059 0.745098 1 + DVTSourceTextCurrentLineHighlightColor + 0.815686 0.807843 0.752941 1 + DVTSourceTextInsertionPointColor + 0.356863 0.07451 0.003922 1 + DVTSourceTextInvisiblesColor + 0.509804 0.458824 0.407843 1 + DVTSourceTextSelectionColor + 0.627451 0.823529 0.996078 1 + DVTSourceTextSyntaxColors + + xcode.syntax.attribute + 0.54902 0.254902 0.019608 1 + xcode.syntax.character + 0.015686 0.321569 0.227451 1 + xcode.syntax.comment + 0.384314 0.321569 0.25098 1 + xcode.syntax.comment.doc + 0.384314 0.321569 0.25098 1 + xcode.syntax.comment.doc.keyword + 0.384314 0.321569 0.25098 1 + xcode.syntax.declaration.other + 0.454902 0.309804 0.003922 1 + xcode.syntax.declaration.type + 0.015686 0.321569 0.278431 1 + xcode.syntax.identifier.class + 0.015686 0.321569 0.278431 1 + xcode.syntax.identifier.class.system + 0.015686 0.321569 0.278431 1 + xcode.syntax.identifier.constant + 0.588235 0.168627 0.439216 1 + xcode.syntax.identifier.constant.system + 0.588235 0.168627 0.439216 1 + xcode.syntax.identifier.function + 0.454902 0.309804 0.003922 1 + xcode.syntax.identifier.function.system + 0.454902 0.309804 0.003922 1 + xcode.syntax.identifier.macro + 0.454902 0.309804 0.003922 1 + xcode.syntax.identifier.macro.system + 0.454902 0.309804 0.003922 1 + xcode.syntax.identifier.type + 0.015686 0.321569 0.278431 1 + xcode.syntax.identifier.type.system + 0.015686 0.321569 0.278431 1 + xcode.syntax.identifier.variable + 0.007843 0.192157 0.552941 1 + xcode.syntax.identifier.variable.system + 0.007843 0.192157 0.552941 1 + xcode.syntax.keyword + 0.513725 0.164706 0.003922 1 + xcode.syntax.mark + 0.462745 0.007843 0.266667 1 + xcode.syntax.markup.aside.kind + 0.513725 0.164706 0.003922 1 + xcode.syntax.markup.code + 0.203922 0.141176 0.062745 1 + xcode.syntax.number + 0.588235 0.168627 0.439216 1 + xcode.syntax.plain + 0.203922 0.141176 0.062745 1 + xcode.syntax.preprocessor + 0.462745 0.007843 0.266667 1 + xcode.syntax.string + 0.015686 0.321569 0.227451 1 + xcode.syntax.url + 0.454902 0.309804 0.003922 1 + + DVTSourceTextSyntaxFonts + + xcode.syntax.attribute + SFMono-Regular - 12.0 + xcode.syntax.character + SFMono-Regular - 12.0 + xcode.syntax.comment + SFMono-RegularItalic - 12.0 + xcode.syntax.comment.doc + SFMono-RegularItalic - 12.0 + xcode.syntax.comment.doc.keyword + SFMono-BoldItalic - 12.0 + xcode.syntax.declaration.other + SFMono-Regular - 12.0 + xcode.syntax.declaration.type + SFMono-Regular - 12.0 + xcode.syntax.identifier.class + SFMono-Regular - 12.0 + xcode.syntax.identifier.class.system + SFMono-Regular - 12.0 + xcode.syntax.identifier.constant + SFMono-Regular - 12.0 + xcode.syntax.identifier.constant.system + SFMono-Regular - 12.0 + xcode.syntax.identifier.function + SFMono-Regular - 12.0 + xcode.syntax.identifier.function.system + SFMono-Regular - 12.0 + xcode.syntax.identifier.macro + SFMono-Regular - 12.0 + xcode.syntax.identifier.macro.system + SFMono-Regular - 12.0 + xcode.syntax.identifier.type + SFMono-Regular - 12.0 + xcode.syntax.identifier.type.system + SFMono-Regular - 12.0 + xcode.syntax.identifier.variable + SFMono-Regular - 12.0 + xcode.syntax.identifier.variable.system + SFMono-Regular - 12.0 + xcode.syntax.keyword + SFMono-Bold - 12.0 + xcode.syntax.mark + SFMono-BoldItalic - 12.0 + xcode.syntax.markup.aside.kind + SFMono-BoldItalic - 12.0 + xcode.syntax.markup.code + SFMono-Regular - 12.0 + xcode.syntax.number + SFMono-Regular - 12.0 + xcode.syntax.plain + SFMono-Regular - 12.0 + xcode.syntax.preprocessor + SFMono-Bold - 12.0 + xcode.syntax.string + SFMono-Regular - 12.0 + xcode.syntax.url + SFMono-Regular - 12.0 + + + diff --git a/editors/zed/ACCESSIBILITY.md b/editors/zed/ACCESSIBILITY.md index 83452cd..d15156d 100644 --- a/editors/zed/ACCESSIBILITY.md +++ b/editors/zed/ACCESSIBILITY.md @@ -9,7 +9,7 @@ The theme puts contrast first and stays fixed on `Zacess Deep Contrast Dark` unt - The theme is `Zacess Deep Contrast Dark` from the Zacess Themes extension: white text on pure black at 21:1 with deep, fully saturated colours, every syntax colour at 9.0:1 or more. Keywords are blue (`#67aeff`, 9.1:1) and bold, comments green (`#00c600`, 9.1:1) and italic, strings orange (`#ffaa7c`, 11.3:1). The focused element gets a yellow outline and frames are cyan. - `Zacess Deep Contrast Light`, its light counterpart, is black on white with vivid colours at 7.7:1 or more. It is the `light` theme in `settings.json`, used when `theme.mode` is `light` or `system`. -- All eight Zacess themes, plus the High Contrast Themes extension's dark themes, are in the theme picker. The full measured tables are in the [Zacess Themes accessibility statement](https://github.com/zacesshq/themes/blob/main/ACCESSIBILITY.md). +- All ten Zacess themes, plus the High Contrast Themes extension's dark themes, are in the theme picker. The full measured tables are in the [Zacess Themes accessibility statement](https://github.com/zacesshq/themes/blob/main/ACCESSIBILITY.md). - Git changes in the gutter have a shape as well as a colour (a bar for added and modified lines, a triangle for a deletion) and the current line is marked across the text and the gutter. - Text in the terminal is held to about 4.5:1 on whatever sits behind it (`terminal.minimum_contrast` at APCA 60), so a program's own colour pairs can never vanish. - Interface text is 16 pixels and editor text 15 pixels. `Cmd+=` and `Cmd+-` (`Ctrl+=` and `Ctrl+-` on Windows and Linux) change the editor text for the current session. Raise `buffer_font_size` and `ui_font_size` in `settings.json` to make it permanent. diff --git a/editors/zed/README.md b/editors/zed/README.md index d7dfdef..18942a3 100644 --- a/editors/zed/README.md +++ b/editors/zed/README.md @@ -10,16 +10,17 @@ `auto_install_extensions` so Zed installs both theme extensions on its own. Identical on every platform. - [`extensions.txt`](extensions.txt) - the two theme extensions, one `id@version` per line. -- [`shared/themes/zacess.json`](shared/themes/zacess.json) - all eight Zacess themes in one Zed +- [`shared/themes/zacess.json`](shared/themes/zacess.json) - all ten Zacess themes in one Zed theme family, the file [Zacess Themes](https://github.com/zacesshq/themes) ships in - `editors/zed/themes`, copied as released. [`shared/theme-package.json`](shared/theme-package.json) - records the release it came from and the eight theme names. + `editors/zed/themes`, copied from the release that adds Warm Dark and Warm Light ahead of its + tag. [`shared/theme-package.json`](shared/theme-package.json) records the release it came from + and the ten theme names. - [`shared/apply.py`](shared/apply.py) with `mac/apply.sh`, `linux/apply.sh` and `windows/apply.ps1` - install the theme file and set the theme, see [Apply](#apply). ## In action -Zed in each of the eight Zacess themes, with the same file open. +Zed in each of the ten Zacess themes, with the same file open. | Deep Contrast Dark | Deep Contrast Light | | --- | --- | @@ -80,7 +81,7 @@ in the folder yet the script installs the theme file and says the settings are n `settings.json` lists `zacess-themes` under `auto_install_extensions`, so Zed installs the Zacess Themes extension on its own. The store still has 0.2.1, which lacks `Zacess Deep Contrast Dark` and -`Zacess Deep Contrast Light`; the theme file in `shared/themes` is the 0.5.0 release, which has +`Zacess Deep Contrast Light`; the theme file in `shared/themes` is the 1.0.0 release, which has them, so Zed shows every theme now. The script reads the installed extension's version from Zed's data folder. Once it reaches the version in `theme-package.json`, the script removes the local file instead, so the themes never load twice. @@ -88,7 +89,7 @@ instead, so the themes never load twice. ## Check it worked 1. Open the theme picker with `Cmd+K` then `Cmd+T` (`Ctrl+K` then `Ctrl+T` on Windows and Linux): - all eight Zacess theme names are listed. + all ten Zacess theme names are listed. 2. Zed shows black backgrounds with white text in `Zacess Deep Contrast Dark`, with keywords bold blue, strings orange and comments green. 3. `zt current` reports Zed as `fixed: Zacess Deep Contrast Dark`. @@ -96,7 +97,7 @@ instead, so the themes never load twice. ## Validation [`scripts/validate.py`](scripts/validate.py) runs in CI on Linux. It checks the theme file parses -and defines exactly the eight themes `theme-package.json` names, that the package points at the +and defines exactly the ten themes `theme-package.json` names, that the package points at the pinned release's file, that `settings.json` names themes from the file, that `shared/apply.py` parses and that the two shell scripts match. diff --git a/editors/zed/guides/reference.md b/editors/zed/guides/reference.md index 22f9380..aab37a9 100644 --- a/editors/zed/guides/reference.md +++ b/editors/zed/guides/reference.md @@ -26,7 +26,7 @@ file as JSON with comments and trailing commas, so a strict JSON parser rejects | Extension | Version | Why | | --- | --- | --- | | `high-contrast-themes` | `0.1.0` | Adds `High Contrast VSCode` and nine other high-contrast dark themes to the picker. Not used by default. | -| `zacess-themes` | `0.3.0` | Provides all eight Zacess themes, the two Deep Contrast themes among them. Zed's registry still serves 0.2.1, without the Deep Contrast pair, so the apply script installs the 0.5.0 theme file from `shared/themes` until the registry catches up (see the [README](../README.md#while-the-extension-store-catches-up)). | +| `zacess-themes` | `0.3.0` | Provides all ten Zacess themes, the two Deep Contrast themes among them. Zed's registry still serves 0.2.1, without the Deep Contrast pair, so the apply script installs the 0.5.0 theme file from `shared/themes` until the registry catches up (see the [README](../README.md#while-the-extension-store-catches-up)). | Zed also installs the `html` extension on its own through its default `auto_install_extensions` setting, which Zed merges with the two entries here, so it is not listed. diff --git a/editors/zed/guides/setup.md b/editors/zed/guides/setup.md index 427d4d4..a047437 100644 --- a/editors/zed/guides/setup.md +++ b/editors/zed/guides/setup.md @@ -65,7 +65,7 @@ Each bootstrap's apps stage runs this step for you. The Mac bootstrap's configs 1. Zed should show black backgrounds with white text (`Zacess Deep Contrast Dark`), in light and dark mode alike. 2. Open the theme picker with `Cmd+K` then `Cmd+T` (`Ctrl+K` then `Ctrl+T` on Windows and Linux) - to confirm all eight Zacess theme names exist. + to confirm all ten Zacess theme names exist. 3. To follow the system instead, set `theme.mode` to `system`. Picking a theme in the picker writes it into `settings.json`, so it stays until changed again. diff --git a/editors/zed/linux/apply.sh b/editors/zed/linux/apply.sh index db04dd7..ec38bcf 100755 --- a/editors/zed/linux/apply.sh +++ b/editors/zed/linux/apply.sh @@ -4,8 +4,9 @@ # (the config folder defaults to ~/.config/zed or $XDG_CONFIG_HOME/zed when that is set; Linux also checks the # Flatpak's copy) # -# --theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# --theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # the work is done by ../shared/apply.py with the system python3. it reuses shell/scripts/zt.py diff --git a/editors/zed/mac/apply.sh b/editors/zed/mac/apply.sh index db04dd7..ec38bcf 100755 --- a/editors/zed/mac/apply.sh +++ b/editors/zed/mac/apply.sh @@ -4,8 +4,9 @@ # (the config folder defaults to ~/.config/zed or $XDG_CONFIG_HOME/zed when that is set; Linux also checks the # Flatpak's copy) # -# --theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# --theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # the work is done by ../shared/apply.py with the system python3. it reuses shell/scripts/zt.py diff --git a/editors/zed/scripts/validate.py b/editors/zed/scripts/validate.py index 02335ca..4b2b40b 100644 --- a/editors/zed/scripts/validate.py +++ b/editors/zed/scripts/validate.py @@ -1,6 +1,6 @@ """Checks the Zed folder without Zed: run from anywhere, exits non-zero on a problem. -- shared/themes/*.json parse and together define exactly the eight themes theme-package.json names +- shared/themes/*.json parse and together define exactly the ten themes theme-package.json names - theme-package.json pins a version and points at that version's file in the Zacess Themes repository - settings.json names a theme from the theme file for both halves of the pair - shared/apply.py parses as Python and mac/apply.sh and linux/apply.sh are the same file @@ -29,8 +29,8 @@ defined.append(theme.get("name")) if sorted(defined) != sorted(package["themes"]): problems.append(f"shared/themes: the files define {sorted(defined)}, theme-package.json names {sorted(package['themes'])}") -if len(package["themes"]) != 8: - problems.append("theme-package.json: expected the eight Zacess themes") +if len(package["themes"]) != 10: + problems.append("theme-package.json: expected the ten Zacess themes") if not re.fullmatch(r"\d+\.\d+\.\d+", package["version"]): problems.append("theme-package.json: version is not x.y.z") expected = f"/themes/blob/v{package['version']}/editors/zed/themes/{package['file']}" diff --git a/editors/zed/shared/apply.py b/editors/zed/shared/apply.py index 4d1c95b..ceb494a 100644 --- a/editors/zed/shared/apply.py +++ b/editors/zed/shared/apply.py @@ -45,7 +45,7 @@ theme = zt.find_theme(options.get("--theme", "deep-dark")) if theme is None: sys.exit(f"Unknown theme: {options['--theme']}\n" - "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow.") + "Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light.") if "--config-dir" in options: config = Path(options["--config-dir"]).expanduser() diff --git a/editors/zed/shared/theme-package.json b/editors/zed/shared/theme-package.json index b32622f..a3fc94f 100644 --- a/editors/zed/shared/theme-package.json +++ b/editors/zed/shared/theme-package.json @@ -1,7 +1,7 @@ { "name": "zacess-themes", - "version": "0.12.0", - "source": "https://github.com/zacesshq/themes/blob/v0.12.0/editors/zed/themes/zacess.json", + "version": "1.0.0", + "source": "https://github.com/zacesshq/themes/blob/v1.0.0/editors/zed/themes/zacess.json", "file": "zacess.json", "themes": [ "Zacess Deep Contrast Dark", @@ -11,6 +11,8 @@ "Zacess Dark", "Zacess Light", "Zacess Cream", - "Zacess Yellow on Black" + "Zacess Yellow on Black", + "Zacess Warm Dark", + "Zacess Warm Light" ] } diff --git a/editors/zed/shared/themes/zacess.json b/editors/zed/shared/themes/zacess.json index 1989a40..d04deba 100644 --- a/editors/zed/shared/themes/zacess.json +++ b/editors/zed/shared/themes/zacess.json @@ -79,9 +79,9 @@ "terminal.bright_foreground": "#111111", "terminal.dim_foreground": "#424242", "link_text.hover": "#0049a3", - "conflict": "#583600", + "conflict": "#843800", "conflict.background": "#f4f4f4", - "conflict.border": "#583600", + "conflict.border": "#843800", "created": "#005b14", "created.background": "#e3f5e6", "created.border": "#005b14", @@ -118,9 +118,9 @@ "unreachable": "#424242", "unreachable.background": "#f4f4f4", "unreachable.border": "#707070", - "warning": "#583600", + "warning": "#843800", "warning.background": "#f4f4f4", - "warning.border": "#583600", + "warning.border": "#843800", "players": [ { "cursor": "#111111", @@ -419,9 +419,9 @@ "terminal.bright_foreground": "#f5f5f5", "terminal.dim_foreground": "#c8c8c8", "link_text.hover": "#8cbcff", - "conflict": "#ffd182", + "conflict": "#edc071", "conflict.background": "#1a1a1a", - "conflict.border": "#ffd182", + "conflict.border": "#edc071", "created": "#01ea45", "created.background": "#0f2a17", "created.border": "#01ea45", @@ -458,9 +458,9 @@ "unreachable": "#c8c8c8", "unreachable.background": "#1a1a1a", "unreachable.border": "#7a7a7a", - "warning": "#ffd182", + "warning": "#edc071", "warning.background": "#1a1a1a", - "warning.border": "#ffd182", + "warning.border": "#edc071", "players": [ { "cursor": "#ffd400", @@ -1099,9 +1099,9 @@ "terminal.bright_foreground": "#000000", "terminal.dim_foreground": "#3f382c", "link_text.hover": "#004498", - "conflict": "#513100", + "conflict": "#803200", "conflict.background": "#f2efe9", - "conflict.border": "#513100", + "conflict.border": "#803200", "created": "#005512", "created.background": "#e4f1d8", "created.border": "#005512", @@ -1138,9 +1138,9 @@ "unreachable": "#3f382c", "unreachable.background": "#f2efe9", "unreachable.border": "#6e6555", - "warning": "#513100", + "warning": "#803200", "warning.background": "#f2efe9", - "warning.border": "#513100", + "warning.border": "#803200", "players": [ { "cursor": "#000000", @@ -1779,9 +1779,9 @@ "terminal.bright_foreground": "#000000", "terminal.dim_foreground": "#2e2e2e", "link_text.hover": "#003d99", - "conflict": "#5a3a00", + "conflict": "#4e1c00", "conflict.background": "#f7f7f7", - "conflict.border": "#5a3a00", + "conflict.border": "#4e1c00", "created": "#005518", "created.background": "#e0f5e3", "created.border": "#005518", @@ -1818,9 +1818,9 @@ "unreachable": "#2e2e2e", "unreachable.background": "#f7f7f7", "unreachable.border": "#262626", - "warning": "#5a3a00", + "warning": "#4e1c00", "warning.background": "#f7f7f7", - "warning.border": "#5a3a00", + "warning.border": "#4e1c00", "players": [ { "cursor": "#000000", @@ -2459,9 +2459,9 @@ "terminal.bright_foreground": "#000000", "terminal.dim_foreground": "#4d4d4d", "link_text.hover": "#003df6", - "conflict": "#674100", + "conflict": "#642600", "conflict.background": "#ffffff", - "conflict.border": "#674100", + "conflict.border": "#642600", "created": "#006108", "created.background": "#eefaee", "created.border": "#006108", @@ -2498,9 +2498,9 @@ "unreachable": "#4d4d4d", "unreachable.background": "#ffffff", "unreachable.border": "#0f4a85", - "warning": "#674100", + "warning": "#642600", "warning.background": "#ffffff", - "warning.border": "#674100", + "warning.border": "#642600", "players": [ { "cursor": "#000000", @@ -2722,6 +2722,686 @@ "terminal.ansi.bright_cyan": "#0178c1", "terminal.ansi.bright_white": "#000000" } + }, + { + "name": "Zacess Warm Dark", + "appearance": "dark", + "style": { + "background": "#1a1512", + "border": "#988c7e", + "border.variant": "#988c7e", + "border.focused": "#e9b56a", + "border.selected": "#e9b56a", + "border.transparent": "#1a151200", + "border.disabled": "#988c7e", + "elevated_surface.background": "#1a1512", + "surface.background": "#1a1512", + "element.background": "#2c241f", + "element.hover": "#36322d", + "element.active": "#3f3328", + "element.selected": "#3f3328", + "element.disabled": "#1a1512", + "drop_target.background": "#3f3328", + "ghost_element.background": "#1a151200", + "ghost_element.hover": "#36322d", + "ghost_element.active": "#3f3328", + "ghost_element.selected": "#3f3328", + "ghost_element.disabled": "#1a151200", + "text": "#e5d5b6", + "text.muted": "#cabca9", + "text.placeholder": "#cabca9", + "text.disabled": "#cabca9", + "text.accent": "#e9b56a", + "icon": "#e5d5b6", + "icon.muted": "#cabca9", + "icon.disabled": "#cabca9", + "icon.placeholder": "#cabca9", + "icon.accent": "#e9b56a", + "status_bar.background": "#2c241f", + "title_bar.background": "#2c241f", + "title_bar.inactive_background": "#1a1512", + "toolbar.background": "#211b17", + "tab_bar.background": "#1a1512", + "tab.inactive_background": "#1a1512", + "tab.active_background": "#211b17", + "search.match_background": "#5f3e02", + "panel.background": "#1a1512", + "panel.focused_border": "#e9b56a", + "pane.focused_border": "#e9b56a", + "scrollbar.thumb.background": "#7d736880", + "scrollbar.thumb.hover_background": "#7d7368", + "scrollbar.thumb.border": "#7d7368", + "scrollbar.track.background": "#211b1700", + "scrollbar.track.border": "#211b1700", + "editor.foreground": "#e5d5b6", + "editor.background": "#211b17", + "editor.gutter.background": "#211b17", + "editor.subheader.background": "#1a1512", + "editor.active_line.background": "#36322d", + "editor.highlighted_line.background": "#36322d", + "editor.line_number": "#bbafa0", + "editor.active_line_number": "#e5d5b6", + "editor.invisible": "#857c71", + "editor.wrap_guide": "#7d7368", + "editor.active_wrap_guide": "#988c7e", + "editor.indent_guide": "#7d7368", + "editor.indent_guide_active": "#e5d5b6", + "editor.document_highlight.read_background": "#3f3328", + "editor.document_highlight.write_background": "#3f3328", + "editor.document_highlight.bracket_background": "#3f3328", + "version_control.added": "#94be7d", + "version_control.modified": "#b6dbfc", + "version_control.deleted": "#ffb1aa", + "version_control.conflict_marker.ours": "#1d2a16", + "version_control.conflict_marker.theirs": "#39201d", + "terminal.background": "#211b17", + "terminal.foreground": "#e5d5b6", + "terminal.bright_foreground": "#e5d5b6", + "terminal.dim_foreground": "#cabca9", + "link_text.hover": "#e9b56a", + "conflict": "#fac97c", + "conflict.background": "#1a1512", + "conflict.border": "#fac97c", + "created": "#94be7d", + "created.background": "#1d2a16", + "created.border": "#94be7d", + "deleted": "#ffb1aa", + "deleted.background": "#39201d", + "deleted.border": "#ffb1aa", + "error": "#fca8a1", + "error.background": "#1a1512", + "error.border": "#fca8a1", + "hidden": "#cabca9", + "hidden.background": "#1a1512", + "hidden.border": "#988c7e", + "hint": "#cabca9", + "hint.background": "#1a1512", + "hint.border": "#988c7e", + "ignored": "#cabca9", + "ignored.background": "#1a1512", + "ignored.border": "#988c7e", + "info": "#aad3f1", + "info.background": "#1a1512", + "info.border": "#aad3f1", + "modified": "#b6dbfc", + "modified.background": "#3f3328", + "modified.border": "#b6dbfc", + "predictive": "#cabca9", + "predictive.background": "#1a1512", + "predictive.border": "#988c7e", + "renamed": "#b6dbfc", + "renamed.background": "#1a1512", + "renamed.border": "#b6dbfc", + "success": "#94be7d", + "success.background": "#1a1512", + "success.border": "#94be7d", + "unreachable": "#cabca9", + "unreachable.background": "#1a1512", + "unreachable.border": "#988c7e", + "warning": "#fac97c", + "warning.background": "#1a1512", + "warning.border": "#fac97c", + "players": [ + { + "cursor": "#fec9a7", + "background": "#fec9a7", + "selection": "#2c465c" + } + ], + "syntax": { + "attribute": { + "color": "#ffce9f", + "font_style": null, + "font_weight": null + }, + "boolean": { + "color": "#ecb4d8", + "font_style": null, + "font_weight": null + }, + "comment": { + "color": "#beb19e", + "font_style": "italic", + "font_weight": null + }, + "comment.doc": { + "color": "#beb19e", + "font_style": "italic", + "font_weight": null + }, + "constant": { + "color": "#ecb4d8", + "font_style": null, + "font_weight": null + }, + "constructor": { + "color": "#71c0b6", + "font_style": null, + "font_weight": null + }, + "embedded": { + "color": "#e5d5b6", + "font_style": null, + "font_weight": null + }, + "emphasis": { + "color": "#e5d5b6", + "font_style": "italic", + "font_weight": null + }, + "emphasis.strong": { + "color": "#e5d5b6", + "font_style": null, + "font_weight": 700 + }, + "enum": { + "color": "#71c0b6", + "font_style": null, + "font_weight": null + }, + "function": { + "color": "#ffe8a1", + "font_style": null, + "font_weight": null + }, + "hint": { + "color": "#cabca9", + "font_style": "italic", + "font_weight": null + }, + "keyword": { + "color": "#f69d74", + "font_style": null, + "font_weight": 700 + }, + "label": { + "color": "#ffafc0", + "font_style": null, + "font_weight": 700 + }, + "link_text": { + "color": "#e9b56a", + "font_style": null, + "font_weight": null + }, + "link_uri": { + "color": "#e9b56a", + "font_style": null, + "font_weight": null + }, + "number": { + "color": "#ecb4d8", + "font_style": null, + "font_weight": null + }, + "operator": { + "color": "#e5d5b6", + "font_style": null, + "font_weight": null + }, + "predictive": { + "color": "#cabca9", + "font_style": "italic", + "font_weight": null + }, + "preproc": { + "color": "#f69d74", + "font_style": null, + "font_weight": 700 + }, + "primary": { + "color": "#e5d5b6", + "font_style": null, + "font_weight": null + }, + "property": { + "color": "#a4c9e9", + "font_style": null, + "font_weight": null + }, + "punctuation": { + "color": "#e5d5b6", + "font_style": null, + "font_weight": null + }, + "punctuation.bracket": { + "color": "#e5d5b6", + "font_style": null, + "font_weight": null + }, + "punctuation.delimiter": { + "color": "#e5d5b6", + "font_style": null, + "font_weight": null + }, + "punctuation.list_marker": { + "color": "#e5d5b6", + "font_style": null, + "font_weight": null + }, + "punctuation.special": { + "color": "#e5d5b6", + "font_style": null, + "font_weight": null + }, + "string": { + "color": "#abba6f", + "font_style": null, + "font_weight": null + }, + "string.escape": { + "color": "#a6e3cd", + "font_style": null, + "font_weight": null + }, + "string.regex": { + "color": "#a6e3cd", + "font_style": null, + "font_weight": null + }, + "string.special": { + "color": "#a6e3cd", + "font_style": null, + "font_weight": null + }, + "string.special.symbol": { + "color": "#ecb4d8", + "font_style": null, + "font_weight": null + }, + "tag": { + "color": "#f89b7b", + "font_style": null, + "font_weight": 700 + }, + "text.literal": { + "color": "#abba6f", + "font_style": null, + "font_weight": null + }, + "title": { + "color": "#f69d74", + "font_style": null, + "font_weight": 700 + }, + "type": { + "color": "#71c0b6", + "font_style": null, + "font_weight": null + }, + "variable": { + "color": "#e5d5b6", + "font_style": null, + "font_weight": null + }, + "variable.special": { + "color": "#f69d74", + "font_style": null, + "font_weight": 700 + }, + "variant": { + "color": "#71c0b6", + "font_style": null, + "font_weight": null + } + }, + "terminal.ansi.black": "#ada398", + "terminal.ansi.red": "#fc9a8d", + "terminal.ansi.green": "#a2be6f", + "terminal.ansi.yellow": "#e4b35b", + "terminal.ansi.blue": "#88b9e3", + "terminal.ansi.magenta": "#dfa1ca", + "terminal.ansi.cyan": "#73c2b8", + "terminal.ansi.white": "#cbc1b1", + "terminal.ansi.bright_black": "#b9b1a9", + "terminal.ansi.bright_red": "#fee4e0", + "terminal.ansi.bright_green": "#d9f2b0", + "terminal.ansi.bright_yellow": "#ffe9b6", + "terminal.ansi.bright_blue": "#d7ecff", + "terminal.ansi.bright_magenta": "#ffe1f4", + "terminal.ansi.bright_cyan": "#b1f7ed", + "terminal.ansi.bright_white": "#fbf1dc" + } + }, + { + "name": "Zacess Warm Light", + "appearance": "light", + "style": { + "background": "#ece1ca", + "border": "#7e6f5f", + "border.variant": "#7e6f5f", + "border.focused": "#6d3b02", + "border.selected": "#6d3b02", + "border.transparent": "#ece1ca00", + "border.disabled": "#7e6f5f", + "elevated_surface.background": "#ece1ca", + "surface.background": "#ece1ca", + "element.background": "#e4d8be", + "element.hover": "#d0cec0", + "element.active": "#e7d6b3", + "element.selected": "#e7d6b3", + "element.disabled": "#ece1ca", + "drop_target.background": "#e7d6b3", + "ghost_element.background": "#ece1ca00", + "ghost_element.hover": "#d0cec0", + "ghost_element.active": "#e7d6b3", + "ghost_element.selected": "#e7d6b3", + "ghost_element.disabled": "#ece1ca00", + "text": "#342410", + "text.muted": "#483b2c", + "text.placeholder": "#483b2c", + "text.disabled": "#483b2c", + "text.accent": "#6d3b02", + "icon": "#342410", + "icon.muted": "#483b2c", + "icon.disabled": "#483b2c", + "icon.placeholder": "#483b2c", + "icon.accent": "#6d3b02", + "status_bar.background": "#e4d8be", + "title_bar.background": "#e4d8be", + "title_bar.inactive_background": "#ece1ca", + "toolbar.background": "#f4ead5", + "tab_bar.background": "#ece1ca", + "tab.inactive_background": "#ece1ca", + "tab.active_background": "#f4ead5", + "search.match_background": "#fdc436", + "panel.background": "#ece1ca", + "panel.focused_border": "#6d3b02", + "pane.focused_border": "#6d3b02", + "scrollbar.thumb.background": "#8a7e7180", + "scrollbar.thumb.hover_background": "#8a7e71", + "scrollbar.thumb.border": "#8a7e71", + "scrollbar.track.background": "#f4ead500", + "scrollbar.track.border": "#f4ead500", + "editor.foreground": "#342410", + "editor.background": "#f4ead5", + "editor.gutter.background": "#f4ead5", + "editor.subheader.background": "#ece1ca", + "editor.active_line.background": "#d0cec0", + "editor.highlighted_line.background": "#d0cec0", + "editor.line_number": "#514639", + "editor.active_line_number": "#342410", + "editor.invisible": "#827568", + "editor.wrap_guide": "#8a7e71", + "editor.active_wrap_guide": "#7e6f5f", + "editor.indent_guide": "#8a7e71", + "editor.indent_guide_active": "#342410", + "editor.document_highlight.read_background": "#e7d6b3", + "editor.document_highlight.write_background": "#e7d6b3", + "editor.document_highlight.bracket_background": "#e7d6b3", + "version_control.added": "#08651b", + "version_control.modified": "#04488d", + "version_control.deleted": "#790411", + "version_control.conflict_marker.ours": "#dae9d2", + "version_control.conflict_marker.theirs": "#fdddda", + "terminal.background": "#f4ead5", + "terminal.foreground": "#342410", + "terminal.bright_foreground": "#342410", + "terminal.dim_foreground": "#483b2c", + "link_text.hover": "#6d3b02", + "conflict": "#623d02", + "conflict.background": "#ece1ca", + "conflict.border": "#623d02", + "created": "#08651b", + "created.background": "#dae9d2", + "created.border": "#08651b", + "deleted": "#790411", + "deleted.background": "#fdddda", + "deleted.border": "#790411", + "error": "#710205", + "error.background": "#ece1ca", + "error.border": "#710205", + "hidden": "#483b2c", + "hidden.background": "#ece1ca", + "hidden.border": "#7e6f5f", + "hint": "#483b2c", + "hint.background": "#ece1ca", + "hint.border": "#7e6f5f", + "ignored": "#483b2c", + "ignored.background": "#ece1ca", + "ignored.border": "#7e6f5f", + "info": "#01385c", + "info.background": "#ece1ca", + "info.border": "#01385c", + "modified": "#04488d", + "modified.background": "#e7d6b3", + "modified.border": "#04488d", + "predictive": "#483b2c", + "predictive.background": "#ece1ca", + "predictive.border": "#7e6f5f", + "renamed": "#04488d", + "renamed.background": "#ece1ca", + "renamed.border": "#04488d", + "success": "#08651b", + "success.background": "#ece1ca", + "success.border": "#08651b", + "unreachable": "#483b2c", + "unreachable.background": "#ece1ca", + "unreachable.border": "#7e6f5f", + "warning": "#623d02", + "warning.background": "#ece1ca", + "warning.border": "#623d02", + "players": [ + { + "cursor": "#5b1301", + "background": "#5b1301", + "selection": "#a0d2fe" + } + ], + "syntax": { + "attribute": { + "color": "#8c4105", + "font_style": null, + "font_weight": null + }, + "boolean": { + "color": "#962b70", + "font_style": null, + "font_weight": null + }, + "comment": { + "color": "#625240", + "font_style": "italic", + "font_weight": null + }, + "comment.doc": { + "color": "#625240", + "font_style": "italic", + "font_weight": null + }, + "constant": { + "color": "#962b70", + "font_style": null, + "font_weight": null + }, + "constructor": { + "color": "#045247", + "font_style": null, + "font_weight": null + }, + "embedded": { + "color": "#342410", + "font_style": null, + "font_weight": null + }, + "emphasis": { + "color": "#342410", + "font_style": "italic", + "font_weight": null + }, + "emphasis.strong": { + "color": "#342410", + "font_style": null, + "font_weight": 700 + }, + "enum": { + "color": "#045247", + "font_style": null, + "font_weight": null + }, + "function": { + "color": "#744f01", + "font_style": null, + "font_weight": null + }, + "hint": { + "color": "#483b2c", + "font_style": "italic", + "font_weight": null + }, + "keyword": { + "color": "#832a01", + "font_style": null, + "font_weight": 700 + }, + "label": { + "color": "#760244", + "font_style": null, + "font_weight": 700 + }, + "link_text": { + "color": "#6d3b02", + "font_style": null, + "font_weight": null + }, + "link_uri": { + "color": "#6d3b02", + "font_style": null, + "font_weight": null + }, + "number": { + "color": "#962b70", + "font_style": null, + "font_weight": null + }, + "operator": { + "color": "#342410", + "font_style": null, + "font_weight": null + }, + "predictive": { + "color": "#483b2c", + "font_style": "italic", + "font_weight": null + }, + "preproc": { + "color": "#832a01", + "font_style": null, + "font_weight": 700 + }, + "primary": { + "color": "#342410", + "font_style": null, + "font_weight": null + }, + "property": { + "color": "#02318d", + "font_style": null, + "font_weight": null + }, + "punctuation": { + "color": "#342410", + "font_style": null, + "font_weight": null + }, + "punctuation.bracket": { + "color": "#342410", + "font_style": null, + "font_weight": null + }, + "punctuation.delimiter": { + "color": "#342410", + "font_style": null, + "font_weight": null + }, + "punctuation.list_marker": { + "color": "#342410", + "font_style": null, + "font_weight": null + }, + "punctuation.special": { + "color": "#342410", + "font_style": null, + "font_weight": null + }, + "string": { + "color": "#04523a", + "font_style": null, + "font_weight": null + }, + "string.escape": { + "color": "#064045", + "font_style": null, + "font_weight": null + }, + "string.regex": { + "color": "#064045", + "font_style": null, + "font_weight": null + }, + "string.special": { + "color": "#064045", + "font_style": null, + "font_weight": null + }, + "string.special.symbol": { + "color": "#962b70", + "font_style": null, + "font_weight": null + }, + "tag": { + "color": "#930e04", + "font_style": null, + "font_weight": 700 + }, + "text.literal": { + "color": "#04523a", + "font_style": null, + "font_weight": null + }, + "title": { + "color": "#832a01", + "font_style": null, + "font_weight": 700 + }, + "type": { + "color": "#045247", + "font_style": null, + "font_weight": null + }, + "variable": { + "color": "#342410", + "font_style": null, + "font_weight": null + }, + "variable.special": { + "color": "#832a01", + "font_style": null, + "font_weight": 700 + }, + "variant": { + "color": "#045247", + "font_style": null, + "font_weight": null + } + }, + "terminal.ansi.black": "#342410", + "terminal.ansi.red": "#8c1a16", + "terminal.ansi.green": "#275200", + "terminal.ansi.yellow": "#6a4603", + "terminal.ansi.blue": "#014b79", + "terminal.ansi.magenta": "#742c60", + "terminal.ansi.cyan": "#05514d", + "terminal.ansi.white": "#574e44", + "terminal.ansi.bright_black": "#60574c", + "terminal.ansi.bright_red": "#a4332b", + "terminal.ansi.bright_green": "#386616", + "terminal.ansi.bright_yellow": "#845701", + "terminal.ansi.bright_blue": "#115f93", + "terminal.ansi.bright_magenta": "#8a4074", + "terminal.ansi.bright_cyan": "#066662", + "terminal.ansi.bright_white": "#342410" + } } ] } diff --git a/editors/zed/windows/apply.ps1 b/editors/zed/windows/apply.ps1 index 4b2524a..bfb4988 100644 --- a/editors/zed/windows/apply.ps1 +++ b/editors/zed/windows/apply.ps1 @@ -5,8 +5,9 @@ # -ThemesOnly refreshes the theme file and leaves settings.json alone. zt uses it, since zt writes # the theme block itself and can also set it to follow the system. # -# -Theme picks one of the eight Zacess themes by short name (deep-dark, deep-light, hc-dark, -# hc-light, dark, light, cream, yellow), id (deep-contrast-dark) or full name. the default is +# -Theme picks one of the ten Zacess themes by short name (deep-dark, deep-light, hc-dark, +# hc-light, dark, light, cream, yellow, warm-dark, warm-light), +# id (deep-contrast-dark) or full name. the default is # deep-dark. # # the theme file is the one Zacess Themes ships for Zed, kept in ..\shared\themes while the @@ -35,12 +36,14 @@ $themes = @( @{ Id = 'light'; Short = 'light'; Name = 'Zacess Light'; Dark = $false } @{ Id = 'cream'; Short = 'cream'; Name = 'Zacess Cream'; Dark = $false } @{ Id = 'yellow-on-black'; Short = 'yellow'; Name = 'Zacess Yellow on Black'; Dark = $true } + @{ Id = 'warm-dark'; Short = 'warm-dark'; Name = 'Zacess Warm Dark'; Dark = $true } + @{ Id = 'warm-light'; Short = 'warm-light'; Name = 'Zacess Warm Light'; Dark = $false } ) $key = ($Theme.Trim().ToLowerInvariant() -replace ' ', '-') -replace '^zacess-', '' $wanted = $themes | Where-Object { $_.Id -eq $key -or $_.Short -eq $key } | Select-Object -First 1 if (-not $wanted) { [Console]::Error.WriteLine("Unknown theme: $Theme") - [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream or yellow.') + [Console]::Error.WriteLine('Pick one of deep-dark, deep-light, hc-dark, hc-light, dark, light, cream, yellow, warm-dark or warm-light.') exit 1 } diff --git a/git/git-hooks/README.md b/git/git-hooks/README.md index 659a45a..7018d63 100644 --- a/git/git-hooks/README.md +++ b/git/git-hooks/README.md @@ -13,7 +13,8 @@ settings, not something each tool has to opt into separately. ## In action -Screenshots in four Zacess themes, Deep Contrast Dark and Light, Yellow on Black and Cream, +Screenshots in six Zacess themes, Deep Contrast Dark and Light, Yellow on Black, Cream, Warm Dark +and Warm Light, recorded in a demo project. Each one links to a short animation of the same scene. ### A blocked commit @@ -26,9 +27,13 @@ recorded in a demo project. Each one links to a short animation of the same scen | --- | --- | | [![Yellow on Black: a commit stopped by the pre-commit hook because the staged file contains AWS's example access key ID](docs/demo/git-hooks-yellow-on-black.webp)](docs/demo/git-hooks-yellow-on-black.gif) | [![Cream: a commit stopped by the pre-commit hook because the staged file contains AWS's example access key ID](docs/demo/git-hooks-cream.webp)](docs/demo/git-hooks-cream.gif) | +| Warm Dark | Warm Light | +| --- | --- | +| [![Warm Dark: a commit stopped by the pre-commit hook because the staged file contains AWS's example access key ID](docs/demo/git-hooks-warm-dark.webp)](docs/demo/git-hooks-warm-dark.gif) | [![Warm Light: a commit stopped by the pre-commit hook because the staged file contains AWS's example access key ID](docs/demo/git-hooks-warm-light.webp)](docs/demo/git-hooks-warm-light.gif) | + The shots show the real config in a throwaway demo project, in -[Zacess Themes](https://github.com/zacesshq/themes) Deep Contrast Dark and Light, Yellow on Black -and Cream. +[Zacess Themes](https://github.com/zacesshq/themes) Deep Contrast Dark and Light, Yellow on Black, +Cream, Warm Dark and Warm Light. ## What's here diff --git a/git/git-hooks/docs/demo/git-hooks-cream.gif b/git/git-hooks/docs/demo/git-hooks-cream.gif index a9f7c67..f79c4c7 100644 Binary files a/git/git-hooks/docs/demo/git-hooks-cream.gif and b/git/git-hooks/docs/demo/git-hooks-cream.gif differ diff --git a/git/git-hooks/docs/demo/git-hooks-cream.webp b/git/git-hooks/docs/demo/git-hooks-cream.webp index 3d5b1c0..0486a5c 100644 Binary files a/git/git-hooks/docs/demo/git-hooks-cream.webp and b/git/git-hooks/docs/demo/git-hooks-cream.webp differ diff --git a/git/git-hooks/docs/demo/git-hooks-dark.gif b/git/git-hooks/docs/demo/git-hooks-dark.gif index c9290a1..9fc321f 100644 Binary files a/git/git-hooks/docs/demo/git-hooks-dark.gif and b/git/git-hooks/docs/demo/git-hooks-dark.gif differ diff --git a/git/git-hooks/docs/demo/git-hooks-dark.webp b/git/git-hooks/docs/demo/git-hooks-dark.webp index fd05a99..a9b829b 100644 Binary files a/git/git-hooks/docs/demo/git-hooks-dark.webp and b/git/git-hooks/docs/demo/git-hooks-dark.webp differ diff --git a/git/git-hooks/docs/demo/git-hooks-light.gif b/git/git-hooks/docs/demo/git-hooks-light.gif index ce3f3b1..a8850ab 100644 Binary files a/git/git-hooks/docs/demo/git-hooks-light.gif and b/git/git-hooks/docs/demo/git-hooks-light.gif differ diff --git a/git/git-hooks/docs/demo/git-hooks-light.webp b/git/git-hooks/docs/demo/git-hooks-light.webp index 10be95d..0ee72ab 100644 Binary files a/git/git-hooks/docs/demo/git-hooks-light.webp and b/git/git-hooks/docs/demo/git-hooks-light.webp differ diff --git a/git/git-hooks/docs/demo/git-hooks-warm-dark.gif b/git/git-hooks/docs/demo/git-hooks-warm-dark.gif new file mode 100644 index 0000000..09ab9a6 Binary files /dev/null and b/git/git-hooks/docs/demo/git-hooks-warm-dark.gif differ diff --git a/git/git-hooks/docs/demo/git-hooks-warm-dark.webp b/git/git-hooks/docs/demo/git-hooks-warm-dark.webp new file mode 100644 index 0000000..feab4ba Binary files /dev/null and b/git/git-hooks/docs/demo/git-hooks-warm-dark.webp differ diff --git a/git/git-hooks/docs/demo/git-hooks-warm-light.gif b/git/git-hooks/docs/demo/git-hooks-warm-light.gif new file mode 100644 index 0000000..116932e Binary files /dev/null and b/git/git-hooks/docs/demo/git-hooks-warm-light.gif differ diff --git a/git/git-hooks/docs/demo/git-hooks-warm-light.webp b/git/git-hooks/docs/demo/git-hooks-warm-light.webp new file mode 100644 index 0000000..5b049f9 Binary files /dev/null and b/git/git-hooks/docs/demo/git-hooks-warm-light.webp differ diff --git a/git/git-hooks/docs/demo/git-hooks-yellow-on-black.gif b/git/git-hooks/docs/demo/git-hooks-yellow-on-black.gif index d0ff5f8..793221b 100644 Binary files a/git/git-hooks/docs/demo/git-hooks-yellow-on-black.gif and b/git/git-hooks/docs/demo/git-hooks-yellow-on-black.gif differ diff --git a/git/git-hooks/docs/demo/git-hooks-yellow-on-black.webp b/git/git-hooks/docs/demo/git-hooks-yellow-on-black.webp index 99e86d4..e69a690 100644 Binary files a/git/git-hooks/docs/demo/git-hooks-yellow-on-black.webp and b/git/git-hooks/docs/demo/git-hooks-yellow-on-black.webp differ diff --git a/setup/linux-bootstrap/ACCESSIBILITY.md b/setup/linux-bootstrap/ACCESSIBILITY.md index f3c7bdd..dbe9f1d 100644 --- a/setup/linux-bootstrap/ACCESSIBILITY.md +++ b/setup/linux-bootstrap/ACCESSIBILITY.md @@ -2,7 +2,7 @@ This bootstrap sets up a whole Ubuntu machine, so it decides how much of the system a person has to find and fix by hand afterwards. It keeps runs predictable and readable. The `configs` extra can -also bring the eight Zacess terminal palettes, with Zacess Deep Contrast Dark as the one to pick. +also bring the ten Zacess terminal palettes, with Zacess Deep Contrast Dark as the one to pick. > [!NOTE] > Some of these settings are preferences rather than requirements. Change them freely in your own @@ -27,7 +27,7 @@ also bring the eight Zacess terminal palettes, with Zacess Deep Contrast Dark as ## On a desktop - The `configs` extra applies GNOME settings from - [defaults](../defaults) and links the eight Zacess palettes + [defaults](../defaults) and links the ten Zacess palettes from [terminal](../../terminal/terminal) for Ptyxis, the terminal in Ubuntu 25.10 and later. Pick Zacess Deep Contrast Dark once under Preferences > Profile > Palette: white on pure black with deep, fully saturated colours at 7:1 or more. diff --git a/setup/linux-bootstrap/README.md b/setup/linux-bootstrap/README.md index bc66da5..00de8a0 100644 --- a/setup/linux-bootstrap/README.md +++ b/setup/linux-bootstrap/README.md @@ -77,7 +77,7 @@ folders of the dotfiles repository, each written to be forked and adapted: | [ssh](../../git/ssh) | A starting `~/.ssh/config` | | [cli-tools](../../terminal/cli-tools) | ripgrep, fzf and lazygit defaults | | [vscode](../../editors/vscode) | VS Code settings and keybindings (desktops) | -| [terminal](../../terminal/terminal) | The eight Zacess palettes for the Ptyxis terminal (desktops) | +| [terminal](../../terminal/terminal) | The ten Zacess palettes for the Ptyxis terminal (desktops) | | [defaults](../defaults) | GNOME desktop preferences (desktops) | ```bash diff --git a/setup/linux-bootstrap/bootstrap/lib/optional.sh b/setup/linux-bootstrap/bootstrap/lib/optional.sh index c235eb6..e280e10 100644 --- a/setup/linux-bootstrap/bootstrap/lib/optional.sh +++ b/setup/linux-bootstrap/bootstrap/lib/optional.sh @@ -293,6 +293,8 @@ readonly DESKTOP_CONFIG_LINKS=( "terminal/terminal|linux/ptyxis/zacess-light.palette|${HOME}/.local/share/org.gnome.Ptyxis/palettes/zacess-light.palette" "terminal/terminal|linux/ptyxis/zacess-cream.palette|${HOME}/.local/share/org.gnome.Ptyxis/palettes/zacess-cream.palette" "terminal/terminal|linux/ptyxis/zacess-yellow-on-black.palette|${HOME}/.local/share/org.gnome.Ptyxis/palettes/zacess-yellow-on-black.palette" + "terminal/terminal|linux/ptyxis/zacess-warm-dark.palette|${HOME}/.local/share/org.gnome.Ptyxis/palettes/zacess-warm-dark.palette" + "terminal/terminal|linux/ptyxis/zacess-warm-light.palette|${HOME}/.local/share/org.gnome.Ptyxis/palettes/zacess-warm-light.palette" ) # these hold each person's own identity and hosts, so they are copied once as a starting point diff --git a/setup/linux-bootstrap/docs/optional-extras.md b/setup/linux-bootstrap/docs/optional-extras.md index 13da77a..43c7388 100644 --- a/setup/linux-bootstrap/docs/optional-extras.md +++ b/setup/linux-bootstrap/docs/optional-extras.md @@ -26,7 +26,7 @@ Desktop-only extras are skipped with a warning on WSL, servers and containers. | `vercel` | The Vercel CLI through npm | Any | | `extra-languages` | Racket, SBCL (Common Lisp), R and Ada (GNAT with gprbuild) | Any | | `gamedev` | SDL2 and SFML development libraries | Any | -| `configs` | A zsh profile (with a bash fallback) set as the login shell, a prompt and tool configs (tmux, Neovim, Git hooks, lazygit, ripgrep, plus VS Code settings, GNOME settings and the eight Zacess terminal palettes on a desktop) from public repositories, linked into place; nano's rc file is written by `zt` rather than linked. Starting `~/.gitconfig` and `~/.ssh/config` files are copied if missing | Any | +| `configs` | A zsh profile (with a bash fallback) set as the login shell, a prompt and tool configs (tmux, Neovim, Git hooks, lazygit, ripgrep, plus VS Code settings, GNOME settings and the ten Zacess terminal palettes on a desktop) from public repositories, linked into place; nano's rc file is written by `zt` rather than linked. Starting `~/.gitconfig` and `~/.ssh/config` files are copied if missing | Any | | `chinese-input` | Pinyin and Cangjie input methods for IBus | Desktop | | `mac-keys` | Natural scrolling and Toshy for Mac-style shortcuts in a VM on a Mac | Desktop | diff --git a/setup/windows-bootstrap/ACCESSIBILITY.md b/setup/windows-bootstrap/ACCESSIBILITY.md index b88c820..077b811 100644 --- a/setup/windows-bootstrap/ACCESSIBILITY.md +++ b/setup/windows-bootstrap/ACCESSIBILITY.md @@ -22,7 +22,7 @@ high-contrast colours and captured accessibility settings to every PC. - The settings stage applies the values captured in the defaults folder: pointer size, text scaling, window animations, high contrast, Sticky Keys and Filter Keys among them. It writes only values that differ and says when one needs a sign-out to take effect. -- The configs stage gives Windows Terminal the terminal folder's eight Zacess schemes, with Zacess Deep +- The configs stage gives Windows Terminal the terminal folder's ten Zacess schemes, with Zacess Deep Contrast Dark as the fixed default and bold text kept in its own colour. A Zacess scheme already chosen (with `zt`, say) is kept. - The dotfiles stage makes Command Prompt show the same banner and a prompt in the terminal's own diff --git a/setup/windows-bootstrap/README.md b/setup/windows-bootstrap/README.md index 6c06432..2c2e50f 100644 --- a/setup/windows-bootstrap/README.md +++ b/setup/windows-bootstrap/README.md @@ -33,7 +33,7 @@ If PowerShell refuses to run the script, allow local scripts for your user once: | winget | Installs anything missing from `packages/winget.json` without upgrading what is already there | | dotfiles | Signs in to GitHub, clones the dotfiles, points the PowerShell 7 profile and starship at them, puts `zt` on the `PATH` and makes Command Prompt run the dotfiles' start-up | | git | Copies a starting `.gitconfig` and SSH config if missing and links the Git hooks | -| configs | Points Neovim, VS Code settings, lazygit, psmux (`~/.tmux.conf`) and ripgrep at their folders in the dotfiles (nano's rc file is written by `zt` rather than linked), installs Geist Mono Nerd Font for the user and for all users, then gives Windows Terminal the eight Zacess schemes with Zacess Deep Contrast Dark as the default and Geist Mono as its font | +| configs | Points Neovim, VS Code settings, lazygit, psmux (`~/.tmux.conf`) and ripgrep at their folders in the dotfiles (nano's rc file is written by `zt` rather than linked), installs Geist Mono Nerd Font for the user and for all users, then gives Windows Terminal the ten Zacess schemes with Zacess Deep Contrast Dark as the default and Geist Mono as its font | | vscode | Installs missing VS Code extensions from the [vscode](../../editors/vscode) folder at their latest version | | settings | Applies the Windows settings captured in the [defaults](../defaults) folder, writing only what differs, then hides the dot folders in the home folder in File Explorer. Dot files stay shown, because Node and Electron apps cannot save over a hidden file on Windows | | wsl | Installs WSL2 with Ubuntu 26.04 (or 24.04) and explains the linux-bootstrap step | @@ -65,7 +65,7 @@ The dotfiles and configs come from these folders of the dotfiles repository: | [neovim](../../editors/neovim) | Neovim with LSP, treesitter and Telescope | | [cli-tools](../../terminal/cli-tools) | ripgrep, fzf and lazygit defaults | | [vscode](../../editors/vscode) | VS Code settings, keybindings and extensions | -| [terminal](../../terminal/terminal) | The eight Zacess schemes for Windows Terminal | +| [terminal](../../terminal/terminal) | The ten Zacess schemes for Windows Terminal | | [defaults](../defaults) | Windows settings, captured and applied | The dotfiles repository is cloned once into `%USERPROFILE%\dev\github\repos\dotfiles` (change the parent diff --git a/setup/windows-bootstrap/bootstrap/lib/apps.ps1 b/setup/windows-bootstrap/bootstrap/lib/apps.ps1 index 347be9a..71aed0c 100644 --- a/setup/windows-bootstrap/bootstrap/lib/apps.ps1 +++ b/setup/windows-bootstrap/bootstrap/lib/apps.ps1 @@ -78,8 +78,11 @@ function Install-AppSettings { # The special-folder API rather than the environment variable, which is not set when the plan # is checked elsewhere $stateFile = Join-Path ([Environment]::GetFolderPath('LocalApplicationData')) 'zacess\theme' - # typed, because an if expression unrolls a one-element array into a string, whose [0] is one character - [string[]]$words = if (Test-Path $stateFile) { @((([IO.File]::ReadAllText($stateFile)).Trim() -split '\s+')) } else { @() } + # typed and set in a statement of its own. An if expression unrolls a one-element array into a string whose [0] + # is one character. Since PowerShell 7.6 one that outputs an empty array gives a typed variable $null, which + # strict mode refuses to count + [string[]]$words = @() + if (Test-Path $stateFile) { $words = @(([IO.File]::ReadAllText($stateFile)).Trim() -split '\s+') } $theme = if ($words.Count) { $words[0] } else { $null } if ($theme -eq 'auto') { $light = Get-ItemPropertyValue 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize' 'AppsUseLightTheme' -ErrorAction SilentlyContinue diff --git a/setup/windows-bootstrap/bootstrap/lib/configs.ps1 b/setup/windows-bootstrap/bootstrap/lib/configs.ps1 index fbba09c..d0121ca 100644 --- a/setup/windows-bootstrap/bootstrap/lib/configs.ps1 +++ b/setup/windows-bootstrap/bootstrap/lib/configs.ps1 @@ -78,7 +78,7 @@ function Install-ConfigRepos { # writes it per machine, with the theme's colours and Git's syntax folder, the first time a # theme is set - # Windows Terminal loads extra colour schemes from a fragment folder, so the eight Zacess schemes + # Windows Terminal loads extra colour schemes from a fragment folder, so the ten Zacess schemes # arrive without touching its own settings file; only the default scheme is set there $fragments = Join-Path $localAppData 'Microsoft\Windows Terminal\Fragments' # the earlier High Contrast fragment points at a file the terminal folder no longer has, which diff --git a/shell/ACCESSIBILITY.md b/shell/ACCESSIBILITY.md index 4d92978..663e240 100644 --- a/shell/ACCESSIBILITY.md +++ b/shell/ACCESSIBILITY.md @@ -15,7 +15,7 @@ These dotfiles started from a practical need. With monocular vision, depth cues | Colour vision differences | Status messages carry words as well as colour ("profile loaded", the error text itself). The colours were tested on dark and light terminal themes. Changing one colour in `02-colours` updates it across the whole profile | | Icon fonts | The Starship prompt's own symbols are plain ASCII (the `>` prompt character, `+` for jobs and `!`, `^` or `v` in git status), so it reads cleanly without a Nerd Font. The Node.js module shows the plain text `node` rather than Starship's default Nerd Font glyph. The terminals on my Mac use Monaco 12 in iTerm2 and Warp's default font at size 13, neither of them a Nerd Font | -The terminal itself sets the final shades. [terminal](../terminal/terminal) installs the eight Zacess themes with Zacess Deep Contrast Dark as the default: white text on pure black with deep, fully saturated colours at 7:1 or more. Everything this profile prints follows whichever theme is on, since it only uses the named colours. The Command Prompt prompt and banner do the same. +The terminal itself sets the final shades. [terminal](../terminal/terminal) installs the ten Zacess themes with Zacess Deep Contrast Dark as the default: white text on pure black with deep, fully saturated colours at 7:1 or more. Everything this profile prints follows whichever theme is on, since it only uses the named colours. The Command Prompt prompt and banner do the same. > [!TIP] > `zt` switches every editor and terminal to one Zacess theme in one command: `zt deep-light`, @@ -31,7 +31,7 @@ The terminal itself sets the final shades. [terminal](../terminal/terminal) inst > [!TIP] > `termtheme` sets only the terminals, on every platform, while the editors keep following `zt`. > `termtheme dark` or `termtheme light` keeps the Zacess Deep Contrast pair on one mode whatever the -> system does, `termtheme ` takes any of the eight Zacess themes, `termtheme auto` follows the +> system does, `termtheme ` takes any of the ten Zacess themes, `termtheme auto` follows the > system's light and dark setting, `termtheme default` goes back to each terminal's own theme and > `termtheme follow` hands the terminals back to `zt`. `termtheme` on its own shows what each > terminal is on. It drives every terminal `zt` switches: Terminal.app, iTerm2, Ghostty, Kitty, diff --git a/shell/README.md b/shell/README.md index 1f4d327..abc7d7c 100644 --- a/shell/README.md +++ b/shell/README.md @@ -9,7 +9,8 @@ ## In action -Screenshots in four Zacess themes, Deep Contrast Dark and Light, Yellow on Black and Cream, +Screenshots in six Zacess themes, Deep Contrast Dark and Light, Yellow on Black, Cream, Warm Dark +and Warm Light, recorded in a demo project. Each macOS and Linux shot links to a short animation of the same scene. ### macOS shell @@ -22,6 +23,10 @@ recorded in a demo project. Each macOS and Linux shot links to a short animation | --- | --- | | [![Yellow on Black: the welcome banner with a neutral machine name, then gs and glog in a demo project under the Starship prompt](docs/demo/dotfiles-yellow-on-black.webp)](docs/demo/dotfiles-yellow-on-black.gif) | [![Cream: the welcome banner with a neutral machine name, then gs and glog in a demo project under the Starship prompt](docs/demo/dotfiles-cream.webp)](docs/demo/dotfiles-cream.gif) | +| Warm Dark | Warm Light | +| --- | --- | +| [![Warm Dark: the welcome banner with a neutral machine name, then gs and glog in a demo project under the Starship prompt](docs/demo/dotfiles-warm-dark.webp)](docs/demo/dotfiles-warm-dark.gif) | [![Warm Light: the welcome banner with a neutral machine name, then gs and glog in a demo project under the Starship prompt](docs/demo/dotfiles-warm-light.webp)](docs/demo/dotfiles-warm-light.gif) | + ### Linux (Ubuntu in OrbStack) | Deep Contrast Dark | Deep Contrast Light | @@ -32,6 +37,10 @@ recorded in a demo project. Each macOS and Linux shot links to a short animation | --- | --- | | [![Yellow on Black: the same dotfiles in bash on Ubuntu: the banner, the numbered topic files and a git log of a demo project](docs/demo/linux-yellow-on-black.webp)](docs/demo/linux-yellow-on-black.gif) | [![Cream: the same dotfiles in bash on Ubuntu: the banner, the numbered topic files and a git log of a demo project](docs/demo/linux-cream.webp)](docs/demo/linux-cream.gif) | +| Warm Dark | Warm Light | +| --- | --- | +| [![Warm Dark: the same dotfiles in bash on Ubuntu: the banner, the numbered topic files and a git log of a demo project](docs/demo/linux-warm-dark.webp)](docs/demo/linux-warm-dark.gif) | [![Warm Light: the same dotfiles in bash on Ubuntu: the banner, the numbered topic files and a git log of a demo project](docs/demo/linux-warm-light.webp)](docs/demo/linux-warm-light.gif) | + ### Windows (PowerShell 7 and Command Prompt in Windows Terminal) | Deep Contrast Dark | Deep Contrast Light | @@ -42,8 +51,8 @@ recorded in a demo project. Each macOS and Linux shot links to a short animation | ![Dark: Command Prompt with the coloured user, machine and folder prompt running the gs macro in a demo project](docs/demo/windows-cmd-dark.webp) | ![Light: Command Prompt with the coloured user, machine and folder prompt running the gs macro in a demo project](docs/demo/windows-cmd-light.webp) | The shots show the real config in a throwaway demo project, in -[Zacess Themes](https://github.com/zacesshq/themes) Deep Contrast Dark and Light, Yellow on Black -and Cream. +[Zacess Themes](https://github.com/zacesshq/themes) Deep Contrast Dark and Light, Yellow on Black, +Cream, Warm Dark and Warm Light. ## About diff --git a/shell/docs/demo/dotfiles-cream.gif b/shell/docs/demo/dotfiles-cream.gif index 3305eeb..c129e8b 100644 Binary files a/shell/docs/demo/dotfiles-cream.gif and b/shell/docs/demo/dotfiles-cream.gif differ diff --git a/shell/docs/demo/dotfiles-cream.webp b/shell/docs/demo/dotfiles-cream.webp index 2a2c9f0..9c61233 100644 Binary files a/shell/docs/demo/dotfiles-cream.webp and b/shell/docs/demo/dotfiles-cream.webp differ diff --git a/shell/docs/demo/dotfiles-dark.gif b/shell/docs/demo/dotfiles-dark.gif index 3df873f..304dd46 100644 Binary files a/shell/docs/demo/dotfiles-dark.gif and b/shell/docs/demo/dotfiles-dark.gif differ diff --git a/shell/docs/demo/dotfiles-dark.webp b/shell/docs/demo/dotfiles-dark.webp index ca51c07..e77179f 100644 Binary files a/shell/docs/demo/dotfiles-dark.webp and b/shell/docs/demo/dotfiles-dark.webp differ diff --git a/shell/docs/demo/dotfiles-light.gif b/shell/docs/demo/dotfiles-light.gif index 79792cb..9977cd2 100644 Binary files a/shell/docs/demo/dotfiles-light.gif and b/shell/docs/demo/dotfiles-light.gif differ diff --git a/shell/docs/demo/dotfiles-light.webp b/shell/docs/demo/dotfiles-light.webp index a70c708..1c823f5 100644 Binary files a/shell/docs/demo/dotfiles-light.webp and b/shell/docs/demo/dotfiles-light.webp differ diff --git a/shell/docs/demo/dotfiles-warm-dark.gif b/shell/docs/demo/dotfiles-warm-dark.gif new file mode 100644 index 0000000..3dc4b9f Binary files /dev/null and b/shell/docs/demo/dotfiles-warm-dark.gif differ diff --git a/shell/docs/demo/dotfiles-warm-dark.webp b/shell/docs/demo/dotfiles-warm-dark.webp new file mode 100644 index 0000000..415973a Binary files /dev/null and b/shell/docs/demo/dotfiles-warm-dark.webp differ diff --git a/shell/docs/demo/dotfiles-warm-light.gif b/shell/docs/demo/dotfiles-warm-light.gif new file mode 100644 index 0000000..706effc Binary files /dev/null and b/shell/docs/demo/dotfiles-warm-light.gif differ diff --git a/shell/docs/demo/dotfiles-warm-light.webp b/shell/docs/demo/dotfiles-warm-light.webp new file mode 100644 index 0000000..f6e97f2 Binary files /dev/null and b/shell/docs/demo/dotfiles-warm-light.webp differ diff --git a/shell/docs/demo/dotfiles-yellow-on-black.gif b/shell/docs/demo/dotfiles-yellow-on-black.gif index 3904910..bd8776d 100644 Binary files a/shell/docs/demo/dotfiles-yellow-on-black.gif and b/shell/docs/demo/dotfiles-yellow-on-black.gif differ diff --git a/shell/docs/demo/dotfiles-yellow-on-black.webp b/shell/docs/demo/dotfiles-yellow-on-black.webp index c834aeb..6667aa5 100644 Binary files a/shell/docs/demo/dotfiles-yellow-on-black.webp and b/shell/docs/demo/dotfiles-yellow-on-black.webp differ diff --git a/shell/docs/demo/linux-cream.gif b/shell/docs/demo/linux-cream.gif index a72293e..622912c 100644 Binary files a/shell/docs/demo/linux-cream.gif and b/shell/docs/demo/linux-cream.gif differ diff --git a/shell/docs/demo/linux-cream.webp b/shell/docs/demo/linux-cream.webp index 8a09f45..e363ccf 100644 Binary files a/shell/docs/demo/linux-cream.webp and b/shell/docs/demo/linux-cream.webp differ diff --git a/shell/docs/demo/linux-dark.gif b/shell/docs/demo/linux-dark.gif index 6ec9004..32de4ae 100644 Binary files a/shell/docs/demo/linux-dark.gif and b/shell/docs/demo/linux-dark.gif differ diff --git a/shell/docs/demo/linux-dark.webp b/shell/docs/demo/linux-dark.webp index bbe99ee..2b4ce24 100644 Binary files a/shell/docs/demo/linux-dark.webp and b/shell/docs/demo/linux-dark.webp differ diff --git a/shell/docs/demo/linux-light.gif b/shell/docs/demo/linux-light.gif index d271a60..18ed26a 100644 Binary files a/shell/docs/demo/linux-light.gif and b/shell/docs/demo/linux-light.gif differ diff --git a/shell/docs/demo/linux-light.webp b/shell/docs/demo/linux-light.webp index 5c0ee53..399213e 100644 Binary files a/shell/docs/demo/linux-light.webp and b/shell/docs/demo/linux-light.webp differ diff --git a/shell/docs/demo/linux-warm-dark.gif b/shell/docs/demo/linux-warm-dark.gif new file mode 100644 index 0000000..8d42059 Binary files /dev/null and b/shell/docs/demo/linux-warm-dark.gif differ diff --git a/shell/docs/demo/linux-warm-dark.webp b/shell/docs/demo/linux-warm-dark.webp new file mode 100644 index 0000000..9167984 Binary files /dev/null and b/shell/docs/demo/linux-warm-dark.webp differ diff --git a/shell/docs/demo/linux-warm-light.gif b/shell/docs/demo/linux-warm-light.gif new file mode 100644 index 0000000..fea35f1 Binary files /dev/null and b/shell/docs/demo/linux-warm-light.gif differ diff --git a/shell/docs/demo/linux-warm-light.webp b/shell/docs/demo/linux-warm-light.webp new file mode 100644 index 0000000..c360735 Binary files /dev/null and b/shell/docs/demo/linux-warm-light.webp differ diff --git a/shell/docs/demo/linux-yellow-on-black.gif b/shell/docs/demo/linux-yellow-on-black.gif index e0ba3d6..9f50035 100644 Binary files a/shell/docs/demo/linux-yellow-on-black.gif and b/shell/docs/demo/linux-yellow-on-black.gif differ diff --git a/shell/docs/demo/linux-yellow-on-black.webp b/shell/docs/demo/linux-yellow-on-black.webp index f5c8a51..8308708 100644 Binary files a/shell/docs/demo/linux-yellow-on-black.webp and b/shell/docs/demo/linux-yellow-on-black.webp differ diff --git a/shell/guides/documentation.md b/shell/guides/documentation.md index 35a499b..3fbe1dc 100644 --- a/shell/guides/documentation.md +++ b/shell/guides/documentation.md @@ -273,7 +273,7 @@ unconditional line, since not everyone has these 5 tools installed yet. | `ez` | eza: syntax-aware `ls` with icons and git status | | `ezl` | eza: long listing, hidden files, git status (`-lah --git`) | | `ezt` | eza: tree view, 2 levels deep | -| `zt ` | Zacess: switch every editor, terminal and app to one of the eight Zacess themes (`zt auto` follows the system, `zt list` and `zt current` show the themes and what each tool is on, `zt pin ` keeps one app on its own theme and `zt unpin` hands it back). Also `zacess-theme` | +| `zt ` | Zacess: switch every editor, terminal and app to one of the ten Zacess themes (`zt auto` follows the system, `zt list` and `zt current` show the themes and what each tool is on, `zt pin ` keeps one app on its own theme and `zt unpin` hands it back). Also `zacess-theme` | | `zs [scene]` | Zacess Scenes: a random calm scene or one by name in the theme `zt` last set. `zs list` shows every scene and sound set, `zs sounds [set]` plays them, `zs config` opens `scenes.toml`, `zs new ` starts a Lua scene and `zs snap ` writes an SVG still. Also `zacess-scene` | | `zw [job]` | Zacess Scenes watch mode: a calm scene while a Rust build passes and a storm while it fails, with sounds. `zwc` runs Clippy, `zwt` the tests and `zwa` check-all | | `zg [game]` | Zacess Games: the menu or one of the fourteen games by name in the theme `zt` last set, with Tab completion of the names. `zg list` shows every game and its best score, `zg sounds` plays every effect and each game's music and `zg snap` writes SVG stills. `+` and `-` set the effects, `]` and `[` the music and `0` mutes. Also `zacess-game` | diff --git a/shell/linux/topics-zsh/07-utilities.zsh b/shell/linux/topics-zsh/07-utilities.zsh index 3dd362e..6ea4d66 100644 --- a/shell/linux/topics-zsh/07-utilities.zsh +++ b/shell/linux/topics-zsh/07-utilities.zsh @@ -164,7 +164,7 @@ termtheme() { "") zt current terminals ;; -h|--help|help) echo "Usage: termtheme [|dark|light|auto [dark] [light]|default|default-dark|default-light|follow]" - echo " a theme pins every terminal to it (zt list shows the eight), dark and light are the Deep Contrast pair," + echo " a theme pins every terminal to it (zt list shows the ten), dark and light are the Deep Contrast pair," echo " auto follows the system, default is each terminal's own theme and follow hands them back to zt" ;; dark) zt pin terminals deep-contrast-dark ;; light) zt pin terminals deep-contrast-light ;; diff --git a/shell/linux/topics-zsh/39-zacess-theme.zsh b/shell/linux/topics-zsh/39-zacess-theme.zsh index 368ad6d..a4d5635 100644 --- a/shell/linux/topics-zsh/39-zacess-theme.zsh +++ b/shell/linux/topics-zsh/39-zacess-theme.zsh @@ -1,6 +1,6 @@ # ============================================================================= # Zacess theme switching -# zt switches every editor, terminal and app with a Zacess theme to one of the eight at once: +# zt switches every editor, terminal and app with a Zacess theme to one of the ten at once: # VS Code, Zed, the JetBrains IDEs, Neovim, Eclipse, STM32CubeIDE, KiCad, Processing, Vivado, # Arduino IDE, Thonny, MATLAB, LTspice (under Wine), Zotero, Obsidian, Kitty, Alacritty and # Ghostty. diff --git a/shell/linux/topics/07-utilities.sh b/shell/linux/topics/07-utilities.sh index cf62a23..867b9a0 100644 --- a/shell/linux/topics/07-utilities.sh +++ b/shell/linux/topics/07-utilities.sh @@ -164,7 +164,7 @@ termtheme() { "") zt current terminals ;; -h|--help|help) echo "Usage: termtheme [|dark|light|auto [dark] [light]|default|default-dark|default-light|follow]" - echo " a theme pins every terminal to it (zt list shows the eight), dark and light are the Deep Contrast pair," + echo " a theme pins every terminal to it (zt list shows the ten), dark and light are the Deep Contrast pair," echo " auto follows the system, default is each terminal's own theme and follow hands them back to zt" ;; dark) zt pin terminals deep-contrast-dark ;; light) zt pin terminals deep-contrast-light ;; diff --git a/shell/linux/topics/38-zacess-theme.sh b/shell/linux/topics/38-zacess-theme.sh index 45e3931..4cea74c 100644 --- a/shell/linux/topics/38-zacess-theme.sh +++ b/shell/linux/topics/38-zacess-theme.sh @@ -1,6 +1,6 @@ # ============================================================================= # Zacess theme switching -# zt switches every editor, terminal and app with a Zacess theme to one of the eight at once: +# zt switches every editor, terminal and app with a Zacess theme to one of the ten at once: # VS Code, Zed, the JetBrains IDEs, Neovim, Eclipse, STM32CubeIDE, KiCad, Processing, Vivado, # Arduino IDE, Thonny, MATLAB, LTspice (under Wine), Zotero, Obsidian, Kitty, Alacritty and # Ghostty. diff --git a/shell/mac/topics/07-utilities.zsh b/shell/mac/topics/07-utilities.zsh index 4760e1b..e2897bf 100644 --- a/shell/mac/topics/07-utilities.zsh +++ b/shell/mac/topics/07-utilities.zsh @@ -165,7 +165,7 @@ termtheme() { "") zt current terminals ;; -h|--help|help) echo "Usage: termtheme [|dark|light|auto [dark] [light]|default|default-dark|default-light|follow]" - echo " a theme pins every terminal to it (zt list shows the eight), dark and light are the Deep Contrast pair," + echo " a theme pins every terminal to it (zt list shows the ten), dark and light are the Deep Contrast pair," echo " auto follows the system, default is each terminal's own theme and follow hands them back to zt" ;; dark) zt pin terminals deep-contrast-dark ;; light) zt pin terminals deep-contrast-light ;; diff --git a/shell/mac/topics/38-zacess-theme.zsh b/shell/mac/topics/38-zacess-theme.zsh index 9ef084a..8ca5fdd 100644 --- a/shell/mac/topics/38-zacess-theme.zsh +++ b/shell/mac/topics/38-zacess-theme.zsh @@ -1,6 +1,6 @@ # ============================================================================= # Zacess theme switching -# zt switches every editor, terminal and app with a Zacess theme to one of the eight at once: +# zt switches every editor, terminal and app with a Zacess theme to one of the ten at once: # VS Code, Zed, the JetBrains IDEs, Neovim, Eclipse, STM32CubeIDE, KiCad, Processing, Nextpad++, # Arduino IDE, Thonny, MATLAB, LTspice, Zotero, Obsidian, Terminal.app, iTerm2, Kitty, Alacritty # and Ghostty. diff --git a/shell/scripts/README.md b/shell/scripts/README.md index 8489dc5..3e2419c 100644 --- a/shell/scripts/README.md +++ b/shell/scripts/README.md @@ -10,13 +10,13 @@ Standalone helper scripts that can be run from any platform. ## Theme switching -`zt` switches every installed editor and terminal to one of the eight Zacess themes at once. Windows has the same command in [`windows/scripts/zt.ps1`](../windows/scripts/zt.ps1), with `zt.cmd` for Command Prompt. +`zt` switches every installed editor and terminal to one of the ten Zacess themes at once. Windows has the same command in [`windows/scripts/zt.ps1`](../windows/scripts/zt.ps1), with `zt.cmd` for Command Prompt. | Command | What it does | | --- | --- | | `zt ` | Fixes that theme everywhere and stops following the system. Takes a short name, an id or the full name | | `zt auto [dark] [light]` | Follows the system light and dark appearance, Zacess Deep Contrast Dark and Light unless two others are named | -| `zt list` | The eight themes and their short names, the current one marked | +| `zt list` | The ten themes and their short names, the current one marked | | `zt current` | The mode zt last set, then each installed tool's own setting read back: which theme, fixed or following the system | | `zt doctor` | Every installed theme file against the repo copy for the active theme and every tool's own setting against the state, one line per tool. Exits 1 on any drift, so a copy that stopped matching the repo or a tool switched by hand shows up | | `zt highlight [default]` | The system text highlight again from the active theme's selection colour; `default` puts the system's own highlight back | @@ -24,7 +24,7 @@ Standalone helper scripts that can be run from any platform. | `zt unpin ` | The app follows `zt` again and is switched to the current state straight away. `terminals` unpins every terminal and `--all` every app | | `zt current terminals` | What each terminal app is on, with its pin. `zt current ` shows one app | -Short names: `deep-dark`, `deep-light`, `hc-dark`, `hc-light`, `dark`, `light`, `cream` and `yellow`. `zacess-theme` is the same command under its full name. +Short names: `deep-dark`, `deep-light`, `hc-dark`, `hc-light`, `dark`, `light`, `cream`, `yellow`, `warm-dark` and `warm-light`. `zacess-theme` is the same command under its full name. | Tool | Fixed theme | `zt auto` | | --- | --- | --- | diff --git a/shell/scripts/zt.py b/shell/scripts/zt.py index 34b6c35..2305e04 100644 --- a/shell/scripts/zt.py +++ b/shell/scripts/zt.py @@ -5,7 +5,7 @@ zt --all the same here, then on every other device as a terminal opens there zt undo [--all] back to the theme before the last change (on every device with --all) zt auto [dark] [light] follow the system light and dark appearance, Deep Contrast by default - zt list the eight themes and their short names + zt list the ten themes and their short names zt current the mode zt last set and what each tool is on now zt doctor every installed theme file against the repo copy, exit 1 on drift zt highlight [default] the system text highlight again from the theme or the system's own back @@ -51,6 +51,8 @@ ("light", "light", "Zacess Light", "light"), ("cream", "cream", "Zacess Cream", "light"), ("yellow-on-black", "yellow", "Zacess Yellow on Black", "dark"), + ("warm-dark", "warm-dark", "Zacess Warm Dark", "dark"), + ("warm-light", "warm-light", "Zacess Warm Light", "light"), ] DEFAULT_DARK = "deep-contrast-dark" DEFAULT_LIGHT = "deep-contrast-light" @@ -869,7 +871,7 @@ def tmux(fixed, dark, light, now): report("tmux", f"{theme.name}{note}, {when}") -# btop: a generated theme per Zacess theme in terminal/btop/themes. All eight are linked into btop's +# btop: a generated theme per Zacess theme in terminal/btop/themes. All ten are linked into btop's # own themes folder, so they sit in its Options menu beside the built-in ones. btop.conf's # color_theme points at the current one. theme_background makes btop draw on the terminal's own # background. Only those two keys are rewritten, so every other btop setting stays as it is diff --git a/shell/windows/scripts/zt.ps1 b/shell/windows/scripts/zt.ps1 index 609f369..b13e26d 100644 --- a/shell/windows/scripts/zt.ps1 +++ b/shell/windows/scripts/zt.ps1 @@ -2,7 +2,7 @@ # # zt fix that theme everywhere and stop following the system # zt auto [dark] [light] follow the Windows light and dark setting, Deep Contrast by default -# zt list the eight themes and their short names +# zt list the ten themes and their short names # zt current the mode zt last set and what each tool is on now # zt doctor every installed theme file against the repo copy, exit 1 on drift # zt --all the same here, then on every other device as a terminal opens there @@ -37,6 +37,8 @@ $Themes = @( @{ Id = 'light'; Short = 'light'; Name = 'Zacess Light'; Dark = $false } @{ Id = 'cream'; Short = 'cream'; Name = 'Zacess Cream'; Dark = $false } @{ Id = 'yellow-on-black'; Short = 'yellow'; Name = 'Zacess Yellow on Black'; Dark = $true } + @{ Id = 'warm-dark'; Short = 'warm-dark'; Name = 'Zacess Warm Dark'; Dark = $true } + @{ Id = 'warm-light'; Short = 'warm-light'; Name = 'Zacess Warm Light'; Dark = $false } ) $StateFile = Join-Path $env:LOCALAPPDATA 'zacess\theme' @@ -372,7 +374,7 @@ function Set-Tmux($Fixed, $Dark, $Light, $Now) { # a themes folder from the folder of the path it was started from, not a config folder. a winget # portable install keeps the exe under WinGet\Packages and puts a link to it, named btop.exe, in # WinGet\Links. btop started through that link reads WinGet\Links instead, so both folders get -# the settings: the exe's own folder holds the themes (the shipped ones and the eight Zacess ones, +# the settings: the exe's own folder holds the themes (the shipped ones and the ten Zacess ones, # linked in) and the link's folder gets a link to that themes folder. each btop.conf has only # color_theme and theme_background rewritten. Get-BtopDirs returns the exe's folder first function Get-BtopDirs { diff --git a/shell/windows/topics/07-utilities.ps1 b/shell/windows/topics/07-utilities.ps1 index 2c98d73..ea6bfc7 100644 --- a/shell/windows/topics/07-utilities.ps1 +++ b/shell/windows/topics/07-utilities.ps1 @@ -157,7 +157,7 @@ function termtheme { switch ($words[0]) { { $_ -in '-h', '--help', 'help' } { 'Usage: termtheme [|dark|light|auto [dark] [light]|default|default-dark|default-light|follow]' - ' a theme pins every terminal to it (zt list shows the eight), dark and light are the Deep Contrast pair,' + ' a theme pins every terminal to it (zt list shows the ten), dark and light are the Deep Contrast pair,' ' auto follows Windows, default is each terminal''s own theme and follow hands them back to zt' return } diff --git a/shell/windows/topics/37-zacess-theme.ps1 b/shell/windows/topics/37-zacess-theme.ps1 index f71643a..442639b 100644 --- a/shell/windows/topics/37-zacess-theme.ps1 +++ b/shell/windows/topics/37-zacess-theme.ps1 @@ -1,6 +1,6 @@ # ============================================================================= # Zacess theme switching -# zt switches every editor, terminal and app with a Zacess theme to one of the eight at once: +# zt switches every editor, terminal and app with a Zacess theme to one of the ten at once: # VS Code, Zed, the JetBrains IDEs, Neovim, Eclipse, STM32CubeIDE, KiCad, Vivado, Arduino IDE, # Notepad++, Thonny, LTspice, Proteus, Zotero, Obsidian, MATLAB, Processing, Microchip Studio, # Windows Terminal and Alacritty. the work is done by diff --git a/terminal/README.md b/terminal/README.md index 1b35a5f..4173b9a 100644 --- a/terminal/README.md +++ b/terminal/README.md @@ -5,8 +5,8 @@ every window reads the same way. | Folder | What it is | Platforms | | --- | --- | --- | -| [terminal](terminal) | The eight Zacess colour themes for Terminal.app, iTerm2, Windows Terminal, Ptyxis, GNOME Terminal, Alacritty, Kitty and Hyper, plus starter configs with per-platform fonts | macOS, Linux and Windows | +| [terminal](terminal) | The ten Zacess colour themes for Terminal.app, iTerm2, Windows Terminal, Ptyxis, GNOME Terminal, Alacritty, Kitty and Hyper, plus starter configs with per-platform fonts | macOS, Linux and Windows | | [tmux](tmux) | tmux with vi-style copy mode and pane navigation, a plain high-contrast status bar and plugins for session persistence. On Windows the same setup runs in psmux, a native tmux | macOS, Linux and Windows (psmux or tmux in WSL2) | -| [btop](btop) | btop and btop4win in the eight Zacess themes, generated from the palette and set by `zt` | macOS, Linux and Windows | -| [nano](nano) | GNU nano's interface colours in the eight Zacess themes, generated from the palette as fragments `zt` writes into nano's rc file; the shared nanorc is in [editors/nano](../editors/nano) | macOS, Linux and Windows | +| [btop](btop) | btop and btop4win in the ten Zacess themes, generated from the palette and set by `zt` | macOS, Linux and Windows | +| [nano](nano) | GNU nano's interface colours in the ten Zacess themes, generated from the palette as fragments `zt` writes into nano's rc file; the shared nanorc is in [editors/nano](../editors/nano) | macOS, Linux and Windows | | [cli-tools](cli-tools) | ripgrep, fzf, lazygit and zoxide defaults with a high-contrast theme and vi-style navigation | macOS, Linux and Windows | diff --git a/terminal/btop/ACCESSIBILITY.md b/terminal/btop/ACCESSIBILITY.md index afe9027..ccb0366 100644 --- a/terminal/btop/ACCESSIBILITY.md +++ b/terminal/btop/ACCESSIBILITY.md @@ -7,7 +7,9 @@ Every text colour in a btop theme here is the theme's own foreground, its muted text or one of its terminal colours, all taken from `palette/zacess.json`. The generator holds each of them to at least 4.5:1 against the theme's background and stops if one falls short. The lowest text contrast -across the eight themes is 5.99:1 (Zacess Light) and the selected row keeps at least 7.48:1. +across the ten themes is 5.99:1 (Zacess Light) and the selected row keeps at least 6.50:1 (Zacess +Warm Light). Zacess Warm Dark and Zacess Warm Light set their own WCAG AA text floor of 4.5:1, so +the 7:1 floors in the table below are held at 4.5:1 in those two. | What | Colour slot | Floor | | --- | --- | --- | diff --git a/terminal/btop/README.md b/terminal/btop/README.md index 06e1c5c..3a2c891 100644 --- a/terminal/btop/README.md +++ b/terminal/btop/README.md @@ -1,6 +1,6 @@ # btop -btop (btop4win on Windows) in the eight Zacess themes, so the system monitor matches the terminal +btop (btop4win on Windows) in the ten Zacess themes, so the system monitor matches the terminal around it. ## What is here @@ -15,7 +15,7 @@ around it. | System | Where btop reads its settings | What `zt` does | | --- | --- | --- | -| macOS and Linux | `~/.config/btop/btop.conf` and `~/.config/btop/themes` | Links all eight themes into `themes`, points `color_theme` at the current one and sets `theme_background = True` | +| macOS and Linux | `~/.config/btop/btop.conf` and `~/.config/btop/themes` | Links all ten themes into `themes`, points `color_theme` at the current one and sets `theme_background = True` | | Windows | `btop.conf` and `themes` beside `btop4win.exe` (under `WinGet\Packages` for a winget install, which links it on the PATH as `btop`) | The same, in the folder beside the exe | Only `color_theme` and `theme_background` are rewritten, so every other btop setting stays as it diff --git a/terminal/btop/themes/zacess-warm-dark.theme b/terminal/btop/themes/zacess-warm-dark.theme new file mode 100644 index 0000000..39d72d3 --- /dev/null +++ b/terminal/btop/themes/zacess-warm-dark.theme @@ -0,0 +1,45 @@ +# Zacess Warm Dark +# generated by scripts/build-themes.py from palette/zacess.json, do not edit by hand + +theme[main_bg]="#211b17" +theme[main_fg]="#e5d5b6" +theme[title]="#e5d5b6" +theme[hi_fg]="#73c2b8" +theme[selected_bg]="#7abad3" +theme[selected_fg]="#211b17" +theme[inactive_fg]="#cabca9" +theme[graph_text]="#e5d5b6" +theme[meter_bg]="#36322d" +theme[proc_misc]="#73c2b8" +theme[cpu_box]="#a2be6f" +theme[mem_box]="#e4b35b" +theme[net_box]="#dfa1ca" +theme[proc_box]="#88b9e3" +theme[div_line]="#cabca9" +theme[temp_start]="#a2be6f" +theme[temp_mid]="#e4b35b" +theme[temp_end]="#fc9a8d" +theme[cpu_start]="#a2be6f" +theme[cpu_mid]="#e4b35b" +theme[cpu_end]="#fc9a8d" +theme[free_start]="#a2be6f" +theme[free_mid]="#a2be6f" +theme[free_end]="#d9f2b0" +theme[cached_start]="#88b9e3" +theme[cached_mid]="#88b9e3" +theme[cached_end]="#d7ecff" +theme[available_start]="#73c2b8" +theme[available_mid]="#73c2b8" +theme[available_end]="#b1f7ed" +theme[used_start]="#fc9a8d" +theme[used_mid]="#fc9a8d" +theme[used_end]="#fee4e0" +theme[download_start]="#dfa1ca" +theme[download_mid]="#dfa1ca" +theme[download_end]="#ffe1f4" +theme[upload_start]="#a2be6f" +theme[upload_mid]="#a2be6f" +theme[upload_end]="#d9f2b0" +theme[process_start]="#73c2b8" +theme[process_mid]="#88b9e3" +theme[process_end]="#dfa1ca" diff --git a/terminal/btop/themes/zacess-warm-light.theme b/terminal/btop/themes/zacess-warm-light.theme new file mode 100644 index 0000000..e198a81 --- /dev/null +++ b/terminal/btop/themes/zacess-warm-light.theme @@ -0,0 +1,45 @@ +# Zacess Warm Light +# generated by scripts/build-themes.py from palette/zacess.json, do not edit by hand + +theme[main_bg]="#f4ead5" +theme[main_fg]="#342410" +theme[title]="#342410" +theme[hi_fg]="#05514d" +theme[selected_bg]="#215779" +theme[selected_fg]="#f4ead5" +theme[inactive_fg]="#483b2c" +theme[graph_text]="#342410" +theme[meter_bg]="#d0cec0" +theme[proc_misc]="#05514d" +theme[cpu_box]="#275200" +theme[mem_box]="#6a4603" +theme[net_box]="#742c60" +theme[proc_box]="#014b79" +theme[div_line]="#483b2c" +theme[temp_start]="#275200" +theme[temp_mid]="#6a4603" +theme[temp_end]="#8c1a16" +theme[cpu_start]="#275200" +theme[cpu_mid]="#6a4603" +theme[cpu_end]="#8c1a16" +theme[free_start]="#275200" +theme[free_mid]="#275200" +theme[free_end]="#386616" +theme[cached_start]="#014b79" +theme[cached_mid]="#014b79" +theme[cached_end]="#115f93" +theme[available_start]="#05514d" +theme[available_mid]="#05514d" +theme[available_end]="#066662" +theme[used_start]="#8c1a16" +theme[used_mid]="#8c1a16" +theme[used_end]="#a4332b" +theme[download_start]="#742c60" +theme[download_mid]="#742c60" +theme[download_end]="#8a4074" +theme[upload_start]="#275200" +theme[upload_mid]="#275200" +theme[upload_end]="#386616" +theme[process_start]="#05514d" +theme[process_mid]="#014b79" +theme[process_end]="#742c60" diff --git a/terminal/cli-tools/README.md b/terminal/cli-tools/README.md index 877375c..f86d57e 100644 --- a/terminal/cli-tools/README.md +++ b/terminal/cli-tools/README.md @@ -5,7 +5,8 @@ ## In action -Screenshots in four Zacess themes, Deep Contrast Dark and Light, Yellow on Black and Cream, +Screenshots in six Zacess themes, Deep Contrast Dark and Light, Yellow on Black, Cream, Warm Dark +and Warm Light, recorded in a demo project. Each one links to a short animation of the same scene. ### lazygit @@ -18,6 +19,10 @@ recorded in a demo project. Each one links to a short animation of the same scen | --- | --- | | [![Yellow on Black: lazygit showing two changed files with their diff, the branch and the commit list](docs/demo/lazygit-yellow-on-black.webp)](docs/demo/lazygit-yellow-on-black.gif) | [![Cream: lazygit showing two changed files with their diff, the branch and the commit list](docs/demo/lazygit-cream.webp)](docs/demo/lazygit-cream.gif) | +| Warm Dark | Warm Light | +| --- | --- | +| [![Warm Dark: lazygit showing two changed files with their diff, the branch and the commit list](docs/demo/lazygit-warm-dark.webp)](docs/demo/lazygit-warm-dark.gif) | [![Warm Light: lazygit showing two changed files with their diff, the branch and the commit list](docs/demo/lazygit-warm-light.webp)](docs/demo/lazygit-warm-light.gif) | + ### fzf | Deep Contrast Dark | Deep Contrast Light | @@ -28,9 +33,13 @@ recorded in a demo project. Each one links to a short animation of the same scen | --- | --- | | [![Yellow on Black: fzf filtering a project's files for the word colour with the matches highlighted](docs/demo/fzf-yellow-on-black.webp)](docs/demo/fzf-yellow-on-black.gif) | [![Cream: fzf filtering a project's files for the word colour with the matches highlighted](docs/demo/fzf-cream.webp)](docs/demo/fzf-cream.gif) | +| Warm Dark | Warm Light | +| --- | --- | +| [![Warm Dark: fzf filtering a project's files for the word colour with the matches highlighted](docs/demo/fzf-warm-dark.webp)](docs/demo/fzf-warm-dark.gif) | [![Warm Light: fzf filtering a project's files for the word colour with the matches highlighted](docs/demo/fzf-warm-light.webp)](docs/demo/fzf-warm-light.gif) | + The shots show the real config in a throwaway demo project, in -[Zacess Themes](https://github.com/zacesshq/themes) Deep Contrast Dark and Light, Yellow on Black -and Cream. +[Zacess Themes](https://github.com/zacesshq/themes) Deep Contrast Dark and Light, Yellow on Black, +Cream, Warm Dark and Warm Light. ## What's here diff --git a/terminal/cli-tools/docs/demo/fzf-cream.gif b/terminal/cli-tools/docs/demo/fzf-cream.gif index b09a7e0..4905ac1 100644 Binary files a/terminal/cli-tools/docs/demo/fzf-cream.gif and b/terminal/cli-tools/docs/demo/fzf-cream.gif differ diff --git a/terminal/cli-tools/docs/demo/fzf-cream.webp b/terminal/cli-tools/docs/demo/fzf-cream.webp index f938bd2..a3b9045 100644 Binary files a/terminal/cli-tools/docs/demo/fzf-cream.webp and b/terminal/cli-tools/docs/demo/fzf-cream.webp differ diff --git a/terminal/cli-tools/docs/demo/fzf-dark.gif b/terminal/cli-tools/docs/demo/fzf-dark.gif index ffc884a..857ffe4 100644 Binary files a/terminal/cli-tools/docs/demo/fzf-dark.gif and b/terminal/cli-tools/docs/demo/fzf-dark.gif differ diff --git a/terminal/cli-tools/docs/demo/fzf-dark.webp b/terminal/cli-tools/docs/demo/fzf-dark.webp index ce9482d..1ca1dec 100644 Binary files a/terminal/cli-tools/docs/demo/fzf-dark.webp and b/terminal/cli-tools/docs/demo/fzf-dark.webp differ diff --git a/terminal/cli-tools/docs/demo/fzf-light.gif b/terminal/cli-tools/docs/demo/fzf-light.gif index 9975db6..23a99a1 100644 Binary files a/terminal/cli-tools/docs/demo/fzf-light.gif and b/terminal/cli-tools/docs/demo/fzf-light.gif differ diff --git a/terminal/cli-tools/docs/demo/fzf-light.webp b/terminal/cli-tools/docs/demo/fzf-light.webp index 71f4b57..b5b8ab1 100644 Binary files a/terminal/cli-tools/docs/demo/fzf-light.webp and b/terminal/cli-tools/docs/demo/fzf-light.webp differ diff --git a/terminal/cli-tools/docs/demo/fzf-warm-dark.gif b/terminal/cli-tools/docs/demo/fzf-warm-dark.gif new file mode 100644 index 0000000..21b7dac Binary files /dev/null and b/terminal/cli-tools/docs/demo/fzf-warm-dark.gif differ diff --git a/terminal/cli-tools/docs/demo/fzf-warm-dark.webp b/terminal/cli-tools/docs/demo/fzf-warm-dark.webp new file mode 100644 index 0000000..1b6cd9e Binary files /dev/null and b/terminal/cli-tools/docs/demo/fzf-warm-dark.webp differ diff --git a/terminal/cli-tools/docs/demo/fzf-warm-light.gif b/terminal/cli-tools/docs/demo/fzf-warm-light.gif new file mode 100644 index 0000000..e66defe Binary files /dev/null and b/terminal/cli-tools/docs/demo/fzf-warm-light.gif differ diff --git a/terminal/cli-tools/docs/demo/fzf-warm-light.webp b/terminal/cli-tools/docs/demo/fzf-warm-light.webp new file mode 100644 index 0000000..a02eb98 Binary files /dev/null and b/terminal/cli-tools/docs/demo/fzf-warm-light.webp differ diff --git a/terminal/cli-tools/docs/demo/fzf-yellow-on-black.gif b/terminal/cli-tools/docs/demo/fzf-yellow-on-black.gif index 72d51d8..acbc88f 100644 Binary files a/terminal/cli-tools/docs/demo/fzf-yellow-on-black.gif and b/terminal/cli-tools/docs/demo/fzf-yellow-on-black.gif differ diff --git a/terminal/cli-tools/docs/demo/fzf-yellow-on-black.webp b/terminal/cli-tools/docs/demo/fzf-yellow-on-black.webp index fd11f64..b9b2021 100644 Binary files a/terminal/cli-tools/docs/demo/fzf-yellow-on-black.webp and b/terminal/cli-tools/docs/demo/fzf-yellow-on-black.webp differ diff --git a/terminal/cli-tools/docs/demo/lazygit-cream.gif b/terminal/cli-tools/docs/demo/lazygit-cream.gif index ee885cb..064739f 100644 Binary files a/terminal/cli-tools/docs/demo/lazygit-cream.gif and b/terminal/cli-tools/docs/demo/lazygit-cream.gif differ diff --git a/terminal/cli-tools/docs/demo/lazygit-cream.webp b/terminal/cli-tools/docs/demo/lazygit-cream.webp index 3afff68..25ddc07 100644 Binary files a/terminal/cli-tools/docs/demo/lazygit-cream.webp and b/terminal/cli-tools/docs/demo/lazygit-cream.webp differ diff --git a/terminal/cli-tools/docs/demo/lazygit-dark.gif b/terminal/cli-tools/docs/demo/lazygit-dark.gif index a5c6d01..bc032d3 100644 Binary files a/terminal/cli-tools/docs/demo/lazygit-dark.gif and b/terminal/cli-tools/docs/demo/lazygit-dark.gif differ diff --git a/terminal/cli-tools/docs/demo/lazygit-dark.webp b/terminal/cli-tools/docs/demo/lazygit-dark.webp index d278632..deaeda8 100644 Binary files a/terminal/cli-tools/docs/demo/lazygit-dark.webp and b/terminal/cli-tools/docs/demo/lazygit-dark.webp differ diff --git a/terminal/cli-tools/docs/demo/lazygit-light.gif b/terminal/cli-tools/docs/demo/lazygit-light.gif index 1093e9b..f71c2aa 100644 Binary files a/terminal/cli-tools/docs/demo/lazygit-light.gif and b/terminal/cli-tools/docs/demo/lazygit-light.gif differ diff --git a/terminal/cli-tools/docs/demo/lazygit-light.webp b/terminal/cli-tools/docs/demo/lazygit-light.webp index b01b0e9..f6653d3 100644 Binary files a/terminal/cli-tools/docs/demo/lazygit-light.webp and b/terminal/cli-tools/docs/demo/lazygit-light.webp differ diff --git a/terminal/cli-tools/docs/demo/lazygit-warm-dark.gif b/terminal/cli-tools/docs/demo/lazygit-warm-dark.gif new file mode 100644 index 0000000..fa6d188 Binary files /dev/null and b/terminal/cli-tools/docs/demo/lazygit-warm-dark.gif differ diff --git a/terminal/cli-tools/docs/demo/lazygit-warm-dark.webp b/terminal/cli-tools/docs/demo/lazygit-warm-dark.webp new file mode 100644 index 0000000..d231357 Binary files /dev/null and b/terminal/cli-tools/docs/demo/lazygit-warm-dark.webp differ diff --git a/terminal/cli-tools/docs/demo/lazygit-warm-light.gif b/terminal/cli-tools/docs/demo/lazygit-warm-light.gif new file mode 100644 index 0000000..2324c01 Binary files /dev/null and b/terminal/cli-tools/docs/demo/lazygit-warm-light.gif differ diff --git a/terminal/cli-tools/docs/demo/lazygit-warm-light.webp b/terminal/cli-tools/docs/demo/lazygit-warm-light.webp new file mode 100644 index 0000000..c6b6ca5 Binary files /dev/null and b/terminal/cli-tools/docs/demo/lazygit-warm-light.webp differ diff --git a/terminal/cli-tools/docs/demo/lazygit-yellow-on-black.gif b/terminal/cli-tools/docs/demo/lazygit-yellow-on-black.gif index 24b4f8e..b1749a4 100644 Binary files a/terminal/cli-tools/docs/demo/lazygit-yellow-on-black.gif and b/terminal/cli-tools/docs/demo/lazygit-yellow-on-black.gif differ diff --git a/terminal/cli-tools/docs/demo/lazygit-yellow-on-black.webp b/terminal/cli-tools/docs/demo/lazygit-yellow-on-black.webp index def52fb..b439f35 100644 Binary files a/terminal/cli-tools/docs/demo/lazygit-yellow-on-black.webp and b/terminal/cli-tools/docs/demo/lazygit-yellow-on-black.webp differ diff --git a/terminal/nano/README.md b/terminal/nano/README.md index fbb7b1c..6dffd35 100644 --- a/terminal/nano/README.md +++ b/terminal/nano/README.md @@ -1,6 +1,6 @@ # nano themes -GNU nano in the eight Zacess themes, so the editor matches the terminal around it. +GNU nano in the ten Zacess themes, so the editor matches the terminal around it. ## What is here diff --git a/terminal/nano/themes/zacess-warm-dark.nanorc b/terminal/nano/themes/zacess-warm-dark.nanorc new file mode 100644 index 0000000..91b37cf --- /dev/null +++ b/terminal/nano/themes/zacess-warm-dark.nanorc @@ -0,0 +1,15 @@ +# Zacess Warm Dark +# generated by scripts/build-themes.py from palette/zacess.json, do not edit by hand +# a fragment zt copies into nano's own rc file: nano accepts set only there, never in an include + +set titlecolor bold,#211,#eb6 +set statuscolor #211,#eb6 +set promptcolor #211,#eb6 +set minicolor #211,#eb6 +set errorcolor bold,#211,#f98 +set keycolor bold,#211,#eb6 +set functioncolor #edb +set numbercolor #cba +set selectedcolor #211,#7bd +set spotlightcolor #edb,#530 +set scrollercolor #cba diff --git a/terminal/nano/themes/zacess-warm-light.nanorc b/terminal/nano/themes/zacess-warm-light.nanorc new file mode 100644 index 0000000..8d15e59 --- /dev/null +++ b/terminal/nano/themes/zacess-warm-light.nanorc @@ -0,0 +1,15 @@ +# Zacess Warm Light +# generated by scripts/build-themes.py from palette/zacess.json, do not edit by hand +# a fragment zt copies into nano's own rc file: nano accepts set only there, never in an include + +set titlecolor bold,#fed,#630 +set statuscolor #fed,#630 +set promptcolor #fed,#630 +set minicolor #fed,#630 +set errorcolor bold,#fed,#811 +set keycolor bold,#fed,#630 +set functioncolor #321 +set numbercolor #432 +set selectedcolor #fed,#257 +set spotlightcolor #321,#fc3 +set scrollercolor #432 diff --git a/terminal/terminal/ACCESSIBILITY.md b/terminal/terminal/ACCESSIBILITY.md index 2160155..bdde0d6 100644 --- a/terminal/terminal/ACCESSIBILITY.md +++ b/terminal/terminal/ACCESSIBILITY.md @@ -1,10 +1,14 @@ # Accessibility -Every config in this folder is chosen for readability first. Every terminal shares the eight Zacess themes with Zacess Deep Contrast Dark as the default, so switching terminals changes nothing about how text reads. +Every config in this folder is chosen for readability first. Every terminal shares the ten Zacess themes with Zacess Deep Contrast Dark as the default, so switching terminals changes nothing about how text reads. > [!NOTE] > Some of these settings are preferences rather than requirements. Change them freely in your own copy. If a change would help other people too, open an issue or a pull request so I can consider it for everyone. +> [!NOTE] +> Zacess Warm Dark and Zacess Warm Light are the gentler pair, for anyone who finds high contrast +> too intense. Their text and terminal colours are held to WCAG AA (4.5:1) rather than 7:1. + ## Vision | Need | Setting | diff --git a/terminal/terminal/README.md b/terminal/terminal/README.md index 22abf54..e458cb4 100644 --- a/terminal/terminal/README.md +++ b/terminal/terminal/README.md @@ -1,6 +1,6 @@ # terminal -> The eight Zacess colour themes for Terminal.app, iTerm2, Windows Terminal, Ptyxis, GNOME +> The ten Zacess colour themes for Terminal.app, iTerm2, Windows Terminal, Ptyxis, GNOME > Terminal, Alacritty, Kitty and Hyper, with Zacess Deep Contrast Dark as the default, plus starter > configs with per-platform fonts. @@ -45,7 +45,7 @@ and Cream. ## What's here -Every terminal gets all eight Zacess themes from [Zacess Themes](https://github.com/zacesshq/themes), +Every terminal gets all ten Zacess themes from [Zacess Themes](https://github.com/zacesshq/themes), with Zacess Deep Contrast Dark as the default: white on pure black with deep, fully saturated colours. The theme stays fixed whatever the system appearance until it is changed. The colours live in one file, [`palette/zacess.json`](palette/zacess.json). @@ -73,7 +73,7 @@ on each platform. Palette and font choices are explained in [guides/reference.md | Path | Contents | | --- | --- | | [`ACCESSIBILITY.md`](ACCESSIBILITY.md) | Light and dark contrast, opaque windows and font sizing | -| [`palette/`](palette/) | The eight Zacess themes' terminal colours, the single source for every colour | +| [`palette/`](palette/) | The ten Zacess themes' terminal colours, the single source for every colour | | [`scripts/`](scripts/) | `build-themes.py` writes every theme file from the palette and `sync-palette.py` copies the palette from a pinned Zacess Themes release | | `//` | That terminal's config file for that platform | | [`guides/`](guides/) | Setup walkthrough and reference | diff --git a/terminal/terminal/docs/demo/neovim-cream.webp b/terminal/terminal/docs/demo/neovim-cream.webp index 0db88f5..96cfa28 100644 Binary files a/terminal/terminal/docs/demo/neovim-cream.webp and b/terminal/terminal/docs/demo/neovim-cream.webp differ diff --git a/terminal/terminal/docs/demo/neovim-dark.webp b/terminal/terminal/docs/demo/neovim-dark.webp index 0f960d0..5263b3b 100644 Binary files a/terminal/terminal/docs/demo/neovim-dark.webp and b/terminal/terminal/docs/demo/neovim-dark.webp differ diff --git a/terminal/terminal/docs/demo/neovim-light.webp b/terminal/terminal/docs/demo/neovim-light.webp index 774b797..50b10a0 100644 Binary files a/terminal/terminal/docs/demo/neovim-light.webp and b/terminal/terminal/docs/demo/neovim-light.webp differ diff --git a/terminal/terminal/docs/demo/neovim-yellow-on-black.webp b/terminal/terminal/docs/demo/neovim-yellow-on-black.webp index fd98f15..cc0ba2c 100644 Binary files a/terminal/terminal/docs/demo/neovim-yellow-on-black.webp and b/terminal/terminal/docs/demo/neovim-yellow-on-black.webp differ diff --git a/terminal/terminal/docs/demo/shell-cream.webp b/terminal/terminal/docs/demo/shell-cream.webp index f4f91e8..80d2bcd 100644 Binary files a/terminal/terminal/docs/demo/shell-cream.webp and b/terminal/terminal/docs/demo/shell-cream.webp differ diff --git a/terminal/terminal/docs/demo/shell-dark.webp b/terminal/terminal/docs/demo/shell-dark.webp index ca7dff6..100d880 100644 Binary files a/terminal/terminal/docs/demo/shell-dark.webp and b/terminal/terminal/docs/demo/shell-dark.webp differ diff --git a/terminal/terminal/docs/demo/shell-light.webp b/terminal/terminal/docs/demo/shell-light.webp index 2fd392a..9fca163 100644 Binary files a/terminal/terminal/docs/demo/shell-light.webp and b/terminal/terminal/docs/demo/shell-light.webp differ diff --git a/terminal/terminal/docs/demo/shell-yellow-on-black.webp b/terminal/terminal/docs/demo/shell-yellow-on-black.webp index 496a8a8..51e7470 100644 Binary files a/terminal/terminal/docs/demo/shell-yellow-on-black.webp and b/terminal/terminal/docs/demo/shell-yellow-on-black.webp differ diff --git a/terminal/terminal/docs/demo/terminal-cream.gif b/terminal/terminal/docs/demo/terminal-cream.gif index cf1ce52..f75df90 100644 Binary files a/terminal/terminal/docs/demo/terminal-cream.gif and b/terminal/terminal/docs/demo/terminal-cream.gif differ diff --git a/terminal/terminal/docs/demo/terminal-dark.gif b/terminal/terminal/docs/demo/terminal-dark.gif index a2e1157..0e7644f 100644 Binary files a/terminal/terminal/docs/demo/terminal-dark.gif and b/terminal/terminal/docs/demo/terminal-dark.gif differ diff --git a/terminal/terminal/docs/demo/terminal-light.gif b/terminal/terminal/docs/demo/terminal-light.gif index 3553ea8..70b0ab6 100644 Binary files a/terminal/terminal/docs/demo/terminal-light.gif and b/terminal/terminal/docs/demo/terminal-light.gif differ diff --git a/terminal/terminal/docs/demo/terminal-yellow-on-black.gif b/terminal/terminal/docs/demo/terminal-yellow-on-black.gif index adb4168..f368ceb 100644 Binary files a/terminal/terminal/docs/demo/terminal-yellow-on-black.gif and b/terminal/terminal/docs/demo/terminal-yellow-on-black.gif differ diff --git a/terminal/terminal/docs/demo/tmux-cream.gif b/terminal/terminal/docs/demo/tmux-cream.gif index 0cd0933..d7c0681 100644 Binary files a/terminal/terminal/docs/demo/tmux-cream.gif and b/terminal/terminal/docs/demo/tmux-cream.gif differ diff --git a/terminal/terminal/docs/demo/tmux-cream.webp b/terminal/terminal/docs/demo/tmux-cream.webp index 4a510cb..f98768e 100644 Binary files a/terminal/terminal/docs/demo/tmux-cream.webp and b/terminal/terminal/docs/demo/tmux-cream.webp differ diff --git a/terminal/terminal/docs/demo/tmux-dark.gif b/terminal/terminal/docs/demo/tmux-dark.gif index 4f660f2..09f527b 100644 Binary files a/terminal/terminal/docs/demo/tmux-dark.gif and b/terminal/terminal/docs/demo/tmux-dark.gif differ diff --git a/terminal/terminal/docs/demo/tmux-dark.webp b/terminal/terminal/docs/demo/tmux-dark.webp index db8dc86..4220ce2 100644 Binary files a/terminal/terminal/docs/demo/tmux-dark.webp and b/terminal/terminal/docs/demo/tmux-dark.webp differ diff --git a/terminal/terminal/docs/demo/tmux-light.gif b/terminal/terminal/docs/demo/tmux-light.gif index 71b5964..c96c687 100644 Binary files a/terminal/terminal/docs/demo/tmux-light.gif and b/terminal/terminal/docs/demo/tmux-light.gif differ diff --git a/terminal/terminal/docs/demo/tmux-light.webp b/terminal/terminal/docs/demo/tmux-light.webp index 9fcaea9..da2dc0d 100644 Binary files a/terminal/terminal/docs/demo/tmux-light.webp and b/terminal/terminal/docs/demo/tmux-light.webp differ diff --git a/terminal/terminal/docs/demo/tmux-yellow-on-black.gif b/terminal/terminal/docs/demo/tmux-yellow-on-black.gif index 7b94314..66167ca 100644 Binary files a/terminal/terminal/docs/demo/tmux-yellow-on-black.gif and b/terminal/terminal/docs/demo/tmux-yellow-on-black.gif differ diff --git a/terminal/terminal/docs/demo/tmux-yellow-on-black.webp b/terminal/terminal/docs/demo/tmux-yellow-on-black.webp index 2951dbc..4fa61ef 100644 Binary files a/terminal/terminal/docs/demo/tmux-yellow-on-black.webp and b/terminal/terminal/docs/demo/tmux-yellow-on-black.webp differ diff --git a/terminal/terminal/guides/setup.md b/terminal/terminal/guides/setup.md index 42c0996..f07ed63 100644 --- a/terminal/terminal/guides/setup.md +++ b/terminal/terminal/guides/setup.md @@ -15,7 +15,7 @@ does not exist. Restart the terminal afterwards. Alacritty imports `zacess-deep-contrast-dark.toml` from the same folder and Kitty includes `zacess-deep-contrast-dark.conf`, so copy the `zacess-*` files alongside the main config. Change -that one line to switch theme. The eight themes and how each terminal switches are in +that one line to switch theme. The ten themes and how each terminal switches are in [themes.md](themes.md). ### macOS @@ -24,7 +24,7 @@ that one line to switch theme. The eight themes and how each terminal switches a ./mac/install.sh ``` -It adds a Terminal.app profile for each of the eight themes and makes Zacess Deep Contrast Dark the +It adds a Terminal.app profile for each of the ten themes and makes Zacess Deep Contrast Dark the default, links the iTerm2 Dynamic Profiles and makes Zacess Deep Contrast Dark iTerm2's default, then links the Kitty, Alacritty and Ghostty theme files for any already set up. It also builds the helper that switches Terminal.app with the system, without starting it. @@ -47,7 +47,7 @@ helper that switches Terminal.app with the system, without starting it. ### Windows Terminal Copy `windows/windows-terminal/zacess.json` to -`%LOCALAPPDATA%\Microsoft\Windows Terminal\Fragments\Zacess\`, which adds all eight schemes, then +`%LOCALAPPDATA%\Microsoft\Windows Terminal\Fragments\Zacess\`, which adds all ten schemes, then set the colour scheme in `settings.json`: ```json diff --git a/terminal/terminal/guides/themes.md b/terminal/terminal/guides/themes.md index c00568c..4789bfd 100644 --- a/terminal/terminal/guides/themes.md +++ b/terminal/terminal/guides/themes.md @@ -1,6 +1,6 @@ # Zacess themes -All eight Zacess themes, with the terminal colours from the +All ten Zacess themes, with the terminal colours from the [Zacess Themes](https://github.com/zacesshq/themes) release pinned in `palette/zacess.json`, are installed in every terminal this folder covers. Zacess Deep Contrast Dark is the default. No terminal follows the system light and dark setting unless that is turned on, so the theme stays where it was put. @@ -15,6 +15,8 @@ setting unless that is turned on, so the theme stays where it was put. | Zacess Light | `light` | Near-black on white | | Zacess Yellow on Black | `yellow` | Yellow text on black | | Zacess Cream | `cream` | Black on a cream background | +| Zacess Warm Dark | `warm-dark` | Warm cream on a deep brown, earthy colours at WCAG AA (4.5:1) | +| Zacess Warm Light | `warm-light` | Dark brown on warm paper, earthy colours at WCAG AA (4.5:1) | ## Switching theme @@ -50,7 +52,10 @@ generated file is out of date or a colour drops below its contrast floor: text a background, every terminal colour at 7:1 except the slots a theme marks as dim (4.5:1, so the light themes stay vivid) and Deep Contrast Dark's ANSI black, which is true black for use as a background, the selection text and search matches at 4.5:1 over their highlight, the message line pair at 7:1 -and the pane borders at 3:1. Bold text keeps its colour in every terminal. +and the pane borders at 3:1. Zacess Warm Dark and Zacess Warm Light set their own text floor of +4.5:1 (WCAG AA) in the upstream palette, the gentler pair for anyone who finds high contrast too +intense, so their text, terminal colours and message line are held to 4.5:1 instead of 7:1. Bold +text keeps its colour in every terminal. Each theme's selection is a solid block with its own text colour, the pair Zacess Themes ships for terminals, so a selection is never a faint tint. `zt` reads that block from the generated terminal @@ -178,6 +183,36 @@ Short name `deep-light`, light. Text `#000000` on `#ffffff` (21.0:1). | magenta | `#cd01cd` (4.7:1) | `#db009a` (4.7:1) | | cyan | `#016e78` (6.0:1) | `#0178c1` (4.7:1) | | white | `#595959` (7.0:1) | `#000000` (21.0:1) | + +### Zacess Warm Dark + +Short name `warm-dark`, dark. Text `#e5d5b6` on `#211b17` (11.8:1). + +| Colour | Normal | Bright | +| --- | --- | --- | +| black | `#ada398` (6.9:1) | `#b9b1a9` (8.0:1) | +| red | `#fc9a8d` (8.2:1) | `#fee4e0` (14.1:1) | +| green | `#a2be6f` (8.2:1) | `#d9f2b0` (14.0:1) | +| yellow | `#e4b35b` (8.8:1) | `#ffe9b6` (14.3:1) | +| blue | `#88b9e3` (8.2:1) | `#d7ecff` (14.0:1) | +| magenta | `#dfa1ca` (8.2:1) | `#ffe1f4` (14.0:1) | +| cyan | `#73c2b8` (8.2:1) | `#b1f7ed` (14.1:1) | +| white | `#cbc1b1` (9.6:1) | `#fbf1dc` (15.2:1) | + +### Zacess Warm Light + +Short name `warm-light`, light. Text `#342410` on `#f4ead5` (12.5:1). + +| Colour | Normal | Bright | +| --- | --- | --- | +| black | `#342410` (12.5:1) | `#60574c` (5.9:1) | +| red | `#8c1a16` (7.7:1) | `#a4332b` (5.7:1) | +| green | `#275200` (7.7:1) | `#386616` (5.7:1) | +| yellow | `#6a4603` (7.1:1) | `#845701` (5.3:1) | +| blue | `#014b79` (7.7:1) | `#115f93` (5.7:1) | +| magenta | `#742c60` (7.7:1) | `#8a4074` (5.7:1) | +| cyan | `#05514d` (7.7:1) | `#066662` (5.7:1) | +| white | `#574e44` (6.8:1) | `#342410` (12.5:1) | ## Where each terminal gets them @@ -191,7 +226,7 @@ Short name `deep-light`, light. Text `#000000` on `#ffffff` (21.0:1). | Ghostty | `/ghostty/zacess-*` | | tmux | `../tmux/themes/zacess-*.conf`: the status bar, message line, copy mode, search matches and pane borders | | Hyper | `/hyper/hyper.js` | -| Windows Terminal | [`windows/windows-terminal/zacess.json`](../windows/windows-terminal/zacess.json), a fragment with all eight schemes | +| Windows Terminal | [`windows/windows-terminal/zacess.json`](../windows/windows-terminal/zacess.json), a fragment with all ten schemes | | Ptyxis | `linux/ptyxis/zacess-*.palette` | | GNOME Terminal | `linux/gnome-terminal/zacess-*.dconf` | diff --git a/terminal/terminal/linux/alacritty/alacritty.toml b/terminal/terminal/linux/alacritty/alacritty.toml index 380085b..9bd560c 100644 --- a/terminal/terminal/linux/alacritty/alacritty.toml +++ b/terminal/terminal/linux/alacritty/alacritty.toml @@ -1,4 +1,4 @@ -# High-contrast starter config. All eight Zacess themes sit in this folder (zacess-*.toml, from +# High-contrast starter config. All ten Zacess themes sit in this folder (zacess-*.toml, from # palette/zacess.json) and the import below picks one, Zacess Deep Contrast Dark by default. # Alacritty cannot follow the system light and dark setting, so change the import to switch. diff --git a/terminal/terminal/linux/alacritty/zacess-warm-dark.toml b/terminal/terminal/linux/alacritty/zacess-warm-dark.toml new file mode 100644 index 0000000..a1b438d --- /dev/null +++ b/terminal/terminal/linux/alacritty/zacess-warm-dark.toml @@ -0,0 +1,34 @@ +# Zacess Warm Dark +# generated by scripts/build-themes.py from palette/zacess.json, do not edit by hand + +[colors.primary] +background = "#211b17" +foreground = "#e5d5b6" + +[colors.cursor] +cursor = "#fec9a7" +text = "#211b17" + +[colors.selection] +background = "#7abad3" +text = "#211b17" + +[colors.normal] +black = "#ada398" +red = "#fc9a8d" +green = "#a2be6f" +yellow = "#e4b35b" +blue = "#88b9e3" +magenta = "#dfa1ca" +cyan = "#73c2b8" +white = "#cbc1b1" + +[colors.bright] +black = "#b9b1a9" +red = "#fee4e0" +green = "#d9f2b0" +yellow = "#ffe9b6" +blue = "#d7ecff" +magenta = "#ffe1f4" +cyan = "#b1f7ed" +white = "#fbf1dc" diff --git a/terminal/terminal/linux/alacritty/zacess-warm-light.toml b/terminal/terminal/linux/alacritty/zacess-warm-light.toml new file mode 100644 index 0000000..47ce236 --- /dev/null +++ b/terminal/terminal/linux/alacritty/zacess-warm-light.toml @@ -0,0 +1,34 @@ +# Zacess Warm Light +# generated by scripts/build-themes.py from palette/zacess.json, do not edit by hand + +[colors.primary] +background = "#f4ead5" +foreground = "#342410" + +[colors.cursor] +cursor = "#5b1301" +text = "#f4ead5" + +[colors.selection] +background = "#215779" +text = "#f4ead5" + +[colors.normal] +black = "#342410" +red = "#8c1a16" +green = "#275200" +yellow = "#6a4603" +blue = "#014b79" +magenta = "#742c60" +cyan = "#05514d" +white = "#574e44" + +[colors.bright] +black = "#60574c" +red = "#a4332b" +green = "#386616" +yellow = "#845701" +blue = "#115f93" +magenta = "#8a4074" +cyan = "#066662" +white = "#342410" diff --git a/terminal/terminal/linux/ghostty/README.md b/terminal/terminal/linux/ghostty/README.md index 2ff6f66..b7e92c3 100644 --- a/terminal/terminal/linux/ghostty/README.md +++ b/terminal/terminal/linux/ghostty/README.md @@ -1,7 +1,7 @@ # Ghostty Not installed on this machine yet. `config` in this folder is a recommended starter config, not a -real, applied setup. Colours come from the eight Zacess themes, one `zacess-*` file per theme +real, applied setup. Colours come from the ten Zacess themes, one `zacess-*` file per theme written by `scripts/build-themes.py`, see [guides/themes.md](../../guides/themes.md). The config sets `minimum-contrast` to 4.5, Ghostty's own floor for text over any background. Replace it with the real config once Ghostty is actually installed and configured. diff --git a/terminal/terminal/linux/ghostty/config b/terminal/terminal/linux/ghostty/config index a3ecc5e..e451631 100644 --- a/terminal/terminal/linux/ghostty/config +++ b/terminal/terminal/linux/ghostty/config @@ -1,5 +1,5 @@ # Recommended starter config, not yet applied since Ghostty is not installed on this machine. -# All eight Zacess themes sit in this folder (zacess-*, from palette/zacess.json); copy them +# All ten Zacess themes sit in this folder (zacess-*, from palette/zacess.json); copy them # into ~/.config/ghostty/themes and the theme line below picks one, Zacess Deep Contrast Dark # by default. `zt ` in the dotfiles rewrites that line and `zt auto` # writes a light and dark pair, which Ghostty follows with the system. diff --git a/terminal/terminal/linux/ghostty/zacess-warm-dark b/terminal/terminal/linux/ghostty/zacess-warm-dark new file mode 100644 index 0000000..3a00663 --- /dev/null +++ b/terminal/terminal/linux/ghostty/zacess-warm-dark @@ -0,0 +1,25 @@ +# Zacess Warm Dark +# generated by scripts/build-themes.py from palette/zacess.json, do not edit by hand + +palette = 0=#ada398 +palette = 1=#fc9a8d +palette = 2=#a2be6f +palette = 3=#e4b35b +palette = 4=#88b9e3 +palette = 5=#dfa1ca +palette = 6=#73c2b8 +palette = 7=#cbc1b1 +palette = 8=#b9b1a9 +palette = 9=#fee4e0 +palette = 10=#d9f2b0 +palette = 11=#ffe9b6 +palette = 12=#d7ecff +palette = 13=#ffe1f4 +palette = 14=#b1f7ed +palette = 15=#fbf1dc +background = #211b17 +foreground = #e5d5b6 +cursor-color = #fec9a7 +cursor-text = #211b17 +selection-background = #7abad3 +selection-foreground = #211b17 diff --git a/terminal/terminal/linux/ghostty/zacess-warm-light b/terminal/terminal/linux/ghostty/zacess-warm-light new file mode 100644 index 0000000..bf6c7c5 --- /dev/null +++ b/terminal/terminal/linux/ghostty/zacess-warm-light @@ -0,0 +1,25 @@ +# Zacess Warm Light +# generated by scripts/build-themes.py from palette/zacess.json, do not edit by hand + +palette = 0=#342410 +palette = 1=#8c1a16 +palette = 2=#275200 +palette = 3=#6a4603 +palette = 4=#014b79 +palette = 5=#742c60 +palette = 6=#05514d +palette = 7=#574e44 +palette = 8=#60574c +palette = 9=#a4332b +palette = 10=#386616 +palette = 11=#845701 +palette = 12=#115f93 +palette = 13=#8a4074 +palette = 14=#066662 +palette = 15=#342410 +background = #f4ead5 +foreground = #342410 +cursor-color = #5b1301 +cursor-text = #f4ead5 +selection-background = #215779 +selection-foreground = #f4ead5 diff --git a/terminal/terminal/linux/gnome-terminal/zacess-warm-dark.dconf b/terminal/terminal/linux/gnome-terminal/zacess-warm-dark.dconf new file mode 100644 index 0000000..f6d95f0 --- /dev/null +++ b/terminal/terminal/linux/gnome-terminal/zacess-warm-dark.dconf @@ -0,0 +1,16 @@ +# Zacess Warm Dark +# generated by scripts/build-themes.py from palette/zacess.json, do not edit by hand +# load with: dconf load /org/gnome/terminal/legacy/profiles:/:/ < zacess-warm-dark.dconf +[/] +visible-name='Zacess Warm Dark' +use-theme-colors=false +background-color='#211b17' +foreground-color='#e5d5b6' +bold-is-bright=false +cursor-colors-set=true +cursor-background-color='#fec9a7' +cursor-foreground-color='#211b17' +highlight-colors-set=true +highlight-background-color='#7abad3' +highlight-foreground-color='#211b17' +palette=['#ada398', '#fc9a8d', '#a2be6f', '#e4b35b', '#88b9e3', '#dfa1ca', '#73c2b8', '#cbc1b1', '#b9b1a9', '#fee4e0', '#d9f2b0', '#ffe9b6', '#d7ecff', '#ffe1f4', '#b1f7ed', '#fbf1dc'] diff --git a/terminal/terminal/linux/gnome-terminal/zacess-warm-light.dconf b/terminal/terminal/linux/gnome-terminal/zacess-warm-light.dconf new file mode 100644 index 0000000..3cc3d72 --- /dev/null +++ b/terminal/terminal/linux/gnome-terminal/zacess-warm-light.dconf @@ -0,0 +1,16 @@ +# Zacess Warm Light +# generated by scripts/build-themes.py from palette/zacess.json, do not edit by hand +# load with: dconf load /org/gnome/terminal/legacy/profiles:/:/ < zacess-warm-light.dconf +[/] +visible-name='Zacess Warm Light' +use-theme-colors=false +background-color='#f4ead5' +foreground-color='#342410' +bold-is-bright=false +cursor-colors-set=true +cursor-background-color='#5b1301' +cursor-foreground-color='#f4ead5' +highlight-colors-set=true +highlight-background-color='#215779' +highlight-foreground-color='#f4ead5' +palette=['#342410', '#8c1a16', '#275200', '#6a4603', '#014b79', '#742c60', '#05514d', '#574e44', '#60574c', '#a4332b', '#386616', '#845701', '#115f93', '#8a4074', '#066662', '#342410'] diff --git a/terminal/terminal/linux/kitty/kitty.conf b/terminal/terminal/linux/kitty/kitty.conf index 1e58752..7d6e600 100644 --- a/terminal/terminal/linux/kitty/kitty.conf +++ b/terminal/terminal/linux/kitty/kitty.conf @@ -1,4 +1,4 @@ -# High-contrast starter config. All eight Zacess themes sit in this folder (zacess-*.conf, from +# High-contrast starter config. All ten Zacess themes sit in this folder (zacess-*.conf, from # palette/zacess.json) and the include below picks one, Zacess Deep Contrast Dark by default. # The `zt` command in the dotfiles rewrites that line. `zt auto` writes dark-theme.auto.conf and # light-theme.auto.conf, which Kitty 0.38 and later follows with the system. diff --git a/terminal/terminal/linux/kitty/zacess-warm-dark.conf b/terminal/terminal/linux/kitty/zacess-warm-dark.conf new file mode 100644 index 0000000..1c78b20 --- /dev/null +++ b/terminal/terminal/linux/kitty/zacess-warm-dark.conf @@ -0,0 +1,24 @@ +# Zacess Warm Dark +# generated by scripts/build-themes.py from palette/zacess.json, do not edit by hand +background #211b17 +foreground #e5d5b6 +cursor #fec9a7 +cursor_text_color #211b17 +selection_background #7abad3 +selection_foreground #211b17 +color0 #ada398 +color1 #fc9a8d +color2 #a2be6f +color3 #e4b35b +color4 #88b9e3 +color5 #dfa1ca +color6 #73c2b8 +color7 #cbc1b1 +color8 #b9b1a9 +color9 #fee4e0 +color10 #d9f2b0 +color11 #ffe9b6 +color12 #d7ecff +color13 #ffe1f4 +color14 #b1f7ed +color15 #fbf1dc diff --git a/terminal/terminal/linux/kitty/zacess-warm-light.conf b/terminal/terminal/linux/kitty/zacess-warm-light.conf new file mode 100644 index 0000000..db9e6ec --- /dev/null +++ b/terminal/terminal/linux/kitty/zacess-warm-light.conf @@ -0,0 +1,24 @@ +# Zacess Warm Light +# generated by scripts/build-themes.py from palette/zacess.json, do not edit by hand +background #f4ead5 +foreground #342410 +cursor #5b1301 +cursor_text_color #f4ead5 +selection_background #215779 +selection_foreground #f4ead5 +color0 #342410 +color1 #8c1a16 +color2 #275200 +color3 #6a4603 +color4 #014b79 +color5 #742c60 +color6 #05514d +color7 #574e44 +color8 #60574c +color9 #a4332b +color10 #386616 +color11 #845701 +color12 #115f93 +color13 #8a4074 +color14 #066662 +color15 #342410 diff --git a/terminal/terminal/linux/ptyxis/zacess-warm-dark.palette b/terminal/terminal/linux/ptyxis/zacess-warm-dark.palette new file mode 100644 index 0000000..2575fa4 --- /dev/null +++ b/terminal/terminal/linux/ptyxis/zacess-warm-dark.palette @@ -0,0 +1,45 @@ +# generated by scripts/build-themes.py from palette/zacess.json, do not edit by hand +[Palette] +Name=Zacess Warm Dark + +[Light] +Foreground=#e5d5b6 +Background=#211b17 +Cursor=#fec9a7 +Color0=#ada398 +Color1=#fc9a8d +Color2=#a2be6f +Color3=#e4b35b +Color4=#88b9e3 +Color5=#dfa1ca +Color6=#73c2b8 +Color7=#cbc1b1 +Color8=#b9b1a9 +Color9=#fee4e0 +Color10=#d9f2b0 +Color11=#ffe9b6 +Color12=#d7ecff +Color13=#ffe1f4 +Color14=#b1f7ed +Color15=#fbf1dc + +[Dark] +Foreground=#e5d5b6 +Background=#211b17 +Cursor=#fec9a7 +Color0=#ada398 +Color1=#fc9a8d +Color2=#a2be6f +Color3=#e4b35b +Color4=#88b9e3 +Color5=#dfa1ca +Color6=#73c2b8 +Color7=#cbc1b1 +Color8=#b9b1a9 +Color9=#fee4e0 +Color10=#d9f2b0 +Color11=#ffe9b6 +Color12=#d7ecff +Color13=#ffe1f4 +Color14=#b1f7ed +Color15=#fbf1dc diff --git a/terminal/terminal/linux/ptyxis/zacess-warm-light.palette b/terminal/terminal/linux/ptyxis/zacess-warm-light.palette new file mode 100644 index 0000000..8b9bbda --- /dev/null +++ b/terminal/terminal/linux/ptyxis/zacess-warm-light.palette @@ -0,0 +1,45 @@ +# generated by scripts/build-themes.py from palette/zacess.json, do not edit by hand +[Palette] +Name=Zacess Warm Light + +[Light] +Foreground=#342410 +Background=#f4ead5 +Cursor=#5b1301 +Color0=#342410 +Color1=#8c1a16 +Color2=#275200 +Color3=#6a4603 +Color4=#014b79 +Color5=#742c60 +Color6=#05514d +Color7=#574e44 +Color8=#60574c +Color9=#a4332b +Color10=#386616 +Color11=#845701 +Color12=#115f93 +Color13=#8a4074 +Color14=#066662 +Color15=#342410 + +[Dark] +Foreground=#342410 +Background=#f4ead5 +Cursor=#5b1301 +Color0=#342410 +Color1=#8c1a16 +Color2=#275200 +Color3=#6a4603 +Color4=#014b79 +Color5=#742c60 +Color6=#05514d +Color7=#574e44 +Color8=#60574c +Color9=#a4332b +Color10=#386616 +Color11=#845701 +Color12=#115f93 +Color13=#8a4074 +Color14=#066662 +Color15=#342410 diff --git a/terminal/terminal/mac/alacritty/alacritty.toml b/terminal/terminal/mac/alacritty/alacritty.toml index 3c2b7c0..86cd24f 100644 --- a/terminal/terminal/mac/alacritty/alacritty.toml +++ b/terminal/terminal/mac/alacritty/alacritty.toml @@ -1,4 +1,4 @@ -# High-contrast starter config. All eight Zacess themes sit in this folder (zacess-*.toml, from +# High-contrast starter config. All ten Zacess themes sit in this folder (zacess-*.toml, from # palette/zacess.json) and the import below picks one, Zacess Deep Contrast Dark by default. # Alacritty cannot follow the system light and dark setting, so change the import to switch. diff --git a/terminal/terminal/mac/alacritty/zacess-warm-dark.toml b/terminal/terminal/mac/alacritty/zacess-warm-dark.toml new file mode 100644 index 0000000..a1b438d --- /dev/null +++ b/terminal/terminal/mac/alacritty/zacess-warm-dark.toml @@ -0,0 +1,34 @@ +# Zacess Warm Dark +# generated by scripts/build-themes.py from palette/zacess.json, do not edit by hand + +[colors.primary] +background = "#211b17" +foreground = "#e5d5b6" + +[colors.cursor] +cursor = "#fec9a7" +text = "#211b17" + +[colors.selection] +background = "#7abad3" +text = "#211b17" + +[colors.normal] +black = "#ada398" +red = "#fc9a8d" +green = "#a2be6f" +yellow = "#e4b35b" +blue = "#88b9e3" +magenta = "#dfa1ca" +cyan = "#73c2b8" +white = "#cbc1b1" + +[colors.bright] +black = "#b9b1a9" +red = "#fee4e0" +green = "#d9f2b0" +yellow = "#ffe9b6" +blue = "#d7ecff" +magenta = "#ffe1f4" +cyan = "#b1f7ed" +white = "#fbf1dc" diff --git a/terminal/terminal/mac/alacritty/zacess-warm-light.toml b/terminal/terminal/mac/alacritty/zacess-warm-light.toml new file mode 100644 index 0000000..47ce236 --- /dev/null +++ b/terminal/terminal/mac/alacritty/zacess-warm-light.toml @@ -0,0 +1,34 @@ +# Zacess Warm Light +# generated by scripts/build-themes.py from palette/zacess.json, do not edit by hand + +[colors.primary] +background = "#f4ead5" +foreground = "#342410" + +[colors.cursor] +cursor = "#5b1301" +text = "#f4ead5" + +[colors.selection] +background = "#215779" +text = "#f4ead5" + +[colors.normal] +black = "#342410" +red = "#8c1a16" +green = "#275200" +yellow = "#6a4603" +blue = "#014b79" +magenta = "#742c60" +cyan = "#05514d" +white = "#574e44" + +[colors.bright] +black = "#60574c" +red = "#a4332b" +green = "#386616" +yellow = "#845701" +blue = "#115f93" +magenta = "#8a4074" +cyan = "#066662" +white = "#342410" diff --git a/terminal/terminal/mac/ghostty/README.md b/terminal/terminal/mac/ghostty/README.md index 2ff6f66..b7e92c3 100644 --- a/terminal/terminal/mac/ghostty/README.md +++ b/terminal/terminal/mac/ghostty/README.md @@ -1,7 +1,7 @@ # Ghostty Not installed on this machine yet. `config` in this folder is a recommended starter config, not a -real, applied setup. Colours come from the eight Zacess themes, one `zacess-*` file per theme +real, applied setup. Colours come from the ten Zacess themes, one `zacess-*` file per theme written by `scripts/build-themes.py`, see [guides/themes.md](../../guides/themes.md). The config sets `minimum-contrast` to 4.5, Ghostty's own floor for text over any background. Replace it with the real config once Ghostty is actually installed and configured. diff --git a/terminal/terminal/mac/ghostty/config b/terminal/terminal/mac/ghostty/config index d0f974f..d883bd3 100644 --- a/terminal/terminal/mac/ghostty/config +++ b/terminal/terminal/mac/ghostty/config @@ -1,5 +1,5 @@ # Recommended starter config, not yet applied since Ghostty is not installed on this machine. -# All eight Zacess themes sit in this folder (zacess-*, from palette/zacess.json); mac/install.sh +# All ten Zacess themes sit in this folder (zacess-*, from palette/zacess.json); mac/install.sh # links them into ~/.config/ghostty/themes and the theme line below picks one, Zacess Deep # Contrast Dark by default. `zt ` in the dotfiles rewrites that line and `zt auto` # writes a light and dark pair, which Ghostty follows with the system. diff --git a/terminal/terminal/mac/ghostty/zacess-warm-dark b/terminal/terminal/mac/ghostty/zacess-warm-dark new file mode 100644 index 0000000..3a00663 --- /dev/null +++ b/terminal/terminal/mac/ghostty/zacess-warm-dark @@ -0,0 +1,25 @@ +# Zacess Warm Dark +# generated by scripts/build-themes.py from palette/zacess.json, do not edit by hand + +palette = 0=#ada398 +palette = 1=#fc9a8d +palette = 2=#a2be6f +palette = 3=#e4b35b +palette = 4=#88b9e3 +palette = 5=#dfa1ca +palette = 6=#73c2b8 +palette = 7=#cbc1b1 +palette = 8=#b9b1a9 +palette = 9=#fee4e0 +palette = 10=#d9f2b0 +palette = 11=#ffe9b6 +palette = 12=#d7ecff +palette = 13=#ffe1f4 +palette = 14=#b1f7ed +palette = 15=#fbf1dc +background = #211b17 +foreground = #e5d5b6 +cursor-color = #fec9a7 +cursor-text = #211b17 +selection-background = #7abad3 +selection-foreground = #211b17 diff --git a/terminal/terminal/mac/ghostty/zacess-warm-light b/terminal/terminal/mac/ghostty/zacess-warm-light new file mode 100644 index 0000000..bf6c7c5 --- /dev/null +++ b/terminal/terminal/mac/ghostty/zacess-warm-light @@ -0,0 +1,25 @@ +# Zacess Warm Light +# generated by scripts/build-themes.py from palette/zacess.json, do not edit by hand + +palette = 0=#342410 +palette = 1=#8c1a16 +palette = 2=#275200 +palette = 3=#6a4603 +palette = 4=#014b79 +palette = 5=#742c60 +palette = 6=#05514d +palette = 7=#574e44 +palette = 8=#60574c +palette = 9=#a4332b +palette = 10=#386616 +palette = 11=#845701 +palette = 12=#115f93 +palette = 13=#8a4074 +palette = 14=#066662 +palette = 15=#342410 +background = #f4ead5 +foreground = #342410 +cursor-color = #5b1301 +cursor-text = #f4ead5 +selection-background = #215779 +selection-foreground = #f4ead5 diff --git a/terminal/terminal/mac/install.sh b/terminal/terminal/mac/install.sh index 27f42ee..bf62064 100755 --- a/terminal/terminal/mac/install.sh +++ b/terminal/terminal/mac/install.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# installs all eight Zacess themes in every Mac terminal this repo covers and makes Zacess Deep +# installs all ten Zacess themes in every Mac terminal this repo covers and makes Zacess Deep # Contrast Dark the default. Safe to run again: each step checks what is already in place first. # Terminal.app and iTerm2 are set up always; Kitty, Alacritty and Ghostty only when their config # folder already exists. Nothing follows the system appearance here: `zt auto` in the dotfiles turns @@ -131,4 +131,4 @@ terminal_app appearance_helper iterm2 optional_apps -ok "All eight Zacess themes installed, ${DEFAULT_THEME} is the default" +ok "All ten Zacess themes installed, ${DEFAULT_THEME} is the default" diff --git a/terminal/terminal/mac/iterm2/zacess.json b/terminal/terminal/mac/iterm2/zacess.json index be1bfdf..cd3a123 100644 --- a/terminal/terminal/mac/iterm2/zacess.json +++ b/terminal/terminal/mac/iterm2/zacess.json @@ -1367,6 +1367,348 @@ "Alpha Component": 1, "Color Space": "sRGB" } + }, + { + "Name": "Zacess Warm Dark", + "Guid": "71e944f5-710d-5c79-8514-8e9e26bcb96b", + "Dynamic Profile Parent Name": "Default", + "Normal Font": "GeistMonoNFM 12", + "Non Ascii Font": "GeistMonoNFM 12", + "Use Separate Colors for Light and Dark Mode": false, + "Use Bright Bold": false, + "Minimum Contrast": 0.5, + "Background Color": { + "Red Component": 0.12941176470588237, + "Green Component": 0.10588235294117647, + "Blue Component": 0.09019607843137255, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Foreground Color": { + "Red Component": 0.8980392156862745, + "Green Component": 0.8352941176470589, + "Blue Component": 0.7137254901960784, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Bold Color": { + "Red Component": 0.8980392156862745, + "Green Component": 0.8352941176470589, + "Blue Component": 0.7137254901960784, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Cursor Color": { + "Red Component": 0.996078431372549, + "Green Component": 0.788235294117647, + "Blue Component": 0.6549019607843137, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Cursor Text Color": { + "Red Component": 0.12941176470588237, + "Green Component": 0.10588235294117647, + "Blue Component": 0.09019607843137255, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Selection Color": { + "Red Component": 0.47843137254901963, + "Green Component": 0.7294117647058823, + "Blue Component": 0.8274509803921568, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Selected Text Color": { + "Red Component": 0.12941176470588237, + "Green Component": 0.10588235294117647, + "Blue Component": 0.09019607843137255, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 0 Color": { + "Red Component": 0.6784313725490196, + "Green Component": 0.6392156862745098, + "Blue Component": 0.596078431372549, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 1 Color": { + "Red Component": 0.9882352941176471, + "Green Component": 0.6039215686274509, + "Blue Component": 0.5529411764705883, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 2 Color": { + "Red Component": 0.6352941176470588, + "Green Component": 0.7450980392156863, + "Blue Component": 0.43529411764705883, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 3 Color": { + "Red Component": 0.8941176470588236, + "Green Component": 0.7019607843137254, + "Blue Component": 0.3568627450980392, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 4 Color": { + "Red Component": 0.5333333333333333, + "Green Component": 0.7254901960784313, + "Blue Component": 0.8901960784313725, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 5 Color": { + "Red Component": 0.8745098039215686, + "Green Component": 0.6313725490196078, + "Blue Component": 0.792156862745098, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 6 Color": { + "Red Component": 0.45098039215686275, + "Green Component": 0.7607843137254902, + "Blue Component": 0.7215686274509804, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 7 Color": { + "Red Component": 0.796078431372549, + "Green Component": 0.7568627450980392, + "Blue Component": 0.6941176470588235, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 8 Color": { + "Red Component": 0.7254901960784313, + "Green Component": 0.6941176470588235, + "Blue Component": 0.6627450980392157, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 9 Color": { + "Red Component": 0.996078431372549, + "Green Component": 0.8941176470588236, + "Blue Component": 0.8784313725490196, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 10 Color": { + "Red Component": 0.8509803921568627, + "Green Component": 0.9490196078431372, + "Blue Component": 0.6901960784313725, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 11 Color": { + "Red Component": 1.0, + "Green Component": 0.9137254901960784, + "Blue Component": 0.7137254901960784, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 12 Color": { + "Red Component": 0.8431372549019608, + "Green Component": 0.9254901960784314, + "Blue Component": 1.0, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 13 Color": { + "Red Component": 1.0, + "Green Component": 0.8823529411764706, + "Blue Component": 0.9568627450980393, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 14 Color": { + "Red Component": 0.6941176470588235, + "Green Component": 0.9686274509803922, + "Blue Component": 0.9294117647058824, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 15 Color": { + "Red Component": 0.984313725490196, + "Green Component": 0.9450980392156862, + "Blue Component": 0.8627450980392157, + "Alpha Component": 1, + "Color Space": "sRGB" + } + }, + { + "Name": "Zacess Warm Light", + "Guid": "82cfe175-817a-5f71-81de-2f64aea6a8c0", + "Dynamic Profile Parent Name": "Default", + "Normal Font": "GeistMonoNFM 12", + "Non Ascii Font": "GeistMonoNFM 12", + "Use Separate Colors for Light and Dark Mode": false, + "Use Bright Bold": false, + "Minimum Contrast": 0.5, + "Background Color": { + "Red Component": 0.9568627450980393, + "Green Component": 0.9176470588235294, + "Blue Component": 0.8352941176470589, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Foreground Color": { + "Red Component": 0.20392156862745098, + "Green Component": 0.1411764705882353, + "Blue Component": 0.06274509803921569, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Bold Color": { + "Red Component": 0.20392156862745098, + "Green Component": 0.1411764705882353, + "Blue Component": 0.06274509803921569, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Cursor Color": { + "Red Component": 0.3568627450980392, + "Green Component": 0.07450980392156863, + "Blue Component": 0.00392156862745098, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Cursor Text Color": { + "Red Component": 0.9568627450980393, + "Green Component": 0.9176470588235294, + "Blue Component": 0.8352941176470589, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Selection Color": { + "Red Component": 0.12941176470588237, + "Green Component": 0.3411764705882353, + "Blue Component": 0.4745098039215686, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Selected Text Color": { + "Red Component": 0.9568627450980393, + "Green Component": 0.9176470588235294, + "Blue Component": 0.8352941176470589, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 0 Color": { + "Red Component": 0.20392156862745098, + "Green Component": 0.1411764705882353, + "Blue Component": 0.06274509803921569, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 1 Color": { + "Red Component": 0.5490196078431373, + "Green Component": 0.10196078431372549, + "Blue Component": 0.08627450980392157, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 2 Color": { + "Red Component": 0.15294117647058825, + "Green Component": 0.3215686274509804, + "Blue Component": 0.0, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 3 Color": { + "Red Component": 0.41568627450980394, + "Green Component": 0.27450980392156865, + "Blue Component": 0.011764705882352941, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 4 Color": { + "Red Component": 0.00392156862745098, + "Green Component": 0.29411764705882354, + "Blue Component": 0.4745098039215686, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 5 Color": { + "Red Component": 0.4549019607843137, + "Green Component": 0.17254901960784313, + "Blue Component": 0.3764705882352941, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 6 Color": { + "Red Component": 0.0196078431372549, + "Green Component": 0.3176470588235294, + "Blue Component": 0.30196078431372547, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 7 Color": { + "Red Component": 0.3411764705882353, + "Green Component": 0.3058823529411765, + "Blue Component": 0.26666666666666666, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 8 Color": { + "Red Component": 0.3764705882352941, + "Green Component": 0.3411764705882353, + "Blue Component": 0.2980392156862745, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 9 Color": { + "Red Component": 0.6431372549019608, + "Green Component": 0.2, + "Blue Component": 0.16862745098039217, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 10 Color": { + "Red Component": 0.2196078431372549, + "Green Component": 0.4, + "Blue Component": 0.08627450980392157, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 11 Color": { + "Red Component": 0.5176470588235295, + "Green Component": 0.3411764705882353, + "Blue Component": 0.00392156862745098, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 12 Color": { + "Red Component": 0.06666666666666667, + "Green Component": 0.37254901960784315, + "Blue Component": 0.5764705882352941, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 13 Color": { + "Red Component": 0.5411764705882353, + "Green Component": 0.25098039215686274, + "Blue Component": 0.4549019607843137, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 14 Color": { + "Red Component": 0.023529411764705882, + "Green Component": 0.4, + "Blue Component": 0.3843137254901961, + "Alpha Component": 1, + "Color Space": "sRGB" + }, + "Ansi 15 Color": { + "Red Component": 0.20392156862745098, + "Green Component": 0.1411764705882353, + "Blue Component": 0.06274509803921569, + "Alpha Component": 1, + "Color Space": "sRGB" + } } ] } diff --git a/terminal/terminal/mac/kitty/kitty.conf b/terminal/terminal/mac/kitty/kitty.conf index a7135f8..70310f7 100644 --- a/terminal/terminal/mac/kitty/kitty.conf +++ b/terminal/terminal/mac/kitty/kitty.conf @@ -1,4 +1,4 @@ -# High-contrast starter config. All eight Zacess themes sit in this folder (zacess-*.conf, from +# High-contrast starter config. All ten Zacess themes sit in this folder (zacess-*.conf, from # palette/zacess.json) and the include below picks one, Zacess Deep Contrast Dark by default. # The `zt` command in the dotfiles rewrites that line. `zt auto` writes dark-theme.auto.conf and # light-theme.auto.conf, which Kitty 0.38 and later follows with the system. diff --git a/terminal/terminal/mac/kitty/zacess-warm-dark.conf b/terminal/terminal/mac/kitty/zacess-warm-dark.conf new file mode 100644 index 0000000..1c78b20 --- /dev/null +++ b/terminal/terminal/mac/kitty/zacess-warm-dark.conf @@ -0,0 +1,24 @@ +# Zacess Warm Dark +# generated by scripts/build-themes.py from palette/zacess.json, do not edit by hand +background #211b17 +foreground #e5d5b6 +cursor #fec9a7 +cursor_text_color #211b17 +selection_background #7abad3 +selection_foreground #211b17 +color0 #ada398 +color1 #fc9a8d +color2 #a2be6f +color3 #e4b35b +color4 #88b9e3 +color5 #dfa1ca +color6 #73c2b8 +color7 #cbc1b1 +color8 #b9b1a9 +color9 #fee4e0 +color10 #d9f2b0 +color11 #ffe9b6 +color12 #d7ecff +color13 #ffe1f4 +color14 #b1f7ed +color15 #fbf1dc diff --git a/terminal/terminal/mac/kitty/zacess-warm-light.conf b/terminal/terminal/mac/kitty/zacess-warm-light.conf new file mode 100644 index 0000000..db9e6ec --- /dev/null +++ b/terminal/terminal/mac/kitty/zacess-warm-light.conf @@ -0,0 +1,24 @@ +# Zacess Warm Light +# generated by scripts/build-themes.py from palette/zacess.json, do not edit by hand +background #f4ead5 +foreground #342410 +cursor #5b1301 +cursor_text_color #f4ead5 +selection_background #215779 +selection_foreground #f4ead5 +color0 #342410 +color1 #8c1a16 +color2 #275200 +color3 #6a4603 +color4 #014b79 +color5 #742c60 +color6 #05514d +color7 #574e44 +color8 #60574c +color9 #a4332b +color10 #386616 +color11 #845701 +color12 #115f93 +color13 #8a4074 +color14 #066662 +color15 #342410 diff --git a/terminal/terminal/mac/terminal-app/Zacess Warm Dark.terminal b/terminal/terminal/mac/terminal-app/Zacess Warm Dark.terminal new file mode 100644 index 0000000..4658e91 --- /dev/null +++ b/terminal/terminal/mac/terminal-app/Zacess Warm Dark.terminal @@ -0,0 +1,281 @@ + + + + + ANSIBlackColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECgwLjY3ODQzMTM3MjUgMC42MzkyMTU2ODYzIDAuNTk2MDc4NDMxNCAxgAJPECkw + LjY3ODQzMTM3MjUgMC42MzkyMTU2ODYzIDAuNTk2MDc4NDMxNCAxANIJFBUWWU5TU3Bh + Y2VJRIADEAzSGBkaClgkY2xhc3Nlc1okY2xhc3NuYW1logobWE5TT2JqZWN00hgZHR6i + HhtXTlNDb2xvctEgIVRyb290gAESAAGGoAAIABEAGwAkACkAMgBEAEoAUABbAGIAbwB8 + AJEAlwCZAJsAxgDIAPQA+QEDAQUBBwEMARUBIAEjASwBMQE0ATwBPwFEAUYAAAAAAAAC + AQAAAAAAAAAjAAAAAAAAAAAAAAAAAAABSw== + + ANSIBlueColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECgwLjUzMzMzMzMzMzMgMC43MjU0OTAxOTYxIDAuODkwMTk2MDc4NCAxgAJPECkw + LjUzMzMzMzMzMzMgMC43MjU0OTAxOTYxIDAuODkwMTk2MDc4NCAxANIJFBUWWU5TU3Bh + Y2VJRIADEAzSGBkaClgkY2xhc3Nlc1okY2xhc3NuYW1logobWE5TT2JqZWN00hgZHR6i + HhtXTlNDb2xvctEgIVRyb290gAESAAGGoAAIABEAGwAkACkAMgBEAEoAUABbAGIAbwB8 + AJEAlwCZAJsAxgDIAPQA+QEDAQUBBwEMARUBIAEjASwBMQE0ATwBPwFEAUYAAAAAAAAC + AQAAAAAAAAAjAAAAAAAAAAAAAAAAAAABSw== + + ANSIBrightBlackColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECcwLjcyNTQ5MDE5NjEgMC42OTQxMTc2NDcxIDAuNjYyNzQ1MDk4IDGAAk8QKDAu + NzI1NDkwMTk2MSAwLjY5NDExNzY0NzEgMC42NjI3NDUwOTggMQDSCRQVFllOU1NwYWNl + SUSAAxAM0hgZGgpYJGNsYXNzZXNaJGNsYXNzbmFtZaIKG1hOU09iamVjdNIYGR0eoh4b + V05TQ29sb3LRICFUcm9vdIABEgABhqAACAARABsAJAApADIARABKAFAAWwBiAG8AfACR + AJcAmQCbAMUAxwDyAPcBAQEDAQUBCgETAR4BIQEqAS8BMgE6AT0BQgFEAAAAAAAAAgEA + AAAAAAAAIwAAAAAAAAAAAAAAAAAAAUk= + + ANSIBrightBlueColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPEB0wLjg0MzEzNzI1NDkgMC45MjU0OTAxOTYxIDEgMYACTxAeMC44NDMxMzcyNTQ5 + IDAuOTI1NDkwMTk2MSAxIDEA0gkUFRZZTlNTcGFjZUlEgAMQDNIYGRoKWCRjbGFzc2Vz + WiRjbGFzc25hbWWiChtYTlNPYmplY3TSGBkdHqIeG1dOU0NvbG9y0SAhVHJvb3SAARIA + AYagAAgAEQAbACQAKQAyAEQASgBQAFsAYgBvAHwAkQCXAJkAmwC7AL0A3gDjAO0A7wDx + APYA/wEKAQ0BFgEbAR4BJgEpAS4BMAAAAAAAAAIBAAAAAAAAACMAAAAAAAAAAAAAAAAA + AAE1 + + ANSIBrightCyanColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECcwLjY5NDExNzY0NzEgMC45Njg2Mjc0NTEgMC45Mjk0MTE3NjQ3IDGAAk8QKDAu + Njk0MTE3NjQ3MSAwLjk2ODYyNzQ1MSAwLjkyOTQxMTc2NDcgMQDSCRQVFllOU1NwYWNl + SUSAAxAM0hgZGgpYJGNsYXNzZXNaJGNsYXNzbmFtZaIKG1hOU09iamVjdNIYGR0eoh4b + V05TQ29sb3LRICFUcm9vdIABEgABhqAACAARABsAJAApADIARABKAFAAWwBiAG8AfACR + AJcAmQCbAMUAxwDyAPcBAQEDAQUBCgETAR4BIQEqAS8BMgE6AT0BQgFEAAAAAAAAAgEA + AAAAAAAAIwAAAAAAAAAAAAAAAAAAAUk= + + ANSIBrightGreenColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECgwLjg1MDk4MDM5MjIgMC45NDkwMTk2MDc4IDAuNjkwMTk2MDc4NCAxgAJPECkw + Ljg1MDk4MDM5MjIgMC45NDkwMTk2MDc4IDAuNjkwMTk2MDc4NCAxANIJFBUWWU5TU3Bh + Y2VJRIADEAzSGBkaClgkY2xhc3Nlc1okY2xhc3NuYW1logobWE5TT2JqZWN00hgZHR6i + HhtXTlNDb2xvctEgIVRyb290gAESAAGGoAAIABEAGwAkACkAMgBEAEoAUABbAGIAbwB8 + AJEAlwCZAJsAxgDIAPQA+QEDAQUBBwEMARUBIAEjASwBMQE0ATwBPwFEAUYAAAAAAAAC + AQAAAAAAAAAjAAAAAAAAAAAAAAAAAAABSw== + + ANSIBrightMagentaColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPEB0xIDAuODgyMzUyOTQxMiAwLjk1Njg2Mjc0NTEgMYACTxAeMSAwLjg4MjM1Mjk0 + MTIgMC45NTY4NjI3NDUxIDEA0gkUFRZZTlNTcGFjZUlEgAMQDNIYGRoKWCRjbGFzc2Vz + WiRjbGFzc25hbWWiChtYTlNPYmplY3TSGBkdHqIeG1dOU0NvbG9y0SAhVHJvb3SAARIA + AYagAAgAEQAbACQAKQAyAEQASgBQAFsAYgBvAHwAkQCXAJkAmwC7AL0A3gDjAO0A7wDx + APYA/wEKAQ0BFgEbAR4BJgEpAS4BMAAAAAAAAAIBAAAAAAAAACMAAAAAAAAAAAAAAAAA + AAE1 + + ANSIBrightRedColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECgwLjk5NjA3ODQzMTQgMC44OTQxMTc2NDcxIDAuODc4NDMxMzcyNSAxgAJPECkw + Ljk5NjA3ODQzMTQgMC44OTQxMTc2NDcxIDAuODc4NDMxMzcyNSAxANIJFBUWWU5TU3Bh + Y2VJRIADEAzSGBkaClgkY2xhc3Nlc1okY2xhc3NuYW1logobWE5TT2JqZWN00hgZHR6i + HhtXTlNDb2xvctEgIVRyb290gAESAAGGoAAIABEAGwAkACkAMgBEAEoAUABbAGIAbwB8 + AJEAlwCZAJsAxgDIAPQA+QEDAQUBBwEMARUBIAEjASwBMQE0ATwBPwFEAUYAAAAAAAAC + AQAAAAAAAAAjAAAAAAAAAAAAAAAAAAABSw== + + ANSIBrightWhiteColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECcwLjk4NDMxMzcyNTUgMC45NDUwOTgwMzkyIDAuODYyNzQ1MDk4IDGAAk8QKDAu + OTg0MzEzNzI1NSAwLjk0NTA5ODAzOTIgMC44NjI3NDUwOTggMQDSCRQVFllOU1NwYWNl + SUSAAxAM0hgZGgpYJGNsYXNzZXNaJGNsYXNzbmFtZaIKG1hOU09iamVjdNIYGR0eoh4b + V05TQ29sb3LRICFUcm9vdIABEgABhqAACAARABsAJAApADIARABKAFAAWwBiAG8AfACR + AJcAmQCbAMUAxwDyAPcBAQEDAQUBCgETAR4BIQEqAS8BMgE6AT0BQgFEAAAAAAAAAgEA + AAAAAAAAIwAAAAAAAAAAAAAAAAAAAUk= + + ANSIBrightYellowColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPEB0xIDAuOTEzNzI1NDkwMiAwLjcxMzcyNTQ5MDIgMYACTxAeMSAwLjkxMzcyNTQ5 + MDIgMC43MTM3MjU0OTAyIDEA0gkUFRZZTlNTcGFjZUlEgAMQDNIYGRoKWCRjbGFzc2Vz + WiRjbGFzc25hbWWiChtYTlNPYmplY3TSGBkdHqIeG1dOU0NvbG9y0SAhVHJvb3SAARIA + AYagAAgAEQAbACQAKQAyAEQASgBQAFsAYgBvAHwAkQCXAJkAmwC7AL0A3gDjAO0A7wDx + APYA/wEKAQ0BFgEbAR4BJgEpAS4BMAAAAAAAAAIBAAAAAAAAACMAAAAAAAAAAAAAAAAA + AAE1 + + ANSICyanColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECgwLjQ1MDk4MDM5MjIgMC43NjA3ODQzMTM3IDAuNzIxNTY4NjI3NSAxgAJPECkw + LjQ1MDk4MDM5MjIgMC43NjA3ODQzMTM3IDAuNzIxNTY4NjI3NSAxANIJFBUWWU5TU3Bh + Y2VJRIADEAzSGBkaClgkY2xhc3Nlc1okY2xhc3NuYW1logobWE5TT2JqZWN00hgZHR6i + HhtXTlNDb2xvctEgIVRyb290gAESAAGGoAAIABEAGwAkACkAMgBEAEoAUABbAGIAbwB8 + AJEAlwCZAJsAxgDIAPQA+QEDAQUBBwEMARUBIAEjASwBMQE0ATwBPwFEAUYAAAAAAAAC + AQAAAAAAAAAjAAAAAAAAAAAAAAAAAAABSw== + + ANSIGreenColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECgwLjYzNTI5NDExNzYgMC43NDUwOTgwMzkyIDAuNDM1Mjk0MTE3NiAxgAJPECkw + LjYzNTI5NDExNzYgMC43NDUwOTgwMzkyIDAuNDM1Mjk0MTE3NiAxANIJFBUWWU5TU3Bh + Y2VJRIADEAzSGBkaClgkY2xhc3Nlc1okY2xhc3NuYW1logobWE5TT2JqZWN00hgZHR6i + HhtXTlNDb2xvctEgIVRyb290gAESAAGGoAAIABEAGwAkACkAMgBEAEoAUABbAGIAbwB8 + AJEAlwCZAJsAxgDIAPQA+QEDAQUBBwEMARUBIAEjASwBMQE0ATwBPwFEAUYAAAAAAAAC + AQAAAAAAAAAjAAAAAAAAAAAAAAAAAAABSw== + + ANSIMagentaColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECcwLjg3NDUwOTgwMzkgMC42MzEzNzI1NDkgMC43OTIxNTY4NjI3IDGAAk8QKDAu + ODc0NTA5ODAzOSAwLjYzMTM3MjU0OSAwLjc5MjE1Njg2MjcgMQDSCRQVFllOU1NwYWNl + SUSAAxAM0hgZGgpYJGNsYXNzZXNaJGNsYXNzbmFtZaIKG1hOU09iamVjdNIYGR0eoh4b + V05TQ29sb3LRICFUcm9vdIABEgABhqAACAARABsAJAApADIARABKAFAAWwBiAG8AfACR + AJcAmQCbAMUAxwDyAPcBAQEDAQUBCgETAR4BIQEqAS8BMgE6AT0BQgFEAAAAAAAAAgEA + AAAAAAAAIwAAAAAAAAAAAAAAAAAAAUk= + + ANSIRedColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECgwLjk4ODIzNTI5NDEgMC42MDM5MjE1Njg2IDAuNTUyOTQxMTc2NSAxgAJPECkw + Ljk4ODIzNTI5NDEgMC42MDM5MjE1Njg2IDAuNTUyOTQxMTc2NSAxANIJFBUWWU5TU3Bh + Y2VJRIADEAzSGBkaClgkY2xhc3Nlc1okY2xhc3NuYW1logobWE5TT2JqZWN00hgZHR6i + HhtXTlNDb2xvctEgIVRyb290gAESAAGGoAAIABEAGwAkACkAMgBEAEoAUABbAGIAbwB8 + AJEAlwCZAJsAxgDIAPQA+QEDAQUBBwEMARUBIAEjASwBMQE0ATwBPwFEAUYAAAAAAAAC + AQAAAAAAAAAjAAAAAAAAAAAAAAAAAAABSw== + + ANSIWhiteColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECgwLjc5NjA3ODQzMTQgMC43NTY4NjI3NDUxIDAuNjk0MTE3NjQ3MSAxgAJPECkw + Ljc5NjA3ODQzMTQgMC43NTY4NjI3NDUxIDAuNjk0MTE3NjQ3MSAxANIJFBUWWU5TU3Bh + Y2VJRIADEAzSGBkaClgkY2xhc3Nlc1okY2xhc3NuYW1logobWE5TT2JqZWN00hgZHR6i + HhtXTlNDb2xvctEgIVRyb290gAESAAGGoAAIABEAGwAkACkAMgBEAEoAUABbAGIAbwB8 + AJEAlwCZAJsAxgDIAPQA+QEDAQUBBwEMARUBIAEjASwBMQE0ATwBPwFEAUYAAAAAAAAC + AQAAAAAAAAAjAAAAAAAAAAAAAAAAAAABSw== + + ANSIYellowColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECgwLjg5NDExNzY0NzEgMC43MDE5NjA3ODQzIDAuMzU2ODYyNzQ1MSAxgAJPECkw + Ljg5NDExNzY0NzEgMC43MDE5NjA3ODQzIDAuMzU2ODYyNzQ1MSAxANIJFBUWWU5TU3Bh + Y2VJRIADEAzSGBkaClgkY2xhc3Nlc1okY2xhc3NuYW1logobWE5TT2JqZWN00hgZHR6i + HhtXTlNDb2xvctEgIVRyb290gAESAAGGoAAIABEAGwAkACkAMgBEAEoAUABbAGIAbwB8 + AJEAlwCZAJsAxgDIAPQA+QEDAQUBBwEMARUBIAEjASwBMQE0ATwBPwFEAUYAAAAAAAAC + AQAAAAAAAAAjAAAAAAAAAAAAAAAAAAABSw== + + BackgroundColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECkwLjEyOTQxMTc2NDcgMC4xMDU4ODIzNTI5IDAuMDkwMTk2MDc4NDMgMYACTxAq + MC4xMjk0MTE3NjQ3IDAuMTA1ODgyMzUyOSAwLjA5MDE5NjA3ODQzIDEA0gkUFRZZTlNT + cGFjZUlEgAMQDNIYGRoKWCRjbGFzc2VzWiRjbGFzc25hbWWiChtYTlNPYmplY3TSGBkd + HqIeG1dOU0NvbG9y0SAhVHJvb3SAARIAAYagAAgAEQAbACQAKQAyAEQASgBQAFsAYgBv + AHwAkQCXAJkAmwDHAMkA9gD7AQUBBwEJAQ4BFwEiASUBLgEzATYBPgFBAUYBSAAAAAAA + AAIBAAAAAAAAACMAAAAAAAAAAAAAAAAAAAFN + + CursorColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECgwLjk5NjA3ODQzMTQgMC43ODgyMzUyOTQxIDAuNjU0OTAxOTYwOCAxgAJPECkw + Ljk5NjA3ODQzMTQgMC43ODgyMzUyOTQxIDAuNjU0OTAxOTYwOCAxANIJFBUWWU5TU3Bh + Y2VJRIADEAzSGBkaClgkY2xhc3Nlc1okY2xhc3NuYW1logobWE5TT2JqZWN00hgZHR6i + HhtXTlNDb2xvctEgIVRyb290gAESAAGGoAAIABEAGwAkACkAMgBEAEoAUABbAGIAbwB8 + AJEAlwCZAJsAxgDIAPQA+QEDAQUBBwEMARUBIAEjASwBMQE0ATwBPwFEAUYAAAAAAAAC + AQAAAAAAAAAjAAAAAAAAAAAAAAAAAAABSw== + + Font + + YnBsaXN0MDDUAQIDBAUGGBtZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKkBwgRElUkbnVsbNQJCgsMDQ4PEFYkY2xhc3NWTlNOYW1l + Vk5TU2l6ZVhOU2ZGbGFnc4ADgAIjQCgAAAAAAAAQEFxHZWlzdE1vbm9ORk3SExQVFlgk + Y2xhc3Nlc1okY2xhc3NuYW1lohYXVk5TRm9udFhOU09iamVjdNEZGlRyb290gAESAAGG + oAgRGyQpMkRJT1hfZm12eHqDhZKXoKuutb7BxsgAAAAAAAABAQAAAAAAAAAcAAAAAAAA + AAAAAAAAAAAAzQ== + + FontAntialias + + ProfileCurrentVersion + 2.09 + SelectionColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECgwLjQ3ODQzMTM3MjUgMC43Mjk0MTE3NjQ3IDAuODI3NDUwOTgwNCAxgAJPECkw + LjQ3ODQzMTM3MjUgMC43Mjk0MTE3NjQ3IDAuODI3NDUwOTgwNCAxANIJFBUWWU5TU3Bh + Y2VJRIADEAzSGBkaClgkY2xhc3Nlc1okY2xhc3NuYW1logobWE5TT2JqZWN00hgZHR6i + HhtXTlNDb2xvctEgIVRyb290gAESAAGGoAAIABEAGwAkACkAMgBEAEoAUABbAGIAbwB8 + AJEAlwCZAJsAxgDIAPQA+QEDAQUBBwEMARUBIAEjASwBMQE0ATwBPwFEAUYAAAAAAAAC + AQAAAAAAAAAjAAAAAAAAAAAAAAAAAAABSw== + + TextBoldColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECgwLjg5ODAzOTIxNTcgMC44MzUyOTQxMTc2IDAuNzEzNzI1NDkwMiAxgAJPECkw + Ljg5ODAzOTIxNTcgMC44MzUyOTQxMTc2IDAuNzEzNzI1NDkwMiAxANIJFBUWWU5TU3Bh + Y2VJRIADEAzSGBkaClgkY2xhc3Nlc1okY2xhc3NuYW1logobWE5TT2JqZWN00hgZHR6i + HhtXTlNDb2xvctEgIVRyb290gAESAAGGoAAIABEAGwAkACkAMgBEAEoAUABbAGIAbwB8 + AJEAlwCZAJsAxgDIAPQA+QEDAQUBBwEMARUBIAEjASwBMQE0ATwBPwFEAUYAAAAAAAAC + AQAAAAAAAAAjAAAAAAAAAAAAAAAAAAABSw== + + TextColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECgwLjg5ODAzOTIxNTcgMC44MzUyOTQxMTc2IDAuNzEzNzI1NDkwMiAxgAJPECkw + Ljg5ODAzOTIxNTcgMC44MzUyOTQxMTc2IDAuNzEzNzI1NDkwMiAxANIJFBUWWU5TU3Bh + Y2VJRIADEAzSGBkaClgkY2xhc3Nlc1okY2xhc3NuYW1logobWE5TT2JqZWN00hgZHR6i + HhtXTlNDb2xvctEgIVRyb290gAESAAGGoAAIABEAGwAkACkAMgBEAEoAUABbAGIAbwB8 + AJEAlwCZAJsAxgDIAPQA+QEDAQUBBwEMARUBIAEjASwBMQE0ATwBPwFEAUYAAAAAAAAC + AQAAAAAAAAAjAAAAAAAAAAAAAAAAAAABSw== + + UseBrightBold + + columnCount + 120 + name + Zacess Warm Dark + rowCount + 32 + type + Window Settings + + diff --git a/terminal/terminal/mac/terminal-app/Zacess Warm Light.terminal b/terminal/terminal/mac/terminal-app/Zacess Warm Light.terminal new file mode 100644 index 0000000..a4e0703 --- /dev/null +++ b/terminal/terminal/mac/terminal-app/Zacess Warm Light.terminal @@ -0,0 +1,281 @@ + + + + + ANSIBlackColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECkwLjIwMzkyMTU2ODYgMC4xNDExNzY0NzA2IDAuMDYyNzQ1MDk4MDQgMYACTxAq + MC4yMDM5MjE1Njg2IDAuMTQxMTc2NDcwNiAwLjA2Mjc0NTA5ODA0IDEA0gkUFRZZTlNT + cGFjZUlEgAMQDNIYGRoKWCRjbGFzc2VzWiRjbGFzc25hbWWiChtYTlNPYmplY3TSGBkd + HqIeG1dOU0NvbG9y0SAhVHJvb3SAARIAAYagAAgAEQAbACQAKQAyAEQASgBQAFsAYgBv + AHwAkQCXAJkAmwDHAMkA9gD7AQUBBwEJAQ4BFwEiASUBLgEzATYBPgFBAUYBSAAAAAAA + AAIBAAAAAAAAACMAAAAAAAAAAAAAAAAAAAFN + + ANSIBlueColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECowLjAwMzkyMTU2ODYyNyAwLjI5NDExNzY0NzEgMC40NzQ1MDk4MDM5IDGAAk8Q + KzAuMDAzOTIxNTY4NjI3IDAuMjk0MTE3NjQ3MSAwLjQ3NDUwOTgwMzkgMQDSCRQVFllO + U1NwYWNlSUSAAxAM0hgZGgpYJGNsYXNzZXNaJGNsYXNzbmFtZaIKG1hOU09iamVjdNIY + GR0eoh4bV05TQ29sb3LRICFUcm9vdIABEgABhqAACAARABsAJAApADIARABKAFAAWwBi + AG8AfACRAJcAmQCbAMgAygD4AP0BBwEJAQsBEAEZASQBJwEwATUBOAFAAUMBSAFKAAAA + AAAAAgEAAAAAAAAAIwAAAAAAAAAAAAAAAAAAAU8= + + ANSIBrightBlackColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECgwLjM3NjQ3MDU4ODIgMC4zNDExNzY0NzA2IDAuMjk4MDM5MjE1NyAxgAJPECkw + LjM3NjQ3MDU4ODIgMC4zNDExNzY0NzA2IDAuMjk4MDM5MjE1NyAxANIJFBUWWU5TU3Bh + Y2VJRIADEAzSGBkaClgkY2xhc3Nlc1okY2xhc3NuYW1logobWE5TT2JqZWN00hgZHR6i + HhtXTlNDb2xvctEgIVRyb290gAESAAGGoAAIABEAGwAkACkAMgBEAEoAUABbAGIAbwB8 + AJEAlwCZAJsAxgDIAPQA+QEDAQUBBwEMARUBIAEjASwBMQE0ATwBPwFEAUYAAAAAAAAC + AQAAAAAAAAAjAAAAAAAAAAAAAAAAAAABSw== + + ANSIBrightBlueColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECkwLjA2NjY2NjY2NjY3IDAuMzcyNTQ5MDE5NiAwLjU3NjQ3MDU4ODIgMYACTxAq + MC4wNjY2NjY2NjY2NyAwLjM3MjU0OTAxOTYgMC41NzY0NzA1ODgyIDEA0gkUFRZZTlNT + cGFjZUlEgAMQDNIYGRoKWCRjbGFzc2VzWiRjbGFzc25hbWWiChtYTlNPYmplY3TSGBkd + HqIeG1dOU0NvbG9y0SAhVHJvb3SAARIAAYagAAgAEQAbACQAKQAyAEQASgBQAFsAYgBv + AHwAkQCXAJkAmwDHAMkA9gD7AQUBBwEJAQ4BFwEiASUBLgEzATYBPgFBAUYBSAAAAAAA + AAIBAAAAAAAAACMAAAAAAAAAAAAAAAAAAAFN + + ANSIBrightCyanColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECAwLjAyMzUyOTQxMTc2IDAuNCAwLjM4NDMxMzcyNTUgMYACTxAhMC4wMjM1Mjk0 + MTE3NiAwLjQgMC4zODQzMTM3MjU1IDEA0gkUFRZZTlNTcGFjZUlEgAMQDNIYGRoKWCRj + bGFzc2VzWiRjbGFzc25hbWWiChtYTlNPYmplY3TSGBkdHqIeG1dOU0NvbG9y0SAhVHJv + b3SAARIAAYagAAgAEQAbACQAKQAyAEQASgBQAFsAYgBvAHwAkQCXAJkAmwC+AMAA5ADp + APMA9QD3APwBBQEQARMBHAEhASQBLAEvATQBNgAAAAAAAAIBAAAAAAAAACMAAAAAAAAA + AAAAAAAAAAE7 + + ANSIBrightGreenColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPEB8wLjIxOTYwNzg0MzEgMC40IDAuMDg2Mjc0NTA5OCAxgAJPECAwLjIxOTYwNzg0 + MzEgMC40IDAuMDg2Mjc0NTA5OCAxANIJFBUWWU5TU3BhY2VJRIADEAzSGBkaClgkY2xh + c3Nlc1okY2xhc3NuYW1logobWE5TT2JqZWN00hgZHR6iHhtXTlNDb2xvctEgIVRyb290 + gAESAAGGoAAIABEAGwAkACkAMgBEAEoAUABbAGIAbwB8AJEAlwCZAJsAvQC/AOIA5wDx + APMA9QD6AQMBDgERARoBHwEiASoBLQEyATQAAAAAAAACAQAAAAAAAAAjAAAAAAAAAAAA + AAAAAAABOQ== + + ANSIBrightMagentaColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECgwLjU0MTE3NjQ3MDYgMC4yNTA5ODAzOTIyIDAuNDU0OTAxOTYwOCAxgAJPECkw + LjU0MTE3NjQ3MDYgMC4yNTA5ODAzOTIyIDAuNDU0OTAxOTYwOCAxANIJFBUWWU5TU3Bh + Y2VJRIADEAzSGBkaClgkY2xhc3Nlc1okY2xhc3NuYW1logobWE5TT2JqZWN00hgZHR6i + HhtXTlNDb2xvctEgIVRyb290gAESAAGGoAAIABEAGwAkACkAMgBEAEoAUABbAGIAbwB8 + AJEAlwCZAJsAxgDIAPQA+QEDAQUBBwEMARUBIAEjASwBMQE0ATwBPwFEAUYAAAAAAAAC + AQAAAAAAAAAjAAAAAAAAAAAAAAAAAAABSw== + + ANSIBrightRedColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPEB4wLjY0MzEzNzI1NDkgMC4yIDAuMTY4NjI3NDUxIDGAAk8QHzAuNjQzMTM3MjU0 + OSAwLjIgMC4xNjg2Mjc0NTEgMQDSCRQVFllOU1NwYWNlSUSAAxAM0hgZGgpYJGNsYXNz + ZXNaJGNsYXNzbmFtZaIKG1hOU09iamVjdNIYGR0eoh4bV05TQ29sb3LRICFUcm9vdIAB + EgABhqAACAARABsAJAApADIARABKAFAAWwBiAG8AfACRAJcAmQCbALwAvgDgAOUA7wDx + APMA+AEBAQwBDwEYAR0BIAEoASsBMAEyAAAAAAAAAgEAAAAAAAAAIwAAAAAAAAAAAAAA + AAAAATc= + + ANSIBrightWhiteColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECkwLjIwMzkyMTU2ODYgMC4xNDExNzY0NzA2IDAuMDYyNzQ1MDk4MDQgMYACTxAq + MC4yMDM5MjE1Njg2IDAuMTQxMTc2NDcwNiAwLjA2Mjc0NTA5ODA0IDEA0gkUFRZZTlNT + cGFjZUlEgAMQDNIYGRoKWCRjbGFzc2VzWiRjbGFzc25hbWWiChtYTlNPYmplY3TSGBkd + HqIeG1dOU0NvbG9y0SAhVHJvb3SAARIAAYagAAgAEQAbACQAKQAyAEQASgBQAFsAYgBv + AHwAkQCXAJkAmwDHAMkA9gD7AQUBBwEJAQ4BFwEiASUBLgEzATYBPgFBAUYBSAAAAAAA + AAIBAAAAAAAAACMAAAAAAAAAAAAAAAAAAAFN + + ANSIBrightYellowColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECowLjUxNzY0NzA1ODggMC4zNDExNzY0NzA2IDAuMDAzOTIxNTY4NjI3IDGAAk8Q + KzAuNTE3NjQ3MDU4OCAwLjM0MTE3NjQ3MDYgMC4wMDM5MjE1Njg2MjcgMQDSCRQVFllO + U1NwYWNlSUSAAxAM0hgZGgpYJGNsYXNzZXNaJGNsYXNzbmFtZaIKG1hOU09iamVjdNIY + GR0eoh4bV05TQ29sb3LRICFUcm9vdIABEgABhqAACAARABsAJAApADIARABKAFAAWwBi + AG8AfACRAJcAmQCbAMgAygD4AP0BBwEJAQsBEAEZASQBJwEwATUBOAFAAUMBSAFKAAAA + AAAAAgEAAAAAAAAAIwAAAAAAAAAAAAAAAAAAAU8= + + ANSICyanColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECkwLjAxOTYwNzg0MzE0IDAuMzE3NjQ3MDU4OCAwLjMwMTk2MDc4NDMgMYACTxAq + MC4wMTk2MDc4NDMxNCAwLjMxNzY0NzA1ODggMC4zMDE5NjA3ODQzIDEA0gkUFRZZTlNT + cGFjZUlEgAMQDNIYGRoKWCRjbGFzc2VzWiRjbGFzc25hbWWiChtYTlNPYmplY3TSGBkd + HqIeG1dOU0NvbG9y0SAhVHJvb3SAARIAAYagAAgAEQAbACQAKQAyAEQASgBQAFsAYgBv + AHwAkQCXAJkAmwDHAMkA9gD7AQUBBwEJAQ4BFwEiASUBLgEzATYBPgFBAUYBSAAAAAAA + AAIBAAAAAAAAACMAAAAAAAAAAAAAAAAAAAFN + + ANSIGreenColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPEB0wLjE1Mjk0MTE3NjUgMC4zMjE1Njg2Mjc1IDAgMYACTxAeMC4xNTI5NDExNzY1 + IDAuMzIxNTY4NjI3NSAwIDEA0gkUFRZZTlNTcGFjZUlEgAMQDNIYGRoKWCRjbGFzc2Vz + WiRjbGFzc25hbWWiChtYTlNPYmplY3TSGBkdHqIeG1dOU0NvbG9y0SAhVHJvb3SAARIA + AYagAAgAEQAbACQAKQAyAEQASgBQAFsAYgBvAHwAkQCXAJkAmwC7AL0A3gDjAO0A7wDx + APYA/wEKAQ0BFgEbAR4BJgEpAS4BMAAAAAAAAAIBAAAAAAAAACMAAAAAAAAAAAAAAAAA + AAE1 + + ANSIMagentaColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECgwLjQ1NDkwMTk2MDggMC4xNzI1NDkwMTk2IDAuMzc2NDcwNTg4MiAxgAJPECkw + LjQ1NDkwMTk2MDggMC4xNzI1NDkwMTk2IDAuMzc2NDcwNTg4MiAxANIJFBUWWU5TU3Bh + Y2VJRIADEAzSGBkaClgkY2xhc3Nlc1okY2xhc3NuYW1logobWE5TT2JqZWN00hgZHR6i + HhtXTlNDb2xvctEgIVRyb290gAESAAGGoAAIABEAGwAkACkAMgBEAEoAUABbAGIAbwB8 + AJEAlwCZAJsAxgDIAPQA+QEDAQUBBwEMARUBIAEjASwBMQE0ATwBPwFEAUYAAAAAAAAC + AQAAAAAAAAAjAAAAAAAAAAAAAAAAAAABSw== + + ANSIRedColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECgwLjU0OTAxOTYwNzggMC4xMDE5NjA3ODQzIDAuMDg2Mjc0NTA5OCAxgAJPECkw + LjU0OTAxOTYwNzggMC4xMDE5NjA3ODQzIDAuMDg2Mjc0NTA5OCAxANIJFBUWWU5TU3Bh + Y2VJRIADEAzSGBkaClgkY2xhc3Nlc1okY2xhc3NuYW1logobWE5TT2JqZWN00hgZHR6i + HhtXTlNDb2xvctEgIVRyb290gAESAAGGoAAIABEAGwAkACkAMgBEAEoAUABbAGIAbwB8 + AJEAlwCZAJsAxgDIAPQA+QEDAQUBBwEMARUBIAEjASwBMQE0ATwBPwFEAUYAAAAAAAAC + AQAAAAAAAAAjAAAAAAAAAAAAAAAAAAABSw== + + ANSIWhiteColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECgwLjM0MTE3NjQ3MDYgMC4zMDU4ODIzNTI5IDAuMjY2NjY2NjY2NyAxgAJPECkw + LjM0MTE3NjQ3MDYgMC4zMDU4ODIzNTI5IDAuMjY2NjY2NjY2NyAxANIJFBUWWU5TU3Bh + Y2VJRIADEAzSGBkaClgkY2xhc3Nlc1okY2xhc3NuYW1logobWE5TT2JqZWN00hgZHR6i + HhtXTlNDb2xvctEgIVRyb290gAESAAGGoAAIABEAGwAkACkAMgBEAEoAUABbAGIAbwB8 + AJEAlwCZAJsAxgDIAPQA+QEDAQUBBwEMARUBIAEjASwBMQE0ATwBPwFEAUYAAAAAAAAC + AQAAAAAAAAAjAAAAAAAAAAAAAAAAAAABSw== + + ANSIYellowColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECkwLjQxNTY4NjI3NDUgMC4yNzQ1MDk4MDM5IDAuMDExNzY0NzA1ODggMYACTxAq + MC40MTU2ODYyNzQ1IDAuMjc0NTA5ODAzOSAwLjAxMTc2NDcwNTg4IDEA0gkUFRZZTlNT + cGFjZUlEgAMQDNIYGRoKWCRjbGFzc2VzWiRjbGFzc25hbWWiChtYTlNPYmplY3TSGBkd + HqIeG1dOU0NvbG9y0SAhVHJvb3SAARIAAYagAAgAEQAbACQAKQAyAEQASgBQAFsAYgBv + AHwAkQCXAJkAmwDHAMkA9gD7AQUBBwEJAQ4BFwEiASUBLgEzATYBPgFBAUYBSAAAAAAA + AAIBAAAAAAAAACMAAAAAAAAAAAAAAAAAAAFN + + BackgroundColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECgwLjk1Njg2Mjc0NTEgMC45MTc2NDcwNTg4IDAuODM1Mjk0MTE3NiAxgAJPECkw + Ljk1Njg2Mjc0NTEgMC45MTc2NDcwNTg4IDAuODM1Mjk0MTE3NiAxANIJFBUWWU5TU3Bh + Y2VJRIADEAzSGBkaClgkY2xhc3Nlc1okY2xhc3NuYW1logobWE5TT2JqZWN00hgZHR6i + HhtXTlNDb2xvctEgIVRyb290gAESAAGGoAAIABEAGwAkACkAMgBEAEoAUABbAGIAbwB8 + AJEAlwCZAJsAxgDIAPQA+QEDAQUBBwEMARUBIAEjASwBMQE0ATwBPwFEAUYAAAAAAAAC + AQAAAAAAAAAjAAAAAAAAAAAAAAAAAAABSw== + + CursorColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECswLjM1Njg2Mjc0NTEgMC4wNzQ1MDk4MDM5MiAwLjAwMzkyMTU2ODYyNyAxgAJP + ECwwLjM1Njg2Mjc0NTEgMC4wNzQ1MDk4MDM5MiAwLjAwMzkyMTU2ODYyNyAxANIJFBUW + WU5TU3BhY2VJRIADEAzSGBkaClgkY2xhc3Nlc1okY2xhc3NuYW1logobWE5TT2JqZWN0 + 0hgZHR6iHhtXTlNDb2xvctEgIVRyb290gAESAAGGoAAIABEAGwAkACkAMgBEAEoAUABb + AGIAbwB8AJEAlwCZAJsAyQDLAPoA/wEJAQsBDQESARsBJgEpATIBNwE6AUIBRQFKAUwA + AAAAAAACAQAAAAAAAAAjAAAAAAAAAAAAAAAAAAABUQ== + + Font + + YnBsaXN0MDDUAQIDBAUGGBtZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKkBwgRElUkbnVsbNQJCgsMDQ4PEFYkY2xhc3NWTlNOYW1l + Vk5TU2l6ZVhOU2ZGbGFnc4ADgAIjQCgAAAAAAAAQEFxHZWlzdE1vbm9ORk3SExQVFlgk + Y2xhc3Nlc1okY2xhc3NuYW1lohYXVk5TRm9udFhOU09iamVjdNEZGlRyb290gAESAAGG + oAgRGyQpMkRJT1hfZm12eHqDhZKXoKuutb7BxsgAAAAAAAABAQAAAAAAAAAcAAAAAAAA + AAAAAAAAAAAAzQ== + + FontAntialias + + ProfileCurrentVersion + 2.09 + SelectionColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECgwLjEyOTQxMTc2NDcgMC4zNDExNzY0NzA2IDAuNDc0NTA5ODAzOSAxgAJPECkw + LjEyOTQxMTc2NDcgMC4zNDExNzY0NzA2IDAuNDc0NTA5ODAzOSAxANIJFBUWWU5TU3Bh + Y2VJRIADEAzSGBkaClgkY2xhc3Nlc1okY2xhc3NuYW1logobWE5TT2JqZWN00hgZHR6i + HhtXTlNDb2xvctEgIVRyb290gAESAAGGoAAIABEAGwAkACkAMgBEAEoAUABbAGIAbwB8 + AJEAlwCZAJsAxgDIAPQA+QEDAQUBBwEMARUBIAEjASwBMQE0ATwBPwFEAUYAAAAAAAAC + AQAAAAAAAAAjAAAAAAAAAAAAAAAAAAABSw== + + TextBoldColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECkwLjIwMzkyMTU2ODYgMC4xNDExNzY0NzA2IDAuMDYyNzQ1MDk4MDQgMYACTxAq + MC4yMDM5MjE1Njg2IDAuMTQxMTc2NDcwNiAwLjA2Mjc0NTA5ODA0IDEA0gkUFRZZTlNT + cGFjZUlEgAMQDNIYGRoKWCRjbGFzc2VzWiRjbGFzc25hbWWiChtYTlNPYmplY3TSGBkd + HqIeG1dOU0NvbG9y0SAhVHJvb3SAARIAAYagAAgAEQAbACQAKQAyAEQASgBQAFsAYgBv + AHwAkQCXAJkAmwDHAMkA9gD7AQUBBwEJAQ4BFwEiASUBLgEzATYBPgFBAUYBSAAAAAAA + AAIBAAAAAAAAACMAAAAAAAAAAAAAAAAAAAFN + + TextColor + + YnBsaXN0MDDUAQIDBAUGHyJZJGFyY2hpdmVyWCRvYmplY3RzVCR0b3BYJHZlcnNpb25f + EA9OU0tleWVkQXJjaGl2ZXKlBwgTFxxVJG51bGzVCQoLDA0ODxARElYkY2xhc3NcTlND + b2xvclNwYWNlXE5TQ29tcG9uZW50c18QEk5TQ3VzdG9tQ29sb3JTcGFjZVVOU1JHQoAE + EAFPECkwLjIwMzkyMTU2ODYgMC4xNDExNzY0NzA2IDAuMDYyNzQ1MDk4MDQgMYACTxAq + MC4yMDM5MjE1Njg2IDAuMTQxMTc2NDcwNiAwLjA2Mjc0NTA5ODA0IDEA0gkUFRZZTlNT + cGFjZUlEgAMQDNIYGRoKWCRjbGFzc2VzWiRjbGFzc25hbWWiChtYTlNPYmplY3TSGBkd + HqIeG1dOU0NvbG9y0SAhVHJvb3SAARIAAYagAAgAEQAbACQAKQAyAEQASgBQAFsAYgBv + AHwAkQCXAJkAmwDHAMkA9gD7AQUBBwEJAQ4BFwEiASUBLgEzATYBPgFBAUYBSAAAAAAA + AAIBAAAAAAAAACMAAAAAAAAAAAAAAAAAAAFN + + UseBrightBold + + columnCount + 120 + name + Zacess Warm Light + rowCount + 32 + type + Window Settings + + diff --git a/terminal/terminal/palette/zacess.json b/terminal/terminal/palette/zacess.json index 7f9049b..a10b5bf 100644 --- a/terminal/terminal/palette/zacess.json +++ b/terminal/terminal/palette/zacess.json @@ -1,7 +1,7 @@ { "source": { "repository": "zacesshq/themes", - "version": "0.12.0", + "version": "1.0.0", "file": "palette/zacess.json", "note": "copied by scripts/sync-palette.py: the terminal colours and the interface tokens the generated files use" }, @@ -420,6 +420,98 @@ "find_match": "#fff1a0", "find_match_border": "#b5200d" } + }, + { + "id": "warm-dark", + "short": "warm-dark", + "name": "Zacess Warm Dark", + "appearance": "dark", + "background": "#211b17", + "foreground": "#e5d5b6", + "cursor": "#fec9a7", + "selection_background": "#7abad3", + "selection_foreground": "#211b17", + "ansi": [ + "#ada398", + "#fc9a8d", + "#a2be6f", + "#e4b35b", + "#88b9e3", + "#dfa1ca", + "#73c2b8", + "#cbc1b1" + ], + "bright": [ + "#b9b1a9", + "#fee4e0", + "#d9f2b0", + "#ffe9b6", + "#d7ecff", + "#ffe1f4", + "#b1f7ed", + "#fbf1dc" + ], + "dim": [], + "background_role": [], + "ui": { + "surface": "#1a1512", + "surface_alt": "#2c241f", + "muted": "#cabca9", + "border": "#988c7e", + "border_active": "#e9b56a", + "accent": "#e9b56a", + "accent_foreground": "#211b17", + "line_highlight": "#36322d", + "find_match": "#5f3e02", + "find_match_border": "#f5e9a3" + }, + "text_contrast": 4.5 + }, + { + "id": "warm-light", + "short": "warm-light", + "name": "Zacess Warm Light", + "appearance": "light", + "background": "#f4ead5", + "foreground": "#342410", + "cursor": "#5b1301", + "selection_background": "#215779", + "selection_foreground": "#f4ead5", + "ansi": [ + "#342410", + "#8c1a16", + "#275200", + "#6a4603", + "#014b79", + "#742c60", + "#05514d", + "#574e44" + ], + "bright": [ + "#60574c", + "#a4332b", + "#386616", + "#845701", + "#115f93", + "#8a4074", + "#066662", + "#342410" + ], + "dim": [], + "background_role": [], + "ui": { + "surface": "#ece1ca", + "surface_alt": "#e4d8be", + "muted": "#483b2c", + "border": "#7e6f5f", + "border_active": "#6d3b02", + "accent": "#6d3b02", + "accent_foreground": "#f4ead5", + "line_highlight": "#d0cec0", + "find_match": "#fdc436", + "find_match_border": "#2c1501" + }, + "text_contrast": 4.5 } ] } diff --git a/terminal/terminal/scripts/build-themes.py b/terminal/terminal/scripts/build-themes.py index 44e0edf..0267d0c 100755 --- a/terminal/terminal/scripts/build-themes.py +++ b/terminal/terminal/scripts/build-themes.py @@ -1,9 +1,9 @@ #!/usr/bin/env python3 """Writes every terminal's theme files from palette/zacess.json. -The palette holds the terminal colours and interface tokens of the eight Zacess themes, copied from +The palette holds the terminal colours and interface tokens of the ten Zacess themes, copied from the Zacess Themes release named in its `source` by scripts/sync-palette.py. Every terminal gets all -eight, so any of them can be picked. Zacess Deep Contrast Dark is the default. No terminal +ten, so any of them can be picked. Zacess Deep Contrast Dark is the default. No terminal follows the system light and dark setting: the theme stays fixed until it is changed by hand or with the `zt` command in the dotfiles. The tmux folder beside this one gets a theme file per theme too (status bar, message line, copy mode and pane borders), which `zt` links into place. @@ -470,11 +470,14 @@ def low_contrast(): problems = [] for t in THEMES: ui = t["ui"] + # a theme that sets its own text floor upstream (Warm Dark and Warm Light at 4.5:1) is held + # to that one, the same rule Zacess Themes applies, so the gentler themes keep WCAG AA + text = t.get("text_contrast", 7) # the selection pair and the find match keep Zacess Themes' own 4.5:1 floors for text over a # highlight, the accent pair is text so it keeps 7:1 and borders are non-text at 3:1 - checks = [("foreground", t["foreground"], t["background"], 7), + checks = [("foreground", t["foreground"], t["background"], text), ("selection", t["selection_foreground"], t["selection_background"], 4.5), - ("message line", ui["accent_foreground"], ui["accent"], 7), + ("message line", ui["accent_foreground"], ui["accent"], text), ("find match", t["foreground"], ui["find_match"], 4.5), ("pane border", ui["border"], t["background"], 3), ("active pane border", ui["border_active"], t["background"], 3), @@ -483,7 +486,7 @@ def low_contrast(): for i, value in enumerate(colours16(t)): if i in t["background_role"]: continue - checks.append((f"color{i}", value, t["background"], 4.5 if i in t["dim"] else 7)) + checks.append((f"color{i}", value, t["background"], min(4.5, text) if i in t["dim"] else text)) # nano shows the nearest cube colour, so each of its slots is measured as shown for option, _, fg, bg, floor in nano_slots(t): checks.append((f"nano {option}", nano_colour(fg)[1], nano_colour(bg)[1] if bg else t["background"], floor)) diff --git a/terminal/terminal/scripts/sync-palette.py b/terminal/terminal/scripts/sync-palette.py index 17d26d4..b668424 100644 --- a/terminal/terminal/scripts/sync-palette.py +++ b/terminal/terminal/scripts/sync-palette.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 -"""Copies the eight Zacess themes from a pinned Zacess Themes release into palette/zacess.json. +"""Copies the ten Zacess themes from a pinned Zacess Themes release into palette/zacess.json. scripts/sync-palette.py the release pinned in palette/zacess.json - scripts/sync-palette.py --version 0.5.0 move the pin to that release and copy it + scripts/sync-palette.py --version 1.0.0 move the pin to that release and copy it scripts/sync-palette.py --from read the release from a local clone's tag, offline scripts/sync-palette.py --palette-only the palette and the generated files, leaving the editor pins scripts/sync-palette.py --check exit 1 when the palette or a pin differs from the release @@ -29,7 +29,7 @@ NVIM_REPOSITORY = "zacesshq/zacess.nvim" SHORT = {"deep-contrast-dark": "deep-dark", "deep-contrast-light": "deep-light", "high-contrast-dark": "hc-dark", "high-contrast-light": "hc-light", "dark": "dark", "light": "light", "cream": "cream", - "yellow-on-black": "yellow"} + "yellow-on-black": "yellow", "warm-dark": "warm-dark", "warm-light": "warm-light"} # palette key: the upstream ui token it copies. tmux's theme files and the contrast checks use these UI_TOKENS = {"surface": "surface", "surface_alt": "surfaceAlt", "muted": "muted", "border": "border", "border_active": "borderActive", "accent": "accent", "accent_foreground": "accentForeground", @@ -81,6 +81,10 @@ def convert(upstream, version, current): "background_role": terminal.get("backgroundRole", []), "ui": {key: ui[token] for key, token in UI_TOKENS.items()}, }) + # a gentler theme (Warm Dark and Warm Light) sets its own WCAG AA text floor upstream, so + # build-themes.py measures it against that floor rather than the AAA one the rest keep + if "textContrast" in theme: + themes[-1]["text_contrast"] = theme["textContrast"] return { "source": { "repository": REPOSITORY, diff --git a/terminal/terminal/windows/alacritty/alacritty.toml b/terminal/terminal/windows/alacritty/alacritty.toml index 380085b..9bd560c 100644 --- a/terminal/terminal/windows/alacritty/alacritty.toml +++ b/terminal/terminal/windows/alacritty/alacritty.toml @@ -1,4 +1,4 @@ -# High-contrast starter config. All eight Zacess themes sit in this folder (zacess-*.toml, from +# High-contrast starter config. All ten Zacess themes sit in this folder (zacess-*.toml, from # palette/zacess.json) and the import below picks one, Zacess Deep Contrast Dark by default. # Alacritty cannot follow the system light and dark setting, so change the import to switch. diff --git a/terminal/terminal/windows/alacritty/zacess-warm-dark.toml b/terminal/terminal/windows/alacritty/zacess-warm-dark.toml new file mode 100644 index 0000000..a1b438d --- /dev/null +++ b/terminal/terminal/windows/alacritty/zacess-warm-dark.toml @@ -0,0 +1,34 @@ +# Zacess Warm Dark +# generated by scripts/build-themes.py from palette/zacess.json, do not edit by hand + +[colors.primary] +background = "#211b17" +foreground = "#e5d5b6" + +[colors.cursor] +cursor = "#fec9a7" +text = "#211b17" + +[colors.selection] +background = "#7abad3" +text = "#211b17" + +[colors.normal] +black = "#ada398" +red = "#fc9a8d" +green = "#a2be6f" +yellow = "#e4b35b" +blue = "#88b9e3" +magenta = "#dfa1ca" +cyan = "#73c2b8" +white = "#cbc1b1" + +[colors.bright] +black = "#b9b1a9" +red = "#fee4e0" +green = "#d9f2b0" +yellow = "#ffe9b6" +blue = "#d7ecff" +magenta = "#ffe1f4" +cyan = "#b1f7ed" +white = "#fbf1dc" diff --git a/terminal/terminal/windows/alacritty/zacess-warm-light.toml b/terminal/terminal/windows/alacritty/zacess-warm-light.toml new file mode 100644 index 0000000..47ce236 --- /dev/null +++ b/terminal/terminal/windows/alacritty/zacess-warm-light.toml @@ -0,0 +1,34 @@ +# Zacess Warm Light +# generated by scripts/build-themes.py from palette/zacess.json, do not edit by hand + +[colors.primary] +background = "#f4ead5" +foreground = "#342410" + +[colors.cursor] +cursor = "#5b1301" +text = "#f4ead5" + +[colors.selection] +background = "#215779" +text = "#f4ead5" + +[colors.normal] +black = "#342410" +red = "#8c1a16" +green = "#275200" +yellow = "#6a4603" +blue = "#014b79" +magenta = "#742c60" +cyan = "#05514d" +white = "#574e44" + +[colors.bright] +black = "#60574c" +red = "#a4332b" +green = "#386616" +yellow = "#845701" +blue = "#115f93" +magenta = "#8a4074" +cyan = "#066662" +white = "#342410" diff --git a/terminal/terminal/windows/windows-terminal/zacess.json b/terminal/terminal/windows/windows-terminal/zacess.json index 1775c9a..0fa1706 100644 --- a/terminal/terminal/windows/windows-terminal/zacess.json +++ b/terminal/terminal/windows/windows-terminal/zacess.json @@ -184,6 +184,52 @@ "brightPurple": "#db009a", "brightCyan": "#0178c1", "brightWhite": "#000000" + }, + { + "name": "Zacess Warm Dark", + "background": "#211b17", + "foreground": "#e5d5b6", + "cursorColor": "#fec9a7", + "selectionBackground": "#7abad3", + "black": "#ada398", + "red": "#fc9a8d", + "green": "#a2be6f", + "yellow": "#e4b35b", + "blue": "#88b9e3", + "purple": "#dfa1ca", + "cyan": "#73c2b8", + "white": "#cbc1b1", + "brightBlack": "#b9b1a9", + "brightRed": "#fee4e0", + "brightGreen": "#d9f2b0", + "brightYellow": "#ffe9b6", + "brightBlue": "#d7ecff", + "brightPurple": "#ffe1f4", + "brightCyan": "#b1f7ed", + "brightWhite": "#fbf1dc" + }, + { + "name": "Zacess Warm Light", + "background": "#f4ead5", + "foreground": "#342410", + "cursorColor": "#5b1301", + "selectionBackground": "#215779", + "black": "#342410", + "red": "#8c1a16", + "green": "#275200", + "yellow": "#6a4603", + "blue": "#014b79", + "purple": "#742c60", + "cyan": "#05514d", + "white": "#574e44", + "brightBlack": "#60574c", + "brightRed": "#a4332b", + "brightGreen": "#386616", + "brightYellow": "#845701", + "brightBlue": "#115f93", + "brightPurple": "#8a4074", + "brightCyan": "#066662", + "brightWhite": "#342410" } ] } diff --git a/terminal/tmux/README.md b/terminal/tmux/README.md index 64f6007..b9ada22 100644 --- a/terminal/tmux/README.md +++ b/terminal/tmux/README.md @@ -5,6 +5,11 @@ ## In action +The whole setup in one session, in Zacess Deep Contrast Dark or Light to match the system +theme. The shot links to a short animation of it. + +A tmux session in Zacess Deep Contrast, dark or light to match the system theme. Neovim runs across the top, its file tree listing the Zacess Scenes Lua files beside build-passed.lua open in the editor. Along the bottom, from left to right: a shell showing a five-line git log and a build that passed, btop with CPU load and network traffic, then the harbour scene from Zacess Scenes playing in the same theme + Screenshots in four Zacess themes, Deep Contrast Dark and Light, Yellow on Black and Cream, recorded in a demo project. Each one links to a short animation of the same scene. diff --git a/terminal/tmux/docs/demo/hero-dark.gif b/terminal/tmux/docs/demo/hero-dark.gif new file mode 100644 index 0000000..b94f371 Binary files /dev/null and b/terminal/tmux/docs/demo/hero-dark.gif differ diff --git a/terminal/tmux/docs/demo/hero-dark.png b/terminal/tmux/docs/demo/hero-dark.png new file mode 100644 index 0000000..2d52bbd Binary files /dev/null and b/terminal/tmux/docs/demo/hero-dark.png differ diff --git a/terminal/tmux/docs/demo/hero-dark.webp b/terminal/tmux/docs/demo/hero-dark.webp new file mode 100644 index 0000000..e34f40c Binary files /dev/null and b/terminal/tmux/docs/demo/hero-dark.webp differ diff --git a/terminal/tmux/docs/demo/hero-fail-dark.gif b/terminal/tmux/docs/demo/hero-fail-dark.gif new file mode 100644 index 0000000..081c6a4 Binary files /dev/null and b/terminal/tmux/docs/demo/hero-fail-dark.gif differ diff --git a/terminal/tmux/docs/demo/hero-fail-dark.png b/terminal/tmux/docs/demo/hero-fail-dark.png new file mode 100644 index 0000000..b7f7955 Binary files /dev/null and b/terminal/tmux/docs/demo/hero-fail-dark.png differ diff --git a/terminal/tmux/docs/demo/hero-fail-dark.webp b/terminal/tmux/docs/demo/hero-fail-dark.webp new file mode 100644 index 0000000..b119cbb Binary files /dev/null and b/terminal/tmux/docs/demo/hero-fail-dark.webp differ diff --git a/terminal/tmux/docs/demo/hero-fail-light.gif b/terminal/tmux/docs/demo/hero-fail-light.gif new file mode 100644 index 0000000..ce7cc01 Binary files /dev/null and b/terminal/tmux/docs/demo/hero-fail-light.gif differ diff --git a/terminal/tmux/docs/demo/hero-fail-light.png b/terminal/tmux/docs/demo/hero-fail-light.png new file mode 100644 index 0000000..b5374d2 Binary files /dev/null and b/terminal/tmux/docs/demo/hero-fail-light.png differ diff --git a/terminal/tmux/docs/demo/hero-fail-light.webp b/terminal/tmux/docs/demo/hero-fail-light.webp new file mode 100644 index 0000000..3e5b7c5 Binary files /dev/null and b/terminal/tmux/docs/demo/hero-fail-light.webp differ diff --git a/terminal/tmux/docs/demo/hero-light.gif b/terminal/tmux/docs/demo/hero-light.gif new file mode 100644 index 0000000..27ed078 Binary files /dev/null and b/terminal/tmux/docs/demo/hero-light.gif differ diff --git a/terminal/tmux/docs/demo/hero-light.png b/terminal/tmux/docs/demo/hero-light.png new file mode 100644 index 0000000..58e6dfb Binary files /dev/null and b/terminal/tmux/docs/demo/hero-light.png differ diff --git a/terminal/tmux/docs/demo/hero-light.webp b/terminal/tmux/docs/demo/hero-light.webp new file mode 100644 index 0000000..f804347 Binary files /dev/null and b/terminal/tmux/docs/demo/hero-light.webp differ diff --git a/terminal/tmux/docs/demo/hero-pass-dark.gif b/terminal/tmux/docs/demo/hero-pass-dark.gif new file mode 100644 index 0000000..c98a0f9 Binary files /dev/null and b/terminal/tmux/docs/demo/hero-pass-dark.gif differ diff --git a/terminal/tmux/docs/demo/hero-pass-dark.png b/terminal/tmux/docs/demo/hero-pass-dark.png new file mode 100644 index 0000000..d546a17 Binary files /dev/null and b/terminal/tmux/docs/demo/hero-pass-dark.png differ diff --git a/terminal/tmux/docs/demo/hero-pass-dark.webp b/terminal/tmux/docs/demo/hero-pass-dark.webp new file mode 100644 index 0000000..c2c2976 Binary files /dev/null and b/terminal/tmux/docs/demo/hero-pass-dark.webp differ diff --git a/terminal/tmux/docs/demo/hero-pass-light.gif b/terminal/tmux/docs/demo/hero-pass-light.gif new file mode 100644 index 0000000..196f819 Binary files /dev/null and b/terminal/tmux/docs/demo/hero-pass-light.gif differ diff --git a/terminal/tmux/docs/demo/hero-pass-light.png b/terminal/tmux/docs/demo/hero-pass-light.png new file mode 100644 index 0000000..959264d Binary files /dev/null and b/terminal/tmux/docs/demo/hero-pass-light.png differ diff --git a/terminal/tmux/docs/demo/hero-pass-light.webp b/terminal/tmux/docs/demo/hero-pass-light.webp new file mode 100644 index 0000000..0f01d14 Binary files /dev/null and b/terminal/tmux/docs/demo/hero-pass-light.webp differ diff --git a/terminal/tmux/docs/demo/tmux-cream.gif b/terminal/tmux/docs/demo/tmux-cream.gif index 79cf72c..124c98b 100644 Binary files a/terminal/tmux/docs/demo/tmux-cream.gif and b/terminal/tmux/docs/demo/tmux-cream.gif differ diff --git a/terminal/tmux/docs/demo/tmux-cream.webp b/terminal/tmux/docs/demo/tmux-cream.webp index 91bfcac..04ef8ba 100644 Binary files a/terminal/tmux/docs/demo/tmux-cream.webp and b/terminal/tmux/docs/demo/tmux-cream.webp differ diff --git a/terminal/tmux/docs/demo/tmux-dark.gif b/terminal/tmux/docs/demo/tmux-dark.gif index 7704cc0..35bde9c 100644 Binary files a/terminal/tmux/docs/demo/tmux-dark.gif and b/terminal/tmux/docs/demo/tmux-dark.gif differ diff --git a/terminal/tmux/docs/demo/tmux-dark.webp b/terminal/tmux/docs/demo/tmux-dark.webp index 28e8dc0..1295bd9 100644 Binary files a/terminal/tmux/docs/demo/tmux-dark.webp and b/terminal/tmux/docs/demo/tmux-dark.webp differ diff --git a/terminal/tmux/docs/demo/tmux-light.gif b/terminal/tmux/docs/demo/tmux-light.gif index b109f03..21a1f94 100644 Binary files a/terminal/tmux/docs/demo/tmux-light.gif and b/terminal/tmux/docs/demo/tmux-light.gif differ diff --git a/terminal/tmux/docs/demo/tmux-light.webp b/terminal/tmux/docs/demo/tmux-light.webp index b90a1b8..c51ba87 100644 Binary files a/terminal/tmux/docs/demo/tmux-light.webp and b/terminal/tmux/docs/demo/tmux-light.webp differ diff --git a/terminal/tmux/docs/demo/tmux-yellow-on-black.gif b/terminal/tmux/docs/demo/tmux-yellow-on-black.gif index 50248b8..5b29e56 100644 Binary files a/terminal/tmux/docs/demo/tmux-yellow-on-black.gif and b/terminal/tmux/docs/demo/tmux-yellow-on-black.gif differ diff --git a/terminal/tmux/docs/demo/tmux-yellow-on-black.webp b/terminal/tmux/docs/demo/tmux-yellow-on-black.webp index bb7799c..759c488 100644 Binary files a/terminal/tmux/docs/demo/tmux-yellow-on-black.webp and b/terminal/tmux/docs/demo/tmux-yellow-on-black.webp differ diff --git a/terminal/tmux/themes/zacess-warm-dark.conf b/terminal/tmux/themes/zacess-warm-dark.conf new file mode 100644 index 0000000..d10b34f --- /dev/null +++ b/terminal/tmux/themes/zacess-warm-dark.conf @@ -0,0 +1,13 @@ +# Zacess Warm Dark +# generated by scripts/build-themes.py from palette/zacess.json, do not edit by hand +set -g status-style "fg=#e5d5b6,bg=#211b17" +set -g message-style "fg=#211b17,bg=#e9b56a,bold" +set -g message-command-style "fg=#211b17,bg=#e9b56a,bold" +set -g mode-style "fg=#211b17,bg=#7abad3" +set -g copy-mode-match-style "fg=#e5d5b6,bg=#5f3e02" +set -g copy-mode-current-match-style "fg=#e5d5b6,bg=#5f3e02,bold,underscore" +set -g pane-border-style "fg=#988c7e" +set -g pane-active-border-style "fg=#e9b56a" +set -g display-panes-colour "#988c7e" +set -g display-panes-active-colour "#e9b56a" +set -g clock-mode-colour "#e9b56a" diff --git a/terminal/tmux/themes/zacess-warm-light.conf b/terminal/tmux/themes/zacess-warm-light.conf new file mode 100644 index 0000000..a1e2419 --- /dev/null +++ b/terminal/tmux/themes/zacess-warm-light.conf @@ -0,0 +1,13 @@ +# Zacess Warm Light +# generated by scripts/build-themes.py from palette/zacess.json, do not edit by hand +set -g status-style "fg=#342410,bg=#f4ead5" +set -g message-style "fg=#f4ead5,bg=#6d3b02,bold" +set -g message-command-style "fg=#f4ead5,bg=#6d3b02,bold" +set -g mode-style "fg=#f4ead5,bg=#215779" +set -g copy-mode-match-style "fg=#342410,bg=#fdc436" +set -g copy-mode-current-match-style "fg=#342410,bg=#fdc436,bold,underscore" +set -g pane-border-style "fg=#7e6f5f" +set -g pane-active-border-style "fg=#6d3b02" +set -g display-panes-colour "#7e6f5f" +set -g display-panes-active-colour "#6d3b02" +set -g clock-mode-colour "#6d3b02" diff --git a/terminal/tmux/windows/themes/zacess-warm-dark.conf b/terminal/tmux/windows/themes/zacess-warm-dark.conf new file mode 100644 index 0000000..34489dd --- /dev/null +++ b/terminal/tmux/windows/themes/zacess-warm-dark.conf @@ -0,0 +1,11 @@ +# Zacess Warm Dark +# generated by scripts/build-themes.py from palette/zacess.json, do not edit by hand +set -g status-style "fg=#e5d5b6,bg=#211b17" +set -g message-style "fg=#211b17,bg=#e9b56a,bold" +set -g message-command-style "fg=#211b17,bg=#e9b56a,bold" +set -g mode-style "fg=#211b17,bg=#7abad3" +set -g copy-mode-match-style "fg=#e5d5b6,bg=#5f3e02" +set -g copy-mode-current-match-style "fg=#e5d5b6,bg=#5f3e02,bold,underscore" +set -g pane-border-style "fg=#988c7e" +set -g pane-active-border-style "fg=#e9b56a" +set -g clock-mode-colour "#e9b56a" diff --git a/terminal/tmux/windows/themes/zacess-warm-light.conf b/terminal/tmux/windows/themes/zacess-warm-light.conf new file mode 100644 index 0000000..332b49f --- /dev/null +++ b/terminal/tmux/windows/themes/zacess-warm-light.conf @@ -0,0 +1,11 @@ +# Zacess Warm Light +# generated by scripts/build-themes.py from palette/zacess.json, do not edit by hand +set -g status-style "fg=#342410,bg=#f4ead5" +set -g message-style "fg=#f4ead5,bg=#6d3b02,bold" +set -g message-command-style "fg=#f4ead5,bg=#6d3b02,bold" +set -g mode-style "fg=#f4ead5,bg=#215779" +set -g copy-mode-match-style "fg=#342410,bg=#fdc436" +set -g copy-mode-current-match-style "fg=#342410,bg=#fdc436,bold,underscore" +set -g pane-border-style "fg=#7e6f5f" +set -g pane-active-border-style "fg=#6d3b02" +set -g clock-mode-colour "#6d3b02"