diff --git a/package-lock.json b/package-lock.json index 12be55a..d8a7d72 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,18 +1,52 @@ { "name": "logseq-catppuccin", - "version": "0.0.1", + "version": "0.2.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "logseq-catppuccin", - "version": "0.0.1", + "version": "0.2.3", "license": "MIT", "devDependencies": { + "@catppuccin/highlightjs": "^0.1.4", + "@catppuccin/palette": "^1.1.0", "rimraf": "^3.0.2", "sass": "^1.55.0" } }, + "node_modules/@catppuccin/highlightjs": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@catppuccin/highlightjs/-/highlightjs-0.1.4.tgz", + "integrity": "sha512-PEzMrpE7VvXFLvQuNAomTcvAuXUJlBlcqvSqhHYFapSxBKye+auNokemssEVuv053KH7Go44Aa4sE+rZNOM5cQ==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/catppuccin" + }, + { + "type": "github", + "url": "https://github.com/sponsors/catppuccin" + } + ] + }, + "node_modules/@catppuccin/palette": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@catppuccin/palette/-/palette-1.1.0.tgz", + "integrity": "sha512-ef3q3/MfdKc2EmUWiLrBrBKLFMGbukC1mzJh+QPINP7ovmUQycImSRjf/LMD4ti9lcu9NrYv4++zeoO2Z5lPxQ==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/catppuccin" + }, + { + "type": "github", + "url": "https://github.com/sponsors/catppuccin" + } + ] + }, "node_modules/anymatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", @@ -348,6 +382,18 @@ } }, "dependencies": { + "@catppuccin/highlightjs": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@catppuccin/highlightjs/-/highlightjs-0.1.4.tgz", + "integrity": "sha512-PEzMrpE7VvXFLvQuNAomTcvAuXUJlBlcqvSqhHYFapSxBKye+auNokemssEVuv053KH7Go44Aa4sE+rZNOM5cQ==", + "dev": true + }, + "@catppuccin/palette": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@catppuccin/palette/-/palette-1.1.0.tgz", + "integrity": "sha512-ef3q3/MfdKc2EmUWiLrBrBKLFMGbukC1mzJh+QPINP7ovmUQycImSRjf/LMD4ti9lcu9NrYv4++zeoO2Z5lPxQ==", + "dev": true + }, "anymatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", diff --git a/package.json b/package.json index 57ddd3e..e41fcc0 100644 --- a/package.json +++ b/package.json @@ -4,13 +4,8 @@ "description": "🦫 Soothing pastel theme for Logseq", "main": "index.html", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", - "start": "sass --watch scss:.", - "build:latte": "sass scss/ctp-latte.scss ctp-latte.css --no-source-map", - "build:frappe": "sass scss/ctp-frappe.scss ctp-frappe.css --no-source-map", - "build:macchiato": "sass scss/ctp-macchiato.scss ctp-macchiato.css --no-source-map", - "build:mocha": "sass scss/ctp-mocha.scss ctp-mocha.css --no-source-map", - "build": "sass scss:. --no-source-map", + "start": "sass -I node_modules --watch scss:.", + "build": "sass -I node_modules --no-charset --no-source-map scss:.", "clean": "rimraf *.css*" }, "repository": { @@ -25,6 +20,8 @@ }, "homepage": "https://github.com/catppuccin/logseq#readme", "devDependencies": { + "@catppuccin/highlightjs": "^0.1.4", + "@catppuccin/palette": "^1.1.0", "rimraf": "^3.0.2", "sass": "^1.55.0" }, @@ -61,7 +58,7 @@ "mode": "dark" } ], - "title": "Catppuccin", + "title": "Catppuccin", "id": "logseq-catppuccin", "icon": "./assets/icon.png" } diff --git a/scss/_highlightjs.scss b/scss/_highlightjs.scss new file mode 100644 index 0000000..fc8cfe2 --- /dev/null +++ b/scss/_highlightjs.scss @@ -0,0 +1,8 @@ +@use "@catppuccin/highlightjs/sass/catppuccin.variables"; + +html:not(html[data-color]), +html[data-color='none'] { + code.hljs { + background-color: var(--ctp-tertiary-background-color); + } +} \ No newline at end of file diff --git a/scss/_main.scss b/scss/_main.scss index 33c3a42..fccbb7e 100644 --- a/scss/_main.scss +++ b/scss/_main.scss @@ -3,4 +3,5 @@ @use "ls-vars.scss"; @use "lx-vars.scss"; @use "custom.scss"; -@use "codemirror.scss"; \ No newline at end of file +@use "codemirror.scss"; +@use "highlightjs.scss";