Skip to content

Brand/monoline icon - #9

Merged
mindaugaskasp merged 2 commits into
mainfrom
brand/monoline-icon
Jul 31, 2026
Merged

Brand/monoline icon#9
mindaugaskasp merged 2 commits into
mainfrom
brand/monoline-icon

Conversation

@mindaugaskasp

Copy link
Copy Markdown
Owner

No description provided.

mindaugaskasp and others added 2 commits July 28, 2026 21:03
Replace the mascot icon with the Monoline "Shades-D": a warm cream letter D
wearing spectacles on a charcoal tile, one amber seam as the diff gutter.
Single 1024 master (logo.svg -> icon.png) drives macOS .icns, Windows .ico
and the Linux icon set.

Installer branding matched to the mark:
- macOS DMG: warm-light backdrop (dark backdrop hides Finder's black captions),
  amber drag-arrow, faint D watermark — dmg-background.svg + rendered PNGs.
- Windows NSIS: welcome/finish sidebar (164x314) and inner header (150x57)
  BMPs, wired in electron-builder.yml; installer/uninstaller icons default to
  the app icon.
- Linux deb/AppImage have no installer UI; they inherit icon.png.

New `npm run render:brand` (scripts/render-brand-assets.mjs) rasterizes the
SVG sources to icon.png + the two BMPs through the dev-dependency Electron,
with an inline 24-bit BMP encoder (no new dependency).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
@mindaugaskasp
mindaugaskasp merged commit dd37aa1 into main Jul 31, 2026
11 checks passed
mindaugaskasp added a commit that referenced this pull request Jul 31, 2026
Main brought PRs #8 (phase0 quick wins) and #9 (brand/monoline icon). The
merge base was old enough that git saw both sides adding the same features
independently, so every conflict was one architecture against its successor.

Resolved to this branch's side throughout, because each conflict was the tools
rework against what it replaced:

- CommandPalette: ours is a strict superset — main's version plus the tools
  scope (Recent/Other sections, action dispatch, tools-aware placeholder).
- textTools.js / devTools.js: main extended the TEXT_TOOLS table with JWT,
  Epoch, URL, HTML entities and sort-dedupe. All of those exist here as rich
  panels, and HTML entities and the standalone sort-dedupe were deliberately
  dropped, so both files stay deleted along with their tests. Nothing imports
  them (src/main/textTools.js is the unrelated encryption IPC).
- diffStore / menus / menu: the same story — showBase64Dialog,
  showFindReplaceDialog and tools-html are gone here on purpose.
- SavedDiffs: main's inline TOOLS array against the extracted ToolsShelf.

Main's non-conflicting work is kept: the HTML export, snippet import,
unified-diff apply, and commandPalette flattening are all present and their
tests run. Conflicts were resolved hunk by hunk rather than with --ours, so
main's cleanly-merged changes to those same files survived.

837 unit and 104 e2e pass on the merged tree.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant