diff --git a/src/assets/colour-x128.png b/src/_assets/colour-x128.png similarity index 100% rename from src/assets/colour-x128.png rename to src/_assets/colour-x128.png diff --git a/src/assets/colour-x16.png b/src/_assets/colour-x16.png similarity index 100% rename from src/assets/colour-x16.png rename to src/_assets/colour-x16.png diff --git a/src/assets/colour-x256.png b/src/_assets/colour-x256.png similarity index 100% rename from src/assets/colour-x256.png rename to src/_assets/colour-x256.png diff --git a/src/assets/colour-x32.png b/src/_assets/colour-x32.png similarity index 100% rename from src/assets/colour-x32.png rename to src/_assets/colour-x32.png diff --git a/src/assets/colour-x48.png b/src/_assets/colour-x48.png similarity index 100% rename from src/assets/colour-x48.png rename to src/_assets/colour-x48.png diff --git a/src/assets/colour-x512.png b/src/_assets/colour-x512.png similarity index 100% rename from src/assets/colour-x512.png rename to src/_assets/colour-x512.png diff --git a/src/assets/colour-x64.png b/src/_assets/colour-x64.png similarity index 100% rename from src/assets/colour-x64.png rename to src/_assets/colour-x64.png diff --git a/src/assets/icons.svg.js b/src/_assets/icons.svg.js similarity index 74% rename from src/assets/icons.svg.js rename to src/_assets/icons.svg.js index 108cece..07a18e5 100644 --- a/src/assets/icons.svg.js +++ b/src/_assets/icons.svg.js @@ -4,9 +4,8 @@ * (https://notion-enhancer.github.io/) under the MIT license */ -const iconColour = ``; - -const iconMonochrome = ``; +const iconColour = ``, + iconMonochrome = ``; globalThis.__enhancerApi ??= {}; Object.assign(globalThis.__enhancerApi, { iconColour, iconMonochrome }); diff --git a/src/shared/events.js b/src/_common/events.js similarity index 100% rename from src/shared/events.js rename to src/_common/events.js diff --git a/src/shared/markup.js b/src/_common/markup.js similarity index 98% rename from src/shared/markup.js rename to src/_common/markup.js index d52ac35..0d95a03 100644 --- a/src/shared/markup.js +++ b/src/_common/markup.js @@ -6,8 +6,6 @@ "use strict"; -// jump to - const { twind, htm, lucide } = globalThis, { iconColour, iconMonochrome } = globalThis.__enhancerApi; @@ -83,7 +81,10 @@ const encodeSvg = (svg) => // complex markup, e.g. `` twind.install({ darkMode: "class", - rules: [[/^i-((?:\w|-)+)(?:\?(mask|bg|auto))?$/, presetIcons]], + rules: [ + ["text-(wrap|nowrap|balance|pretty)", "textWrap"], + [/^i-((?:\w|-)+)(?:\?(mask|bg|auto))?$/, presetIcons], + ], variants: [ // https://github.com/tw-in-js/twind/blob/main/packages/preset-ext/src/variants.ts [ diff --git a/src/archive/notion.js b/src/_common/notion.js similarity index 100% rename from src/archive/notion.js rename to src/_common/notion.js diff --git a/src/shared/registry.js b/src/_common/registry.js similarity index 100% rename from src/shared/registry.js rename to src/_common/registry.js diff --git a/src/shared/system.js b/src/_common/system.js similarity index 100% rename from src/shared/system.js rename to src/_common/system.js diff --git a/src/vendor/coloris.min.css b/src/_vendor/coloris.min.css similarity index 100% rename from src/vendor/coloris.min.css rename to src/_vendor/coloris.min.css diff --git a/src/vendor/coloris.min.js b/src/_vendor/coloris.min.js similarity index 100% rename from src/vendor/coloris.min.js rename to src/_vendor/coloris.min.js diff --git a/src/vendor/content-types.min.js b/src/_vendor/content-types.min.js similarity index 100% rename from src/vendor/content-types.min.js rename to src/_vendor/content-types.min.js diff --git a/src/vendor/htm.min.js b/src/_vendor/htm.min.js similarity index 100% rename from src/vendor/htm.min.js rename to src/_vendor/htm.min.js diff --git a/src/vendor/lucide.min.js b/src/_vendor/lucide.min.js similarity index 100% rename from src/vendor/lucide.min.js rename to src/_vendor/lucide.min.js diff --git a/src/vendor/twind.min.js b/src/_vendor/twind.min.js similarity index 100% rename from src/vendor/twind.min.js rename to src/_vendor/twind.min.js diff --git a/src/core/client.mjs b/src/core/client.mjs index c92197b..9e92adf 100644 --- a/src/core/client.mjs +++ b/src/core/client.mjs @@ -183,7 +183,6 @@ const insertPanel = async (api, db) => { appendToDom(); useState(["panelOpen"], ([panelOpen]) => { - console.log(panelOpen); if (panelOpen) $panelTopbarBtn.setAttribute("data-active", true); else $panelTopbarBtn.removeAttribute("data-active"); }); diff --git a/src/core/menu/index.html b/src/core/menu/index.html index 9f81db7..b5ed36e 100644 --- a/src/core/menu/index.html +++ b/src/core/menu/index.html @@ -6,8 +6,8 @@ notion-enhancer menu - - + + diff --git a/src/core/menu/islands/Input.mjs b/src/core/menu/islands/Input.mjs index 14d97d2..8154551 100644 --- a/src/core/menu/islands/Input.mjs +++ b/src/core/menu/islands/Input.mjs @@ -105,11 +105,10 @@ function Input({ class="h-full w-full pb-px text-[14px] leading-[1.2] ${variant === "lg" ? "pl-[12px] pr-[40px]" : "pl-[8px] pr-[32px]"} appearance-none bg-transparent ${type === "file" ? "hidden" : ""} + ${type === "hotkey" ? "text-[color:var(--theme--fg-secondary)]" : ""} ${type === "color" ? "font-medium" - : type === "hotkey" - ? "text-[color:var(--theme--fg-secondary)] border-(& [color:var(--theme--fg-border)])" - : ""}" + : "border-(& [color:var(--theme--fg-border)])"}" data-coloris=${type === "color"} ...${props} />`, @@ -170,9 +169,11 @@ function Input({