From 8b9e09232906de651bfa70e2e85e489e3cdfebf0 Mon Sep 17 00:00:00 2001 From: Olivier Date: Fri, 26 Sep 2025 21:59:20 -0400 Subject: [PATCH] all should work now --- README.md | 219 ++++++++++++++++++++++++++++++++++------------------- main.js | 94 ++++++++++++++++++++--- main.ts | 131 ++++++++++++++++++++++++-------- styles.css | 91 +++++++++++----------- 4 files changed, 367 insertions(+), 168 deletions(-) diff --git a/README.md b/README.md index fae8131..1e3d188 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,20 @@ -# Menu Plugin for Obsidian +# Obsidian Menus -Create custom navigation menus in Obsidian using simple code blocks. Supports internal links, external URLs, and local file links with built-in themes and full customization. +Create simple, stylable menus from code blocks. You write links inside a `menu` code block, and the plugin renders: +- a single div with class `menu-container` +- a set of anchor tags inside it + +You can: +- Pick a built-in template (default, minimal, slate, horizon, aether) +- Use your own CSS class (no plugin CSS applied) +- Override styles using a small, safe set of YAML-like variables +- Mix template + extra classes (e.g., `layout: horizon wide`) + +CSS stays clean and predictable. ## Basic Usage -Create a menu using a `menu` code block with one of the built-in layouts: +Create a menu using a `menu` code block with one of the built-in templates: ````markdown ```menu @@ -16,32 +26,21 @@ layout: default ``` ```` -## Built-in Layouts +- `[[Note]]` or `[[Note|Alias]]` creates internal links. +- `[Text](https://example.com)` creates web links. +- `[Text](file:///C:/path/to/file)` opens local files/folders. -### `default` -Standard buttons with borders and backgrounds -````markdown -```menu -layout: default -[[Dashboard]] -[GitHub](https://github.com) -[Files](file:///C:/Users/Documents) -``` -```` +## Built-in Templates -### `minimal` -Clean text links with subtle colors -````markdown -```menu -layout: minimal -[[Notes]] -[Web](https://example.com) -[Folder](file:///C:/Projects) -``` -```` +Available out of the box: +- default +- minimal +- slate +- horizon +- aether + +Example: -### `slate` -Solid background buttons ````markdown ```menu layout: slate @@ -50,37 +49,95 @@ layout: slate ``` ```` -### `horizon` -Modern outlined style +You can also add extra classes like `wide` next to the layout: + ````markdown ```menu -layout: horizon +layout: horizon wide [[Dashboard]] [Resources](https://example.com) ``` ```` -### `aether` -Grid layout with equal-width items +Note: Built-in template CSS only applies when a built-in layout is selected. Internally, the container gets a `data-layout="..."` attribute which gates the plugin CSS. If you don’t select a built-in layout, none of the plugin CSS will affect your menu. + +## Custom CSS Class Mode (No Plugin CSS) + +Use your own CSS by providing a custom class via `class:` or `layout:` with a non-built-in value. In this mode, the plugin does not apply any of its CSS. It only renders the HTML and exposes inline CSS variables from the YAML-like overrides. + ````markdown ```menu -layout: aether -[[Projects]] -[GitHub](https://github.com) -[Documents](file:///C:/Users/Documents) +class: my-menu wide +bg: #111 +text: #eee +hover-text: #0af +internal-hover-text: orange + +[[Home]] +[Web](https://example.com) +[Folder](file:///C:/Projects) ``` ```` -## Link Types +Then, in a CSS snippet: -- **Internal**: `[[Note Name]]` or `[[Note Name|Display Text]]` -- **External**: `[Display Text](https://example.com)` -- **Files**: `[Display Text](file:///C:/path/to/file)` +```css +/* Example custom styling */ +.menu-container.my-menu { + display: flex; + gap: 0.5rem; + flex-wrap: wrap; +} -## Color Customization +.menu-container.my-menu a { + text-decoration: none; + padding: 0.5rem 0.8rem; + border-radius: 6px; + color: var(--text, var(--text-normal)); + background: var(--bg, transparent); + border: 1px solid var(--border, var(--background-modifier-border)); +} -Add color properties using YAML syntax: +.menu-container.my-menu a:hover { + color: var(--hover-text, var(--text-accent)); + background: var(--hover-bg, transparent); + border-color: var(--hover-border, var(--text-accent)); +} +``` +## YAML-like Overrides (Safe Whitelist) + +The code block supports a small set of variables. No raw CSS properties are accepted in the code block. If you need full CSS power, use a CSS snippet in your IDE. + +Global variables: +- bg +- text +- border +- font +- hover-text +- hover-bg +- hover-border +- hover-font + +Per link type variants (prefix with internal-, external-, file-): +- internal-bg, internal-text, internal-border, internal-font +- internal-hover-text, internal-hover-bg, internal-hover-border, internal-hover-font +- external-... (same set) +- file-... (same set) + +Naming aliases supported: +- text-hover -> hover-text +- bg-hover -> hover-bg +- border-hover -> hover-border +- font-hover -> hover-font +- accent -> hover-text (and internal-accent/external-accent/file-accent -> corresponding -hover-text) + +Behavior of keys: +- bg applies to the buttons (anchors), not the container +- hover-* applies to the hover state of the buttons +- type-specific keys (e.g., internal-text) override the global ones for that link type + +Examples (template mode): ````markdown ```menu layout: default @@ -88,49 +145,51 @@ bg: #1a1a1a text: #ffffff hover-text: #ff6b6b border: #333333 + [[Home]] [GitHub](https://github.com) ``` ```` -### Global Color Variables -- `bg`: Background color -- `text`: Text color -- `border`: Border color -- `hover-text`: Hover text color -- `hover-bg`: Hover background -- `hover-border`: Hover border color -- `font`: Font family - -### Link-Type Specific Colors -Customize each link type individually: - +Per-link-type overrides: ````markdown ```menu layout: minimal internal-text: #00ff00 external-text: #ff6600 file-text: #0066ff -internal-font: "Arial" +internal-font: "Fira Code" external-font: "Georgia" +file-font: "Arial" + [[Internal Link]] [External Link](https://example.com) [File Link](file:///C:/Documents) ``` ```` -**Available for each type** (`internal`, `external`, `file`): -- `{type}-text`: Text color -- `{type}-bg`: Background color -- `{type}-border`: Border color -- `{type}-font`: Font family -- `{type}-hover-text`: Hover text color -- `{type}-hover-bg`: Hover background -- `{type}-hover-border`: Hover border color +## Link Types -## Advanced Examples +- Internal: `[[Note Name]]` or `[[Note Name|Display Text]]` +- External: `[Display Text](https://example.com)` +- Files: `[Display Text](file:///C:/path/to/file)` -### Gradient Background +Behavior: +- Internal links open within Obsidian. +- External links open in your browser. +- File links open via the OS. + +## Notes + +- Use either `layout:` or `class:`. If the value contains a built-in template, the template is applied. Otherwise, it’s treated as a pure CSS class (no plugin CSS). +- If no `layout:` or `class:` is provided, `layout: default` is assumed. +- Colors support hex, rgb, hsl, CSS variables, and gradients. +- Font names with spaces need quotes: `font: "Work Sans"`. +- You can append additional classes after the layout or class: `layout: horizon wide my-extra`. + +## Examples + +Built-in template with overrides: ````markdown ```menu layout: horizon @@ -142,23 +201,25 @@ hover-text: #ffd700 ``` ```` -### Different Fonts Per Link Type +Custom class with overrides: ````markdown ```menu -layout: default -font: "Inter" -internal-font: "Fira Code" -external-font: "Georgia" -file-font: "Arial" -[[Code Notes]] -[Articles](https://medium.com) -[Local Files](file:///C:/Documents) +class: my-toolbar +text: var(--text-normal) +hover-text: var(--text-accent) +[[Inbox]] +[Wiki](https://example.com) ``` ```` -## Notes - -- Use either `layout:` or `class:` (both work the same) -- File paths use `file://` protocol -- Colors support hex, rgb, hsl, CSS variables, and gradients -- Font names with spaces need quotes: `font: "Work Sans"` \ No newline at end of file +Minimal template focusing on text colors: +````markdown +```menu +layout: minimal +internal-text: var(--text-accent) +external-text: var(--text-faint) +file-text: var(--text-muted) +[[Notes]] +[Web](https://example.com) +[Folder](file:///C:/Projects) +``` diff --git a/main.js b/main.js index f693d30..c42db84 100644 --- a/main.js +++ b/main.js @@ -33,14 +33,14 @@ var MenuPlugin = class extends import_obsidian.Plugin { async onload() { this.registerMarkdownCodeBlockProcessor("menu", (source, el, ctx) => { const lines = source.trim().split("\n"); - let layout = ""; + let layoutOrClass = ""; let colors = {}; const links = []; for (const line of lines) { const trimmed = line.trim(); if (trimmed.startsWith("layout:") || trimmed.startsWith("class:")) { const colonIndex = trimmed.indexOf(":"); - layout = trimmed.substring(colonIndex + 1).trim(); + layoutOrClass = trimmed.substring(colonIndex + 1).trim(); } else if (trimmed.includes(":") && !trimmed.startsWith("[") && !trimmed.startsWith("[[")) { const [key, ...valueParts] = trimmed.split(":"); const value = valueParts.join(":").trim(); @@ -53,17 +53,84 @@ var MenuPlugin = class extends import_obsidian.Plugin { links.push(trimmed); } } - const finalLayout = layout || "default"; - const container = el.createEl("div", { cls: `menu-container ${finalLayout}` }); - if (Object.keys(colors).length > 0) { - for (const [key, value] of Object.entries(colors)) { - let cssKey = key.replace(/accent/g, "hover-text"); - container.style.setProperty(`--${cssKey}`, value); + const builtInLayouts = /* @__PURE__ */ new Set(["default", "minimal", "slate", "horizon", "aether"]); + const container = el.createEl("div", { cls: "menu-container" }); + let selectedLayout = ""; + let extraClasses = []; + if (layoutOrClass) { + const tokens = layoutOrClass.split(/\s+/).filter(Boolean); + if (tokens.length) { + const builtInIndex = tokens.findIndex((t) => builtInLayouts.has(t)); + if (builtInIndex !== -1) { + selectedLayout = tokens[builtInIndex]; + extraClasses = tokens.filter((_, i) => i !== builtInIndex); + } else { + extraClasses = tokens; + } } - if (colors["hover-text"]) { - container.style.setProperty("--hover-text", colors["hover-text"]); + } else { + selectedLayout = "default"; + } + if (selectedLayout) { + container.setAttr("data-layout", selectedLayout); + } + for (const cls of extraClasses) { + container.addClass(cls); + } + if (Object.keys(colors).length > 0) { + const baseKeys = /* @__PURE__ */ new Set([ + "bg", + "text", + "border", + "font", + "hover-text", + "hover-bg", + "hover-border", + "hover-font" + ]); + const normalizeKey = (raw) => { + let s = raw.trim().toLowerCase(); + s = s.replace(/\btext-hover\b/g, "hover-text").replace(/\bbg-hover\b/g, "hover-bg").replace(/\bborder-hover\b/g, "hover-border").replace(/\binternal-text-hover\b/g, "internal-hover-text").replace(/\binternal-bg-hover\b/g, "internal-hover-bg").replace(/\binternal-border-hover\b/g, "internal-hover-border").replace(/\bexternal-text-hover\b/g, "external-hover-text").replace(/\bexternal-bg-hover\b/g, "external-hover-bg").replace(/\bexternal-border-hover\b/g, "external-hover-border").replace(/\bfile-text-hover\b/g, "file-hover-text").replace(/\bfile-bg-hover\b/g, "file-hover-bg").replace(/\bfile-border-hover\b/g, "file-hover-border").replace(/\baccent\b/g, "hover-text").replace(/\binternal-accent\b/g, "internal-hover-text").replace(/\bexternal-accent\b/g, "external-hover-text").replace(/\bfile-accent\b/g, "file-hover-text").replace(/\bbackground\b/g, "bg"); + return s; + }; + const isAllowed = (key) => { + if (baseKeys.has(key)) + return true; + const m = key.match(/^(internal|external|file)-(.*)$/); + return !!(m && baseKeys.has(m[2])); + }; + for (const [rawKey, value] of Object.entries(colors)) { + const key = normalizeKey(rawKey); + if (!isAllowed(key)) + continue; + container.style.setProperty(`--${key}`, value); } } + const applyInlineBaseStyles = (a, variant) => { + const prefix = variant === "generic" ? "" : `${variant}-`; + const get = (k) => { + var _a; + return (_a = colors[`${prefix}${k}`]) != null ? _a : colors[k]; + }; + const bgVal = get("bg"); + if (bgVal) + a.style.background = bgVal; + const textVal = get("text"); + if (textVal) + a.style.color = textVal; + const borderVal = get("border"); + if (borderVal) + a.style.borderColor = borderVal; + const fontVal = get("font"); + if (fontVal) + a.style.fontFamily = fontVal; + const hoverKeys = ["hover-bg", "hover-text", "hover-border", "hover-font"]; + for (const hk of hoverKeys) { + const v = get(hk); + if (v) + a.style.setProperty(`--${hk}`, v); + } + }; for (const link of links) { if (link.startsWith("[[") && link.endsWith("]]")) { const linkContent = link.slice(2, -2); @@ -77,6 +144,8 @@ var MenuPlugin = class extends import_obsidian.Plugin { attr: { "data-href": href } }); a.addClass("menu-internal-link"); + if (!selectedLayout) + applyInlineBaseStyles(a, "internal"); a.style.cursor = "pointer"; a.addEventListener("click", (e) => { e.preventDefault(); @@ -97,8 +166,12 @@ var MenuPlugin = class extends import_obsidian.Plugin { a.style.cursor = "pointer"; if (url.startsWith("file://")) { a.addClass("menu-file-link"); + if (!selectedLayout) + applyInlineBaseStyles(a, "file"); } else { a.addClass("menu-external-link"); + if (!selectedLayout) + applyInlineBaseStyles(a, "external"); } a.addEventListener("click", (e) => { e.preventDefault(); @@ -127,4 +200,3 @@ var MenuPlugin = class extends import_obsidian.Plugin { }; // Annotate the CommonJS export names for ESM import in node: 0 && (module.exports = {}); -//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["main.ts"],
  "sourcesContent": ["import { Plugin } from 'obsidian';\r\nimport { fileURLToPath } from 'url';\r\n\r\nconst { shell } = require('electron');\r\n\r\n// Simple YAML parser for color properties\r\nfunction parseYAML(text: string) {\r\n\tconst result: Record<string, string> = {};\r\n\tconst lines = text.split('\\n');\r\n\tfor (const line of lines) {\r\n\t\tconst trimmed = line.trim();\r\n\t\tif (trimmed && trimmed.includes(':')) {\r\n\t\t\tconst [key, ...valueParts] = trimmed.split(':');\r\n\t\t\tconst value = valueParts.join(':').trim();\r\n\t\t\tif (key && value) {\r\n\t\t\t\tresult[key.trim()] = value;\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n\treturn result;\r\n}\r\n\r\nexport default class MenuPlugin extends Plugin {\r\n\tasync onload() {\r\n\t\tthis.registerMarkdownCodeBlockProcessor('menu', (source, el, ctx) => {\r\n\t\t\tconst lines = source.trim().split('\\n');\r\n\t\t\tlet layout = '';\r\n\t\t\tlet colors: Record<string, string> = {};\r\n\t\t\tconst links: string[] = [];\r\n\t\t\t\r\n\t\t\t// Parse YAML-like properties and links\r\n\t\t\tfor (const line of lines) {\r\n\t\t\t\tconst trimmed = line.trim();\r\n\t\t\t\tif (trimmed.startsWith('layout:') || trimmed.startsWith('class:')) {\r\n\t\t\t\t\tconst colonIndex = trimmed.indexOf(':');\r\n\t\t\t\t\tlayout = trimmed.substring(colonIndex + 1).trim();\r\n\t\t\t\t} else if (trimmed.includes(':') && !trimmed.startsWith('[') && !trimmed.startsWith('[[')) {\r\n\t\t\t\t\t// Parse color properties\r\n\t\t\t\t\tconst [key, ...valueParts] = trimmed.split(':');\r\n\t\t\t\t\tconst value = valueParts.join(':').trim();\r\n\t\t\t\t\tif (key && value && !key.includes('//') && !key.includes('http')) {\r\n\t\t\t\t\t\tcolors[key.trim()] = value;\r\n\t\t\t\t\t}\r\n\t\t\t\t} else if (trimmed && !trimmed.includes(':')) {\r\n\t\t\t\t\tlinks.push(trimmed);\r\n\t\t\t\t} else if (trimmed.startsWith('[')) {\r\n\t\t\t\t\tlinks.push(trimmed);\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\t\r\n\t\t\tconst finalLayout = layout || 'default';\r\n\t\t\tconst container = el.createEl('div', { cls: `menu-container ${finalLayout}` });\r\n\t\t\t\r\n\t\t\t// Apply custom colors as CSS variables\r\n\t\t\tif (Object.keys(colors).length > 0) {\r\n\t\t\t\tfor (const [key, value] of Object.entries(colors)) {\r\n\t\t\t\t\t// Replace 'accent' with 'hover-text' for consistency\r\n\t\t\t\t\tlet cssKey = key.replace(/accent/g, 'hover-text');\r\n\t\t\t\t\tcontainer.style.setProperty(`--${cssKey}`, value);\r\n\t\t\t\t}\r\n\t\t\t\t// Example: ensure hover-text is set and add a comment for usage\r\n\t\t\t\tif (colors['hover-text']) {\r\n\t\t\t\t\tcontainer.style.setProperty('--hover-text', colors['hover-text']);\r\n\t\t\t\t\t// To use in CSS: a:hover { color: var(--hover-text); }\r\n\t\t\t\t}\r\n\t\t\t}\r\n \r\n\t\t\t// Process each link\r\n\t\t\tfor (const link of links) {\r\n\t\t\t\tif (link.startsWith('[[') && link.endsWith(']]')) {\r\n\t\t\t\t\t// Internal link\r\n\t\t\t\t\tconst linkContent = link.slice(2, -2);\r\n\t\t\t\t\tlet href = linkContent;\r\n\t\t\t\t\tlet text = linkContent;\r\n\t\t\t\t\tif (linkContent.includes('|')) {\r\n\t\t\t\t\t\t[href, text] = linkContent.split('|');\r\n\t\t\t\t\t}\r\n\t\t\t\t\tconst a = container.createEl('a', {\r\n\t\t\t\t\t\ttext: text,\r\n\t\t\t\t\t\tattr: { 'data-href': href }\r\n\t\t\t\t\t});\r\n\t\t\t\t\ta.addClass('menu-internal-link');\r\n\t\t\t\t\ta.style.cursor = 'pointer';\r\n\t\t\t\t\ta.addEventListener('click', (e) => {\r\n\t\t\t\t\t\te.preventDefault();\r\n\t\t\t\t\t\tconst vaultName = this.app.vault.getName();\r\n\t\t\t\t\t\tconst encodedFile = encodeURIComponent(href);\r\n\t\t\t\t\t\tconst uri = `obsidian://open?vault=${encodeURIComponent(vaultName)}&file=${encodedFile}`;\r\n\t\t\t\t\t\twindow.open(uri);\r\n\t\t\t\t\t});\r\n\t\t\t\t} else if (link.match(/^\\[.*\\]\\(.*\\)$/)) {\r\n\t\t\t\t\t// External link\r\n\t\t\t\t\tconst match = link.match(/^\\[(.*)\\]\\((.*)\\)$/);\r\n\t\t\t\t\tif (match) {\r\n\t\t\t\t\t\tconst text = match[1];\r\n\t\t\t\t\t\tconst url = match[2];\r\n\t\t\t\t\t\tconst a = container.createEl('a', {\r\n\t\t\t\t\t\t\ttext: text,\r\n\t\t\t\t\t\t\tattr: url.startsWith('file://') ? {} : { href: url, target: '_blank', rel: 'noopener noreferrer' }\r\n\t\t\t\t\t\t});\r\n\t\t\t\t\t\ta.style.cursor = 'pointer';\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t\t// Add appropriate class based on link type\r\n\t\t\t\t\t\tif (url.startsWith('file://')) {\r\n\t\t\t\t\t\t\ta.addClass('menu-file-link');\r\n\t\t\t\t\t\t} else {\r\n\t\t\t\t\t\t\ta.addClass('menu-external-link');\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t\ta.addEventListener('click', (e) => {\r\n\t\t\t\t\t\t\te.preventDefault();\r\n\t\t\t\t\t\t\tif (url.startsWith('file://')) {\r\n\t\t\t\t\t\t\t\ttry {\r\n\t\t\t\t\t\t\t\t\t// Convert file URL to path and handle Windows paths\r\n\t\t\t\t\t\t\t\t\tlet filePath = decodeURIComponent(url.substring(7)); // Remove 'file://'\r\n\t\t\t\t\t\t\t\t\t// Handle Windows paths that start with /C:\r\n\t\t\t\t\t\t\t\t\tif (filePath.startsWith('/') && filePath.charAt(2) === ':') {\r\n\t\t\t\t\t\t\t\t\t\tfilePath = filePath.substring(1);\r\n\t\t\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\t\t\tconsole.log('Opening file path:', filePath);\r\n\t\t\t\t\t\t\t\t\tshell.openPath(filePath);\r\n\t\t\t\t\t\t\t\t} catch (error) {\r\n\t\t\t\t\t\t\t\t\tconsole.error('Failed to open file:', error);\r\n\t\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\t} else {\r\n\t\t\t\t\t\t\t\twindow.open(url, '_blank', 'noopener,noreferrer');\r\n\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t});\r\n\t\t\t\t\t}\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t});\r\n\t}\r\n\r\n\tonunload() {\r\n\t\t// Cleanup if needed\r\n\t}\r\n}\r\n"],
  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAuB;AAGvB,IAAM,EAAE,MAAM,IAAI,QAAQ,UAAU;AAmBpC,IAAqB,aAArB,cAAwC,uBAAO;AAAA,EAC9C,MAAM,SAAS;AACd,SAAK,mCAAmC,QAAQ,CAAC,QAAQ,IAAI,QAAQ;AACpE,YAAM,QAAQ,OAAO,KAAK,EAAE,MAAM,IAAI;AACtC,UAAI,SAAS;AACb,UAAI,SAAiC,CAAC;AACtC,YAAM,QAAkB,CAAC;AAGzB,iBAAW,QAAQ,OAAO;AACzB,cAAM,UAAU,KAAK,KAAK;AAC1B,YAAI,QAAQ,WAAW,SAAS,KAAK,QAAQ,WAAW,QAAQ,GAAG;AAClE,gBAAM,aAAa,QAAQ,QAAQ,GAAG;AACtC,mBAAS,QAAQ,UAAU,aAAa,CAAC,EAAE,KAAK;AAAA,QACjD,WAAW,QAAQ,SAAS,GAAG,KAAK,CAAC,QAAQ,WAAW,GAAG,KAAK,CAAC,QAAQ,WAAW,IAAI,GAAG;AAE1F,gBAAM,CAAC,KAAK,GAAG,UAAU,IAAI,QAAQ,MAAM,GAAG;AAC9C,gBAAM,QAAQ,WAAW,KAAK,GAAG,EAAE,KAAK;AACxC,cAAI,OAAO,SAAS,CAAC,IAAI,SAAS,IAAI,KAAK,CAAC,IAAI,SAAS,MAAM,GAAG;AACjE,mBAAO,IAAI,KAAK,CAAC,IAAI;AAAA,UACtB;AAAA,QACD,WAAW,WAAW,CAAC,QAAQ,SAAS,GAAG,GAAG;AAC7C,gBAAM,KAAK,OAAO;AAAA,QACnB,WAAW,QAAQ,WAAW,GAAG,GAAG;AACnC,gBAAM,KAAK,OAAO;AAAA,QACnB;AAAA,MACD;AAEA,YAAM,cAAc,UAAU;AAC9B,YAAM,YAAY,GAAG,SAAS,OAAO,EAAE,KAAK,kBAAkB,cAAc,CAAC;AAG7E,UAAI,OAAO,KAAK,MAAM,EAAE,SAAS,GAAG;AACnC,mBAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,MAAM,GAAG;AAElD,cAAI,SAAS,IAAI,QAAQ,WAAW,YAAY;AAChD,oBAAU,MAAM,YAAY,KAAK,UAAU,KAAK;AAAA,QACjD;AAEA,YAAI,OAAO,YAAY,GAAG;AACzB,oBAAU,MAAM,YAAY,gBAAgB,OAAO,YAAY,CAAC;AAAA,QAEjE;AAAA,MACD;AAGA,iBAAW,QAAQ,OAAO;AACzB,YAAI,KAAK,WAAW,IAAI,KAAK,KAAK,SAAS,IAAI,GAAG;AAEjD,gBAAM,cAAc,KAAK,MAAM,GAAG,EAAE;AACpC,cAAI,OAAO;AACX,cAAI,OAAO;AACX,cAAI,YAAY,SAAS,GAAG,GAAG;AAC9B,aAAC,MAAM,IAAI,IAAI,YAAY,MAAM,GAAG;AAAA,UACrC;AACA,gBAAM,IAAI,UAAU,SAAS,KAAK;AAAA,YACjC;AAAA,YACA,MAAM,EAAE,aAAa,KAAK;AAAA,UAC3B,CAAC;AACD,YAAE,SAAS,oBAAoB;AAC/B,YAAE,MAAM,SAAS;AACjB,YAAE,iBAAiB,SAAS,CAAC,MAAM;AAClC,cAAE,eAAe;AACjB,kBAAM,YAAY,KAAK,IAAI,MAAM,QAAQ;AACzC,kBAAM,cAAc,mBAAmB,IAAI;AAC3C,kBAAM,MAAM,yBAAyB,mBAAmB,SAAS,UAAU;AAC3E,mBAAO,KAAK,GAAG;AAAA,UAChB,CAAC;AAAA,QACF,WAAW,KAAK,MAAM,gBAAgB,GAAG;AAExC,gBAAM,QAAQ,KAAK,MAAM,oBAAoB;AAC7C,cAAI,OAAO;AACV,kBAAM,OAAO,MAAM,CAAC;AACpB,kBAAM,MAAM,MAAM,CAAC;AACnB,kBAAM,IAAI,UAAU,SAAS,KAAK;AAAA,cACjC;AAAA,cACA,MAAM,IAAI,WAAW,SAAS,IAAI,CAAC,IAAI,EAAE,MAAM,KAAK,QAAQ,UAAU,KAAK,sBAAsB;AAAA,YAClG,CAAC;AACD,cAAE,MAAM,SAAS;AAGjB,gBAAI,IAAI,WAAW,SAAS,GAAG;AAC9B,gBAAE,SAAS,gBAAgB;AAAA,YAC5B,OAAO;AACN,gBAAE,SAAS,oBAAoB;AAAA,YAChC;AACA,cAAE,iBAAiB,SAAS,CAAC,MAAM;AAClC,gBAAE,eAAe;AACjB,kBAAI,IAAI,WAAW,SAAS,GAAG;AAC9B,oBAAI;AAEH,sBAAI,WAAW,mBAAmB,IAAI,UAAU,CAAC,CAAC;AAElD,sBAAI,SAAS,WAAW,GAAG,KAAK,SAAS,OAAO,CAAC,MAAM,KAAK;AAC3D,+BAAW,SAAS,UAAU,CAAC;AAAA,kBAChC;AACA,0BAAQ,IAAI,sBAAsB,QAAQ;AAC1C,wBAAM,SAAS,QAAQ;AAAA,gBACxB,SAAS,OAAP;AACD,0BAAQ,MAAM,wBAAwB,KAAK;AAAA,gBAC5C;AAAA,cACD,OAAO;AACN,uBAAO,KAAK,KAAK,UAAU,qBAAqB;AAAA,cACjD;AAAA,YACD,CAAC;AAAA,UACF;AAAA,QACD;AAAA,MACD;AAAA,IACD,CAAC;AAAA,EACF;AAAA,EAEA,WAAW;AAAA,EAEX;AACD;",
  "names": []
}
 diff --git a/main.ts b/main.ts index 1bf7e6c..a3f04f6 100644 --- a/main.ts +++ b/main.ts @@ -1,30 +1,13 @@ import { Plugin } from 'obsidian'; -import { fileURLToPath } from 'url'; const { shell } = require('electron'); -// Simple YAML parser for color properties -function parseYAML(text: string) { - const result: Record = {}; - const lines = text.split('\n'); - for (const line of lines) { - const trimmed = line.trim(); - if (trimmed && trimmed.includes(':')) { - const [key, ...valueParts] = trimmed.split(':'); - const value = valueParts.join(':').trim(); - if (key && value) { - result[key.trim()] = value; - } - } - } - return result; -} export default class MenuPlugin extends Plugin { async onload() { this.registerMarkdownCodeBlockProcessor('menu', (source, el, ctx) => { const lines = source.trim().split('\n'); - let layout = ''; + let layoutOrClass = ''; let colors: Record = {}; const links: string[] = []; @@ -33,7 +16,7 @@ export default class MenuPlugin extends Plugin { const trimmed = line.trim(); if (trimmed.startsWith('layout:') || trimmed.startsWith('class:')) { const colonIndex = trimmed.indexOf(':'); - layout = trimmed.substring(colonIndex + 1).trim(); + layoutOrClass = trimmed.substring(colonIndex + 1).trim(); } else if (trimmed.includes(':') && !trimmed.startsWith('[') && !trimmed.startsWith('[[')) { // Parse color properties const [key, ...valueParts] = trimmed.split(':'); @@ -48,23 +31,102 @@ export default class MenuPlugin extends Plugin { } } - const finalLayout = layout || 'default'; - const container = el.createEl('div', { cls: `menu-container ${finalLayout}` }); - - // Apply custom colors as CSS variables - if (Object.keys(colors).length > 0) { - for (const [key, value] of Object.entries(colors)) { - // Replace 'accent' with 'hover-text' for consistency - let cssKey = key.replace(/accent/g, 'hover-text'); - container.style.setProperty(`--${cssKey}`, value); + // Determine layout and classes + const builtInLayouts = new Set(['default', 'minimal', 'slate', 'horizon', 'aether']); + const container = el.createEl('div', { cls: 'menu-container' }); + + let selectedLayout = ''; + let extraClasses: string[] = []; + + if (layoutOrClass) { + const tokens = layoutOrClass.split(/\s+/).filter(Boolean); + if (tokens.length) { + // Allow built-in layout to appear anywhere in the list (e.g., "class: my-class horizon wide") + const builtInIndex = tokens.findIndex(t => builtInLayouts.has(t)); + if (builtInIndex !== -1) { + selectedLayout = tokens[builtInIndex]; + extraClasses = tokens.filter((_, i) => i !== builtInIndex); + } else { + // Custom class mode: do not apply plugin CSS (no data-layout) + extraClasses = tokens; + } } - // Example: ensure hover-text is set and add a comment for usage - if (colors['hover-text']) { - container.style.setProperty('--hover-text', colors['hover-text']); - // To use in CSS: a:hover { color: var(--hover-text); } + } else { + // No layout/class provided: use default built-in template + selectedLayout = 'default'; + } + + // Apply selected built-in template via data attribute (gates plugin CSS) + if (selectedLayout) { + container.setAttr('data-layout', selectedLayout); + } + + // Apply any extra classes (e.g., "wide" or user-provided classes) + for (const cls of extraClasses) { + container.addClass(cls); + } + + // Apply custom properties (whitelist only: bg, text, border, font and their -hover variants, + // plus internal-, external-, file- prefixed versions). No raw CSS props allowed. + if (Object.keys(colors).length > 0) { + const baseKeys = new Set([ + 'bg','text','border','font', + 'hover-text','hover-bg','hover-border','hover-font', + ]); + const normalizeKey = (raw: string) => { + let s = raw.trim().toLowerCase(); + // Normalize synonyms/order for hover variants + s = s + // Prefer "hover-*" (matches CSS) + .replace(/\btext-hover\b/g, 'hover-text') + .replace(/\bbg-hover\b/g, 'hover-bg') + .replace(/\bborder-hover\b/g, 'hover-border') + // Old naming from earlier versions -> new "hover-*" order + .replace(/\binternal-text-hover\b/g, 'internal-hover-text') + .replace(/\binternal-bg-hover\b/g, 'internal-hover-bg') + .replace(/\binternal-border-hover\b/g, 'internal-hover-border') + .replace(/\bexternal-text-hover\b/g, 'external-hover-text') + .replace(/\bexternal-bg-hover\b/g, 'external-hover-bg') + .replace(/\bexternal-border-hover\b/g, 'external-hover-border') + .replace(/\bfile-text-hover\b/g, 'file-hover-text') + .replace(/\bfile-bg-hover\b/g, 'file-hover-bg') + .replace(/\bfile-border-hover\b/g, 'file-hover-border') + // Back-compat for "accent" -> "hover-text" + .replace(/\baccent\b/g, 'hover-text') + .replace(/\binternal-accent\b/g, 'internal-hover-text') + .replace(/\bexternal-accent\b/g, 'external-hover-text') + .replace(/\bfile-accent\b/g, 'file-hover-text') + .replace(/\bbackground\b/g, 'bg'); + return s; + }; + const isAllowed = (key: string) => { + if (baseKeys.has(key)) return true; + const m = key.match(/^(internal|external|file)-(.*)$/); + return !!(m && baseKeys.has(m[2])); + }; + for (const [rawKey, value] of Object.entries(colors)) { + const key = normalizeKey(rawKey); + if (!isAllowed(key)) continue; + container.style.setProperty(`--${key}`, value); } } - + + // In custom class mode (no built-in layout), apply base inline styles to anchors so whitelist vars work without CSS. + const applyInlineBaseStyles = (a: HTMLElement, variant: 'internal' | 'external' | 'file' | 'generic') => { + const prefix = variant === 'generic' ? '' : `${variant}-`; + const get = (k: string) => (colors[`${prefix}${k}`] ?? colors[k]); + const bgVal = get('bg'); if (bgVal) a.style.background = bgVal as string; + const textVal = get('text'); if (textVal) a.style.color = textVal as string; + const borderVal = get('border'); if (borderVal) a.style.borderColor = borderVal as string; + const fontVal = get('font'); if (fontVal) a.style.fontFamily = fontVal as string; + // Expose hover values as CSS variables on the anchor for user CSS to consume if desired + const hoverKeys = ['hover-bg','hover-text','hover-border','hover-font']; + for (const hk of hoverKeys) { + const v = get(hk); + if (v) a.style.setProperty(`--${hk}`, v as string); + } + }; + // Process each link for (const link of links) { if (link.startsWith('[[') && link.endsWith(']]')) { @@ -80,6 +142,7 @@ export default class MenuPlugin extends Plugin { attr: { 'data-href': href } }); a.addClass('menu-internal-link'); + if (!selectedLayout) applyInlineBaseStyles(a, 'internal'); a.style.cursor = 'pointer'; a.addEventListener('click', (e) => { e.preventDefault(); @@ -103,8 +166,10 @@ export default class MenuPlugin extends Plugin { // Add appropriate class based on link type if (url.startsWith('file://')) { a.addClass('menu-file-link'); + if (!selectedLayout) applyInlineBaseStyles(a, 'file'); } else { a.addClass('menu-external-link'); + if (!selectedLayout) applyInlineBaseStyles(a, 'external'); } a.addEventListener('click', (e) => { e.preventDefault(); diff --git a/styles.css b/styles.css index 400bc5c..32fa7f0 100644 --- a/styles.css +++ b/styles.css @@ -1,6 +1,6 @@ /* Special styles to hide the border and icon on hover */ -.markdown-source-view.mod-cm6 .cm-embed-block:not(.cm-table-widget, .cm-lang-base):has(.menu-container):hover { +.markdown-source-view.mod-cm6 .cm-embed-block:not(.cm-table-widget, .cm-lang-base):has(.menu-container[data-layout]):hover { border-width: 0; outline: 0; box-shadow: var(--background-primary) 0 0 0 1px inset !important; @@ -22,8 +22,8 @@ } } -.menu-container, -.menu-container a { +.menu-container[data-layout], +.menu-container[data-layout] a { transition: 125ms; } @@ -35,12 +35,11 @@ /* Default style variant */ -.menu-container.default { +.menu-container[data-layout='default'] { display: flex; - gap: 1em; + gap: 0.7em; flex-wrap: wrap; border-radius: 6px; - background-color: var(--bg, var(--background-primary)); font-family: var(--font, inherit); a { @@ -51,49 +50,51 @@ font-weight: 500; border: 1px solid var(--border, var(--background-modifier-border)); color: var(--text, var(--text-normal)); + background: var(--bg, var(--background-primary)); font-family: var(--font, inherit); &:hover { color: var(--hover-text, var(--accent, var(--text-accent))); border-color: var(--hover-border, var(--accent, var(--text-accent))); + background: var(--hover-bg, transparent); } &.menu-internal-link { color: var(--internal-text, var(--text, var(--text-normal))); border-color: var(--internal-border, var(--border, var(--background-modifier-border))); - background-color: var(--internal-bg, transparent); + background: var(--internal-bg, var(--bg, var(--background-primary))); font-family: var(--internal-font, var(--font, inherit)); &:hover { color: var(--internal-hover-text, var(--internal-accent, var(--hover-text, var(--accent, var(--text-accent))))); border-color: var(--internal-hover-border, var(--hover-border, var(--accent, var(--text-accent)))); - background-color: var(--internal-hover-bg, var(--hover-bg, transparent)); + background: var(--internal-hover-bg, var(--hover-bg, transparent)); } } &.menu-external-link { color: var(--external-text, var(--text, var(--text-normal))); border-color: var(--external-border, var(--border, var(--background-modifier-border))); - background-color: var(--external-bg, transparent); + background: var(--external-bg, var(--bg, var(--background-primary))); font-family: var(--external-font, var(--font, inherit)); &:hover { color: var(--external-hover-text, var(--external-accent, var(--hover-text, var(--accent, var(--text-accent))))); border-color: var(--external-hover-border, var(--hover-border, var(--accent, var(--text-accent)))); - background-color: var(--external-hover-bg, var(--hover-bg, transparent)); + background: var(--external-hover-bg, var(--hover-bg, transparent)); } } &.menu-file-link { color: var(--file-text, var(--text, var(--text-normal))); border-color: var(--file-border, var(--border, var(--background-modifier-border))); - background-color: var(--file-bg, transparent); + background: var(--file-bg, var(--bg, var(--background-primary))); font-family: var(--file-font, var(--font, inherit)); &:hover { color: var(--file-hover-text, var(--file-accent, var(--hover-text, var(--accent, var(--text-accent))))); border-color: var(--file-hover-border, var(--hover-border, var(--accent, var(--text-accent)))); - background-color: var(--file-hover-bg, var(--hover-bg, transparent)); + background: var(--file-hover-bg, var(--hover-bg, transparent)); } } } @@ -112,12 +113,11 @@ /* Minimal style variant */ -.menu-container.minimal { +.menu-container[data-layout='minimal'] { display: flex; gap: 0.2em; flex-wrap: wrap; transition: 125ms; - background-color: var(--bg, transparent); font-family: var(--font, inherit); a { @@ -128,10 +128,11 @@ font-size: 0.9em; font-weight: normal; color: var(--text, var(--text-normal)); + background: var(--bg, transparent); font-family: var(--font, inherit); &:hover { - background-color: var(--hover-bg, var(--background-secondary)); + background: var(--hover-bg, var(--background-secondary)); color: var(--hover-text, var(--accent, var(--text-accent))); } @@ -141,7 +142,7 @@ &:hover { color: var(--internal-hover-text, var(--internal-accent, var(--hover-text, var(--internal-hover, var(--text-accent-hover))))); - background-color: var(--internal-hover-bg, var(--hover-bg, var(--background-secondary))); + background: var(--internal-hover-bg, var(--hover-bg, var(--background-secondary))); } } @@ -151,7 +152,7 @@ &:hover { color: var(--external-hover-text, var(--external-accent, var(--hover-text, var(--external-hover, var(--text-normal))))); - background-color: var(--external-hover-bg, var(--hover-bg, var(--background-secondary))); + background: var(--external-hover-bg, var(--hover-bg, var(--background-secondary))); } } @@ -161,18 +162,17 @@ &:hover { color: var(--file-hover-text, var(--file-accent, var(--hover-text, var(--file-hover, var(--text-normal))))); - background-color: var(--file-hover-bg, var(--hover-bg, var(--background-secondary))); + background: var(--file-hover-bg, var(--hover-bg, var(--background-secondary))); } } } } /* Minimal style variant */ -.menu-container.slate { +.menu-container[data-layout='slate'] { display: flex; gap: 0.2em; flex-wrap: wrap; - background-color: var(--bg, transparent); font-family: var(--font, inherit); a { @@ -182,13 +182,13 @@ transition: color 0.15s ease; font-size: 0.9em; font-weight: normal; - background-color: var(--item-bg, var(--background-secondary)); + background: var(--bg, var(--background-secondary)); border: 1px solid var(--border, var(--background-secondary)); color: var(--text, var(--text-faint)); font-family: var(--font, inherit); &:hover { - background-color: var(--hover-bg, var(--background-secondary)); + background: var(--hover-bg, var(--background-secondary)); color: var(--hover-text, var(--accent, var(--text-accent))); border: 1px solid var(--hover-border, var(--accent, var(--text-accent))); } @@ -196,51 +196,50 @@ &.menu-internal-link { color: var(--internal-text, var(--text, var(--text-faint))); border-color: var(--internal-border, var(--border, var(--background-secondary))); - background-color: var(--internal-bg, var(--item-bg, var(--background-secondary))); + background: var(--internal-bg, var(--bg, var(--background-secondary))); font-family: var(--internal-font, var(--font, inherit)); &:hover { color: var(--internal-hover-text, var(--internal-accent, var(--hover-text, var(--accent, var(--text-accent))))); border-color: var(--internal-hover-border, var(--hover-border, var(--accent, var(--text-accent)))); - background-color: var(--internal-hover-bg, var(--hover-bg, var(--background-secondary))); + background: var(--internal-hover-bg, var(--hover-bg, var(--background-secondary))); } } &.menu-external-link { color: var(--external-text, var(--text, var(--text-faint))); border-color: var(--external-border, var(--border, var(--background-secondary))); - background-color: var(--external-bg, var(--item-bg, var(--background-secondary))); + background: var(--external-bg, var(--bg, var(--background-secondary))); font-family: var(--external-font, var(--font, inherit)); &:hover { color: var(--external-hover-text, var(--external-accent, var(--hover-text, var(--accent, var(--text-accent))))); border-color: var(--external-hover-border, var(--hover-border, var(--accent, var(--text-accent)))); - background-color: var(--external-hover-bg, var(--hover-bg, var(--background-secondary))); + background: var(--external-hover-bg, var(--hover-bg, var(--background-secondary))); } } &.menu-file-link { color: var(--file-text, var(--text, var(--text-faint))); border-color: var(--file-border, var(--border, var(--background-secondary))); - background-color: var(--file-bg, var(--item-bg, var(--background-secondary))); + background: var(--file-bg, var(--bg, var(--background-secondary))); font-family: var(--file-font, var(--font, inherit)); &:hover { color: var(--file-hover-text, var(--file-accent, var(--hover-text, var(--accent, var(--text-accent))))); border-color: var(--file-hover-border, var(--hover-border, var(--accent, var(--text-accent)))); - background-color: var(--file-hover-bg, var(--hover-bg, var(--background-secondary))); + background: var(--file-hover-bg, var(--hover-bg, var(--background-secondary))); } } } } -.menu-container.horizon { +.menu-container[data-layout='horizon'] { display: flex; gap: 0.5em; flex-wrap: wrap; border-radius: 8px; - background-color: var(--bg, var(--background-primary)); font-family: var(--font, 'Space Grotesk', Inter, sans-serif); a { @@ -254,49 +253,51 @@ border-radius: 3px; padding-block: var(--size-2, 0.5em); padding-inline: var(--size-3, 2em); + background: var(--bg, transparent); transition: 250ms; &:hover { color: var(--hover-text, var(--accent, var(--orange-500, darkorange))); border: 1px solid var(--hover-border, var(--accent, var(--orange-500, darkorange))); + background: var(--hover-bg, transparent); } &.menu-internal-link { color: var(--internal-text, var(--text, var(--cyan-500, darkcyan))); border-color: var(--internal-border, var(--border, var(--cyan-500, darkcyan))); - background-color: var(--internal-bg, transparent); + background: var(--internal-bg, var(--bg, transparent)); font-family: var(--internal-font, var(--font, 'Space Grotesk', Inter, sans-serif)); &:hover { color: var(--internal-hover-text, var(--internal-accent, var(--hover-text, var(--accent, var(--orange-500, darkorange))))); border-color: var(--internal-hover-border, var(--hover-border, var(--accent, var(--orange-500, darkorange)))); - background-color: var(--internal-hover-bg, var(--hover-bg, transparent)); + background: var(--internal-hover-bg, var(--hover-bg, transparent)); } } &.menu-external-link { color: var(--external-text, var(--text, var(--cyan-500, darkcyan))); border-color: var(--external-border, var(--border, var(--cyan-500, darkcyan))); - background-color: var(--external-bg, transparent); + background: var(--external-bg, var(--bg, transparent)); font-family: var(--external-font, var(--font, 'Space Grotesk', Inter, sans-serif)); &:hover { color: var(--external-hover-text, var(--external-accent, var(--hover-text, var(--accent, var(--orange-500, darkorange))))); border-color: var(--external-hover-border, var(--hover-border, var(--accent, var(--orange-500, darkorange)))); - background-color: var(--external-hover-bg, var(--hover-bg, transparent)); + background: var(--external-hover-bg, var(--hover-bg, transparent)); } } &.menu-file-link { color: var(--file-text, var(--text, var(--cyan-500, darkcyan))); border-color: var(--file-border, var(--border, var(--cyan-500, darkcyan))); - background-color: var(--file-bg, transparent); + background: var(--file-bg, var(--bg, transparent)); font-family: var(--file-font, var(--font, 'Space Grotesk', Inter, sans-serif)); &:hover { color: var(--file-hover-text, var(--file-accent, var(--hover-text, var(--accent, var(--orange-500, darkorange))))); border-color: var(--file-hover-border, var(--hover-border, var(--accent, var(--orange-500, darkorange)))); - background-color: var(--file-hover-bg, var(--hover-bg, transparent)); + background: var(--file-hover-bg, var(--hover-bg, transparent)); } } } @@ -308,11 +309,10 @@ } } -.menu-container.aether { +.menu-container[data-layout='aether'] { display: grid; grid-template-columns: repeat(auto-fit, minmax(150px, 1fr)); gap: 0.5em; - background-color: var(--bg, transparent); font-family: var(--font, inherit); a { @@ -323,50 +323,51 @@ border-radius: 8px; color: var(--text, var(--text-normal)); border: 1px solid var(--border, var(--background-modifier-border)); + background: var(--bg, transparent); font-family: var(--font, inherit); &:hover { color: var(--hover-text, var(--accent, var(--text-accent))); border-color: var(--hover-border, var(--accent, var(--text-accent))); - background-color: var(--hover-bg, var(--background-modifier-hover)); + background: var(--hover-bg, var(--background-modifier-hover)); } &.menu-internal-link { color: var(--internal-text, var(--text, var(--text-normal))); border-color: var(--internal-border, var(--border, var(--background-modifier-border))); - background-color: var(--internal-bg, transparent); + background: var(--internal-bg, var(--bg, transparent)); font-family: var(--internal-font, var(--font, inherit)); &:hover { color: var(--internal-hover-text, var(--internal-accent, var(--hover-text, var(--accent, var(--text-accent))))); border-color: var(--internal-hover-border, var(--hover-border, var(--accent, var(--text-accent)))); - background-color: var(--internal-hover-bg, var(--hover-bg, var(--background-modifier-hover))); + background: var(--internal-hover-bg, var(--hover-bg, var(--background-modifier-hover))); } } &.menu-external-link { color: var(--external-text, var(--text, var(--text-normal))); border-color: var(--external-border, var(--border, var(--background-modifier-border))); - background-color: var(--external-bg, transparent); + background: var(--external-bg, var(--bg, transparent)); font-family: var(--external-font, var(--font, inherit)); &:hover { color: var(--external-hover-text, var(--external-accent, var(--hover-text, var(--accent, var(--text-accent))))); border-color: var(--external-hover-border, var(--hover-border, var(--accent, var(--text-accent)))); - background-color: var(--external-hover-bg, var(--hover-bg, var(--background-modifier-hover))); + background: var(--external-hover-bg, var(--hover-bg, var(--background-modifier-hover))); } } &.menu-file-link { color: var(--file-text, var(--text, var(--text-normal))); border-color: var(--file-border, var(--border, var(--background-modifier-border))); - background-color: var(--file-bg, transparent); + background: var(--file-bg, var(--bg, transparent)); font-family: var(--file-font, var(--font, inherit)); &:hover { color: var(--file-hover-text, var(--file-accent, var(--hover-text, var(--accent, var(--text-accent))))); border-color: var(--file-hover-border, var(--hover-border, var(--accent, var(--text-accent)))); - background-color: var(--file-hover-bg, var(--hover-bg, var(--background-modifier-hover))); + background: var(--file-hover-bg, var(--hover-bg, var(--background-modifier-hover))); } } }