diff --git a/package.json b/package.json index 9304954f..20474a0d 100644 --- a/package.json +++ b/package.json @@ -4,12 +4,13 @@ "version": "0.0.0", "type": "module", "scripts": { - "build": "rsw build && tsc && vite build", + "build": "rsw build && vite build", "dev": "vite", "lint": "tsc && eslint . --ext .ts,.tsx", "preview": "vite preview", "tauri-dev": "concurrently -n app,rsw \"tauri dev\" \"rsw watch\"", - "tauri-build": "tauri build" + "tauri-build": "npm run build:icon && tauri build", + "build:icon": "tauri icon src-tauri/icons/icon.png" }, "dependencies": { "@codemirror/commands": "^6.2.1", diff --git a/src-tauri/icons/128x128.png b/src-tauri/icons/128x128.png index 90b6acd0..c6d09f84 100644 Binary files a/src-tauri/icons/128x128.png and b/src-tauri/icons/128x128.png differ diff --git a/src-tauri/icons/128x128@2x.png b/src-tauri/icons/128x128@2x.png index 4e534b32..56042910 100644 Binary files a/src-tauri/icons/128x128@2x.png and b/src-tauri/icons/128x128@2x.png differ diff --git a/src-tauri/icons/32x32.png b/src-tauri/icons/32x32.png index 179779b3..cd33c75b 100644 Binary files a/src-tauri/icons/32x32.png and b/src-tauri/icons/32x32.png differ diff --git a/src-tauri/icons/Square107x107Logo.png b/src-tauri/icons/Square107x107Logo.png index 706f5fcc..ff223a94 100644 Binary files a/src-tauri/icons/Square107x107Logo.png and b/src-tauri/icons/Square107x107Logo.png differ diff --git a/src-tauri/icons/Square142x142Logo.png b/src-tauri/icons/Square142x142Logo.png index e8126a6b..f6d0f480 100644 Binary files a/src-tauri/icons/Square142x142Logo.png and b/src-tauri/icons/Square142x142Logo.png differ diff --git a/src-tauri/icons/Square150x150Logo.png b/src-tauri/icons/Square150x150Logo.png index 0b4e7bba..05e7677f 100644 Binary files a/src-tauri/icons/Square150x150Logo.png and b/src-tauri/icons/Square150x150Logo.png differ diff --git a/src-tauri/icons/Square284x284Logo.png b/src-tauri/icons/Square284x284Logo.png index e2c53f7f..ec791ebb 100644 Binary files a/src-tauri/icons/Square284x284Logo.png and b/src-tauri/icons/Square284x284Logo.png differ diff --git a/src-tauri/icons/Square30x30Logo.png b/src-tauri/icons/Square30x30Logo.png index 1b05c23c..6c1ddfc2 100644 Binary files a/src-tauri/icons/Square30x30Logo.png and b/src-tauri/icons/Square30x30Logo.png differ diff --git a/src-tauri/icons/Square310x310Logo.png b/src-tauri/icons/Square310x310Logo.png index 46691e23..3c41765d 100644 Binary files a/src-tauri/icons/Square310x310Logo.png and b/src-tauri/icons/Square310x310Logo.png differ diff --git a/src-tauri/icons/Square44x44Logo.png b/src-tauri/icons/Square44x44Logo.png index b939e4aa..4c89bd94 100644 Binary files a/src-tauri/icons/Square44x44Logo.png and b/src-tauri/icons/Square44x44Logo.png differ diff --git a/src-tauri/icons/Square71x71Logo.png b/src-tauri/icons/Square71x71Logo.png index 29be51b3..39768b1b 100644 Binary files a/src-tauri/icons/Square71x71Logo.png and b/src-tauri/icons/Square71x71Logo.png differ diff --git a/src-tauri/icons/Square89x89Logo.png b/src-tauri/icons/Square89x89Logo.png index c88253a3..50596345 100644 Binary files a/src-tauri/icons/Square89x89Logo.png and b/src-tauri/icons/Square89x89Logo.png differ diff --git a/src-tauri/icons/StoreLogo.png b/src-tauri/icons/StoreLogo.png index 13683473..0d5ac313 100644 Binary files a/src-tauri/icons/StoreLogo.png and b/src-tauri/icons/StoreLogo.png differ diff --git a/src-tauri/icons/icon.afdesign b/src-tauri/icons/icon.afdesign new file mode 100644 index 00000000..47bc8f17 Binary files /dev/null and b/src-tauri/icons/icon.afdesign differ diff --git a/src-tauri/icons/icon.icns b/src-tauri/icons/icon.icns index 2c7bea99..c5085350 100644 Binary files a/src-tauri/icons/icon.icns and b/src-tauri/icons/icon.icns differ diff --git a/src-tauri/icons/icon.ico b/src-tauri/icons/icon.ico index ccd1ad36..17ced71b 100644 Binary files a/src-tauri/icons/icon.ico and b/src-tauri/icons/icon.ico differ diff --git a/src-web/components/Editor/Editor.css b/src-web/components/Editor/Editor.css index 3fdeaebf..6704bae9 100644 --- a/src-web/components/Editor/Editor.css +++ b/src-web/components/Editor/Editor.css @@ -21,8 +21,8 @@ } .cm-editor .placeholder-widget { - @apply text-xs text-white bg-blue-400 py-[1px] px-1 mx-[1px] rounded border border-gray-50 cursor-pointer; - text-shadow: 0 0 0.2em black; + @apply text-xs text-white bg-blue-400 py-[1px] px-1 mx-[1px] rounded cursor-default hover:bg-blue-500; + text-shadow: 0 0 1px rgba(0, 0, 0, 0.9); } .cm-editor .cm-scroller { diff --git a/src-web/components/Editor/extensions.ts b/src-web/components/Editor/extensions.ts index d3c7fcf0..6ba9e65b 100644 --- a/src-web/components/Editor/extensions.ts +++ b/src-web/components/Editor/extensions.ts @@ -44,13 +44,13 @@ export const myHighlightStyle = HighlightStyle.define([ }, { tag: [t.name, t.tagName, t.angleBracket, t.docString, t.number], - color: 'hsl(var(--color-blue-500))', + color: 'hsl(var(--color-blue-600))', }, { tag: [t.variableName], color: '#31c434' }, { tag: [t.bool], color: '#e864f6' }, - { tag: [t.attributeName], color: 'hsl(var(--color-violet-500))' }, - { tag: [t.attributeValue], color: 'hsl(var(--color-orange-500))' }, - { tag: [t.string], color: 'hsl(var(--color-yellow-500))' }, + { tag: [t.attributeName], color: 'hsl(var(--color-violet-600))' }, + { tag: [t.attributeValue], color: 'hsl(var(--color-orange-600))' }, + { tag: [t.string], color: 'hsl(var(--color-yellow-600))' }, { tag: [t.keyword, t.meta, t.operator], color: '#45e8a4' }, ]); diff --git a/src-web/main.css b/src-web/main.css index 600363a5..a68b0c24 100644 --- a/src-web/main.css +++ b/src-web/main.css @@ -30,6 +30,7 @@ html, body, #root { :root, [data-theme="light"] { /* Colors */ --color-white: 255 100% 100%; + --color-black: 255 0% 0%; --color-background: var(--color-white); --color-blue-50: 217 91% 95%; @@ -107,7 +108,6 @@ html, body, #root { } [data-theme="dark"] { - --color-white: 255 100% 100%; --color-background: 217 21% 7%; --color-blue-900: 217 91% 95%; diff --git a/tailwind.config.cjs b/tailwind.config.cjs index a87f6d09..6f80f0c4 100644 --- a/tailwind.config.cjs +++ b/tailwind.config.cjs @@ -17,6 +17,7 @@ module.exports = { colors: { transparent: 'transparent', white: 'hsl(var(--color-white) / )', + black: 'hsl(var(--color-black) / )', background: 'hsl(var(--color-background) / )', gray: color('gray'), blue: color('blue'),