feat: implement light theme#776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ACTCD merged 21 commits into from
Mar 24, 2025
Merged

feat: implement light theme #776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7424631
feat: implement light theme foundation
quoid Mar 2, 2025
7e3a557
refactor: migrate and rename shared resources
ACTCD Mar 2, 2025
0b5d601
refactor: use path alias in vite and ts
ACTCD Mar 2, 2025
7183324
refactor: some minor fixes of dev mode
ACTCD Mar 2, 2025
883786c
refactor: merge light and dark svg logo
ACTCD Mar 2, 2025
36d303e
feat: auto adapt to system color themes
ACTCD Mar 2, 2025
f2c0abc
fix: adjust red button text color
ACTCD Mar 2, 2025
d7217f0
feat: light theme logo text and ios launch screen
ACTCD Mar 3, 2025
ea317b8
fix: ios status bar color theme adaptive
ACTCD Mar 3, 2025
6a3a84d
chore: include light logo in sketch project
quoid Mar 3, 2025
c02f5d4
refactor: add light mode to indeterminate loader
quoid Mar 3, 2025
e066830
fix: use `var` for notification border
quoid Mar 3, 2025
2f0f337
refactor: split css var `--color-black`
ACTCD Mar 3, 2025
d416eb4
fix: add light theme text highlight colors
ACTCD Mar 3, 2025
6e55319
style: adjust light theme border color
ACTCD Mar 3, 2025
5809615
chore: popup dev page adapt light theme
ACTCD Mar 3, 2025
d23cb06
style: add light theme modal mask background color
ACTCD Mar 3, 2025
57feee7
style: add light theme box-shadow variable
ACTCD Mar 3, 2025
5dcd182
style: adjust font weight of settings ui
ACTCD Mar 4, 2025
122422f
style: fix light theme reset button color
ACTCD Mar 4, 2025
0c5ea39
fix: adjust icon shadows and sizes
ACTCD Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion entry-app-webview.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
name="viewport"
content="width=device-width, initial-scale=1, user-scalable=no"
/>
<meta name="color-scheme" content="dark" />
<meta name="color-scheme" content="dark light" />
<title>Userscripts App</title>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion entry-ext-action-popup.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="color-scheme" content="dark" />
<meta name="color-scheme" content="dark light" />
<title>Userscripts popup</title>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion entry-ext-extension-page.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="color-scheme" content="dark" />
<meta name="color-scheme" content="dark light" />
<title>Userscripts page</title>
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions eslint.config.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,15 +40,15 @@ export default [

/** @see {@link https://eslint.org/docs/latest/use/configure/migration-guide#configuring-language-options} */
{
files: ["scripts/**/*.js"],
files: ["*.js", "scripts/**/*.js"],
languageOptions: {
globals: {
...globals.node,
},
},
},
{
files: ["src/{app,dev}/**/*.{js,svelte}"],
files: ["src/{app,dev,shared}/**/*.{js,svelte}"],
languageOptions: {
globals: {
...globals.browser,
Expand Down
Binary file modifiedetc/uilayout.sketch
View file
Open in desktop
Binary file not shown.
Binary file modifiedpublic/ext/safari-15/images/icon-128.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-256.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-48.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-512.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedpublic/ext/safari-15/images/icon-64.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-96.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/toolbar-icon-16.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/toolbar-icon-32.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedpublic/ext/safari-15/images/toolbar-icon-48.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion public/ext/safari-15/manifest.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
"version": "_VERSION_",
"icons": {
"48": "images/icon-48.png",
"64": "images/icon-64.png",
"96": "images/icon-96.png",
"128": "images/icon-128.png",
"256": "images/icon-256.png",
Expand All@@ -19,7 +20,8 @@
"default_popup": "dist/entry-ext-action-popup.html",
"default_icon": {
"16": "images/toolbar-icon-16.png",
"32": "images/toolbar-icon-32.png"
"32": "images/toolbar-icon-32.png",
"48": "images/toolbar-icon-48.png"
}
},
"options_ui": {
Expand Down
7 changes: 7 additions & 0 deletions scripts/utils.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -191,4 +191,11 @@ export const baseConfig = {
"import.meta.env.GIT_TAG": JSON.stringify(gitTag),
"import.meta.env.GIT_COMMIT": JSON.stringify(gitCommit),
},
resolve: {
alias: {
// NOTE: Don't forget to modify the `paths` in `jsconfig.json` also
"@shared": fileURLToPath(new URL("../src/shared", import.meta.url)),
"@ext": fileURLToPath(new URL("../src/ext/shared", import.meta.url)),
},
},
};
17 changes: 9 additions & 8 deletions src/app/App.svelte
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
<svelte:options runes={true} />

<script>
import icon from "./img/icon.png";
import logo from "./img/logo.svg?raw";
import IconDebug from "../ext/shared/img/icon-bug.svg?raw";
import Dropdown from "../ext/shared/Components/Dropdown.svelte";
import logoIcon from "@shared/img/logo-icon.png";
import LogoText from "@shared/Components/LogoText.svelte";
import IconDebug from "@shared/img/icon-bug.svg?raw";
import Dropdown from "@shared/Components/Dropdown.svelte";
import { i18nInit } from "./i18n.js";

const baseUrl = "https://github.com/quoid/userscripts";
Expand DownExpand Up@@ -151,10 +151,11 @@
alt="Userscripts App Icon"
class="icon"
draggable="false"
src={icon}
src={logoIcon}
/>
<!-- eslint-disable-next-line svelte/no-at-html-tags -->
<div class="logo">{@html logo}</div>
<div class="logo">
<LogoText />
</div>
<div class="version">
{#if import.meta.env.GIT_TAG && import.meta.env.GIT_COMMIT}
<a href="{baseUrl}/releases/tag/{import.meta.env.GIT_TAG}">
Expand DownExpand Up@@ -370,7 +371,7 @@

button.red,
button.red2:hover {
color: var(--text-color-primary);
color: var(--color-white);
background-color: var(--color-red);
}

Expand Down
2 changes: 1 addition & 1 deletion src/app/i18n.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ export async function i18nInit() {
md: (n, s) => getLangFrom(markdown, n, s),
};
} catch (error) {
console.debug(error);
console.debug("Will fall back to `en`", error);
}
}
throw Error("I18n initialization failed");
Expand Down
1 change: 0 additions & 1 deletion src/app/img/logo.svg
View file
Open in desktop

This file was deleted.

6 changes: 5 additions & 1 deletion src/app/jsconfig.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,11 @@
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"skipLibCheck": true,
"sourceMap": true
"sourceMap": true,

"paths": {
"@shared/*": ["../shared/*"]
}
},
"include": ["**/*.d.ts", "**/*.js", "**/*.svelte"]
}
35 changes: 34 additions & 1 deletion src/app/main.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,42 @@
import "./reset.css";
import "../shared/variables.css";
import "@shared/variables.css";
import "./app.css";
import { mount } from "svelte";
import App from "./App.svelte";

if (import.meta.env.MODE === "development") {
// Simulation in non-WkWebView dev environment
if (import.meta.env.SAFARI_PLATFORM === undefined) {
console.warn("Simulation webkit...");
window.webkit = {
messageHandlers: {
controller: {
postMessage: async (message) => {
switch (message) {
case "INIT":
return {
build: "2",
directory: "Userscripts App Documents",
enableLogger: true,
extStatus: "unknown",
firstRunTime: 1,
maxLogFileSize: 500_000_000,
platform: "mac",
promptLogger: true,
useSettingsInsteadOfPreferences: true,
version: "2.0.0",
};
default:
console.debug("Simulation.webkit.messageHandler:", message);
break;
}
},
},
},
};
}
}

const app = mount(App, { target: document.getElementById("app") });

export default app;
24 changes: 12 additions & 12 deletions src/ext/action-popup/App.svelte
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
<script>
import { onMount } from "svelte";
import IconButton from "../shared/Components/IconButton.svelte";
import Toggle from "../shared/Components/Toggle.svelte";
import Loader from "../shared/Components/Loader.svelte";
import IconButton from "@shared/Components/IconButton.svelte";
import Toggle from "@shared/Components/Toggle.svelte";
import Loader from "@shared/Components/Loader.svelte";
import PopupItem from "./Components/PopupItem.svelte";
import View from "./Components/View.svelte";
import UpdateView from "./Components/Views/UpdateView.svelte";
import InstallView from "./Components/Views/InstallView.svelte";
import AllItemsView from "./Components/Views/AllItemsView.svelte";
import iconOpen from "../shared/img/icon-open.svg?raw";
import iconUpdate from "../shared/img/icon-update.svg?raw";
import iconClear from "../shared/img/icon-clear.svg?raw";
import iconRefresh from "../shared/img/icon-refresh.svg?raw";
import { extensionPaths, openExtensionPage } from "../shared/utils.js";
import { connectNative, sendNativeMessage } from "../shared/native.js";
import * as settingsStorage from "../shared/settings.js";
import iconOpen from "@shared/img/icon-open.svg?raw";
import iconUpdate from "@shared/img/icon-update.svg?raw";
import iconClear from "@shared/img/icon-clear.svg?raw";
import iconRefresh from "@shared/img/icon-refresh.svg?raw";
import { extensionPaths, openExtensionPage } from "@ext/utils.js";
import { connectNative, sendNativeMessage } from "@ext/native.js";
import * as settingsStorage from "@ext/settings.js";

let errorNotification;
let active = true;
Expand DownExpand Up@@ -657,7 +657,7 @@

.header .buttons {
align-items: center;
border-bottom: 1px solid var(--color-black);
border-bottom: 1px solid var(--border-color);
display: flex;
padding: 0.5rem 1rem calc(0.5rem - 1px);
}
Expand DownExpand Up@@ -746,7 +746,7 @@
}

.footer {
border-top: 1px solid var(--color-black);
border-top: 1px solid var(--border-color);
font-weight: 600;
line-height: 1.5rem;
padding: 0.5rem 0;
Expand Down
4 changes: 2 additions & 2 deletions src/ext/action-popup/Components/PopupItem.svelte
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
<script>
import Tag from "../../shared/Components/Tag.svelte";
import Tag from "@shared/Components/Tag.svelte";

export let background;
export let enabled = false;
Expand DownExpand Up@@ -50,7 +50,7 @@
span {
align-items: center;
background-color: var(--color-red);
border: 1px solid var(--color-black);
border: 1px solid var(--border-color);
border-radius: 50%;
display: flex;
display: none;
Expand Down
8 changes: 4 additions & 4 deletions src/ext/action-popup/Components/View.svelte
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
<script>
import { quintInOut } from "svelte/easing";
import IconButton from "../../shared/Components/IconButton.svelte";
import Loader from "../../shared/Components/Loader.svelte";
import iconArrowLeft from "../../shared/img/icon-arrow-left.svg?raw";
import IconButton from "@shared/Components/IconButton.svelte";
import Loader from "@shared/Components/Loader.svelte";
import iconArrowLeft from "@shared/img/icon-arrow-left.svg?raw";

export let loading = false;
export let headerTitle = "View Header";
Expand DownExpand Up@@ -51,7 +51,7 @@

.view__header {
background-color: var(--color-bg-secondary);
border-bottom: 1px solid var(--color-black);
border-bottom: 1px solid var(--border-color);
flex-shrink: 0;
font-weight: 600;
padding: 0.5rem 1rem calc(0.5rem - 1px);
Expand Down
8 changes: 4 additions & 4 deletions src/ext/action-popup/Components/Views/InstallView.svelte
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
<script>
import iconWarn from "../../../shared/img/icon-warn.svg?raw";
import iconError from "../../../shared/img/icon-error.svg?raw";
import iconWarn from "@shared/img/icon-warn.svg?raw";
import iconError from "@shared/img/icon-error.svg?raw";

export let userscript;
export let installError;
Expand DownExpand Up@@ -129,7 +129,7 @@
}

.badge {
background-color: var(--color-black);
background-color: var(--color-bg-theme);
border-radius: var(--border-radius);
display: flex;
font: var(--text-small);
Expand DownExpand Up@@ -158,7 +158,7 @@
}

button {
background-color: #ffffffa6; /* -text-color-secondary */
background-color: var(--text-color-secondary);
border-radius: var(--border-radius);
color: var(--color-bg-primary);
flex-grow: 1;
Expand Down
4 changes: 2 additions & 2 deletions src/ext/action-popup/Components/Views/UpdateView.svelte
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
<script>
import iconUpdate from "../../../shared/img/icon-update.svg?raw";
import iconUpdate from "@shared/img/icon-update.svg?raw";

export let updates = [];
export let updateClick;
Expand DownExpand Up@@ -35,7 +35,7 @@
<style>
.item {
align-items: center;
border-bottom: 1px solid var(--color-black);
border-bottom: 1px solid var(--border-color);
display: flex;
padding: 0.5rem 1rem;
text-align: left;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feat: implement light theme#776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ACTCD
merged 21 commits into

from

Mar 24, 2025
 Merged


feat: implement light theme
#776
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
7424631

feat: implement light theme foundation


quoid Mar 2, 2025
7e3a557

refactor: migrate and rename shared resources


ACTCD Mar 2, 2025
0b5d601

refactor: use path alias in vite and ts


ACTCD Mar 2, 2025
7183324

refactor: some minor fixes of dev mode


ACTCD Mar 2, 2025
883786c

refactor: merge light and dark svg logo


ACTCD Mar 2, 2025
36d303e

feat: auto adapt to system color themes


ACTCD Mar 2, 2025
f2c0abc

fix: adjust red button text color


ACTCD Mar 2, 2025
d7217f0

feat: light theme logo text and ios launch screen


ACTCD Mar 3, 2025
ea317b8

fix: ios status bar color theme adaptive


ACTCD Mar 3, 2025
6a3a84d

chore: include light logo in sketch project


quoid Mar 3, 2025
c02f5d4

refactor: add light mode to indeterminate loader


quoid Mar 3, 2025
e066830

fix: use `var` for notification border


quoid Mar 3, 2025
2f0f337

refactor: split css var `--color-black`


ACTCD Mar 3, 2025
d416eb4

fix: add light theme text highlight colors


ACTCD Mar 3, 2025
6e55319

style: adjust light theme border color


ACTCD Mar 3, 2025
5809615

chore: popup dev page adapt light theme


ACTCD Mar 3, 2025
d23cb06

style: add light theme modal mask background color


ACTCD Mar 3, 2025
57feee7

style: add light theme box-shadow variable


ACTCD Mar 3, 2025
5dcd182

style: adjust font weight of settings ui


ACTCD Mar 4, 2025
122422f

style: fix light theme reset button color


ACTCD Mar 4, 2025
0c5ea39

fix: adjust icon shadows and sizes


ACTCD Mar 24, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
entry-app-webview.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
 name="viewport"
 content="width=device-width, initial-scale=1, user-scalable=no"
 />
 <meta name="color-scheme" content="dark" />
 <meta name="color-scheme" content="dark light" />
 <title>Userscripts App</title>
	</head>
	<body>
Expand Down

2 changes: 1 addition & 1 deletion
entry-ext-action-popup.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
	<head>
 <meta charset="UTF-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta name="color-scheme" content="dark" />
 <meta name="color-scheme" content="dark light" />
 <title>Userscripts popup</title>
	</head>
	<body>
Expand Down

2 changes: 1 addition & 1 deletion
entry-ext-extension-page.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
	<head>
 <meta charset="UTF-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta name="color-scheme" content="dark" />
 <meta name="color-scheme" content="dark light" />
 <title>Userscripts page</title>
	</head>
	<body>
Expand Down

4 changes: 2 additions & 2 deletions
eslint.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,15 +40,15 @@ export default [

	/** @see {@link https://eslint.org/docs/latest/use/configure/migration-guide#configuring-language-options} */
	{
 files: ["scripts/**/*.js"],
 files: ["*.js", "scripts/**/*.js"],
 languageOptions: {
 globals: {
 ...globals.node,
 },
 },
	},
	{
 files: ["src/{app,dev}/**/*.{js,svelte}"],
 files: ["src/{app,dev,shared}/**/*.{js,svelte}"],
 languageOptions: {
 globals: {
 ...globals.browser,
Expand Down
Binary file modifiedetc/uilayout.sketch

View file


Open in desktop


Binary file not shown.

Binary file modifiedpublic/ext/safari-15/images/icon-128.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-256.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-48.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-512.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedpublic/ext/safari-15/images/icon-64.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-96.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/toolbar-icon-16.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/toolbar-icon-32.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedpublic/ext/safari-15/images/toolbar-icon-48.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

4 changes: 3 additions & 1 deletion
public/ext/safari-15/manifest.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
	"version": "_VERSION_",
	"icons": {
 "48": "images/icon-48.png",
 "64": "images/icon-64.png",
 "96": "images/icon-96.png",
 "128": "images/icon-128.png",
 "256": "images/icon-256.png",
Expand All@@ -19,7 +20,8 @@
 "default_popup": "dist/entry-ext-action-popup.html",
 "default_icon": {
 "16": "images/toolbar-icon-16.png",
 "32": "images/toolbar-icon-32.png"
 "32": "images/toolbar-icon-32.png",
 "48": "images/toolbar-icon-48.png"
 }
	},
	"options_ui": {
Expand Down

7 changes: 7 additions & 0 deletions
scripts/utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,4 +191,11 @@ export const baseConfig = {
 "import.meta.env.GIT_TAG": JSON.stringify(gitTag),
 "import.meta.env.GIT_COMMIT": JSON.stringify(gitCommit),
 },
	resolve: {
 alias: {
 // NOTE: Don't forget to modify the `paths` in `jsconfig.json` also
 "@shared": fileURLToPath(new URL("../src/shared", import.meta.url)),
 "@ext": fileURLToPath(new URL("../src/ext/shared", import.meta.url)),
 },
	},
};

17 changes: 9 additions & 8 deletions
src/app/App.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
<svelte:options runes={true} />

<script>
	import icon from "./img/icon.png";
	import logo from "./img/logo.svg?raw";
	import IconDebug from "../ext/shared/img/icon-bug.svg?raw";
	import Dropdown from "../ext/shared/Components/Dropdown.svelte";
	import logoIcon from "@shared/img/logo-icon.png";
	import LogoText from "@shared/Components/LogoText.svelte";
	import IconDebug from "@shared/img/icon-bug.svg?raw";
	import Dropdown from "@shared/Components/Dropdown.svelte";
	import { i18nInit } from "./i18n.js";

	const baseUrl = "https://github.com/quoid/userscripts";
Expand DownExpand Up@@ -151,10 +151,11 @@
 alt="Userscripts App Icon"
 class="icon"
 draggable="false"
 src={icon}
 src={logoIcon}
 />
 <!-- eslint-disable-next-line svelte/no-at-html-tags -->
 <div class="logo">{@html logo}</div>
 <div class="logo">
 <LogoText />
 </div>
 <div class="version">
 {#if import.meta.env.GIT_TAG && import.meta.env.GIT_COMMIT}
 <a href="{baseUrl}/releases/tag/{import.meta.env.GIT_TAG}">
Expand DownExpand Up@@ -370,7 +371,7 @@

	button.red,
	button.red2:hover {
 color: var(--text-color-primary);
 color: var(--color-white);
 background-color: var(--color-red);
	}

Expand Down

2 changes: 1 addition & 1 deletion
src/app/i18n.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ export async function i18nInit() {
 md: (n, s) => getLangFrom(markdown, n, s),
 };
 } catch (error) {
 console.debug(error);
 console.debug("Will fall back to `en`", error);
 }
	}
	throw Error("I18n initialization failed");
Expand Down

1 change: 0 additions & 1 deletion
src/app/img/logo.svg

View file


Open in desktop


This file was deleted.


6 changes: 5 additions & 1 deletion
src/app/jsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,11 @@
 "esModuleInterop": true,
 "forceConsistentCasingInFileNames": true,
 "skipLibCheck": true,
 "sourceMap": true
 "sourceMap": true,

 "paths": {
 "@shared/*": ["../shared/*"]
 }
	},
	"include": ["**/*.d.ts", "**/*.js", "**/*.svelte"]
}

35 changes: 34 additions & 1 deletion
src/app/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,42 @@
import "./reset.css";
import "../shared/variables.css";
import "@shared/variables.css";
import "./app.css";
import { mount } from "svelte";
import App from "./App.svelte";

if (import.meta.env.MODE === "development") {
	// Simulation in non-WkWebView dev environment
	if (import.meta.env.SAFARI_PLATFORM === undefined) {
 console.warn("Simulation webkit...");
 window.webkit = {
 messageHandlers: {
 controller: {
 postMessage: async (message) => {
 switch (message) {
 case "INIT":
 return {
 build: "2",
 directory: "Userscripts App Documents",
 enableLogger: true,
 extStatus: "unknown",
 firstRunTime: 1,
 maxLogFileSize: 500_000_000,
 platform: "mac",
 promptLogger: true,
 useSettingsInsteadOfPreferences: true,
 version: "2.0.0",
 };
 default:
 console.debug("Simulation.webkit.messageHandler:", message);
 break;
 }
 },
 },
 },
 };
	}
}

const app = mount(App, { target: document.getElementById("app") });

export default app;

24 changes: 12 additions & 12 deletions
src/ext/action-popup/App.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
<script>
	import { onMount } from "svelte";
	import IconButton from "../shared/Components/IconButton.svelte";
	import Toggle from "../shared/Components/Toggle.svelte";
	import Loader from "../shared/Components/Loader.svelte";
	import IconButton from "@shared/Components/IconButton.svelte";
	import Toggle from "@shared/Components/Toggle.svelte";
	import Loader from "@shared/Components/Loader.svelte";
	import PopupItem from "./Components/PopupItem.svelte";
	import View from "./Components/View.svelte";
	import UpdateView from "./Components/Views/UpdateView.svelte";
	import InstallView from "./Components/Views/InstallView.svelte";
	import AllItemsView from "./Components/Views/AllItemsView.svelte";
	import iconOpen from "../shared/img/icon-open.svg?raw";
	import iconUpdate from "../shared/img/icon-update.svg?raw";
	import iconClear from "../shared/img/icon-clear.svg?raw";
	import iconRefresh from "../shared/img/icon-refresh.svg?raw";
	import { extensionPaths, openExtensionPage } from "../shared/utils.js";
	import { connectNative, sendNativeMessage } from "../shared/native.js";
	import * as settingsStorage from "../shared/settings.js";
	import iconOpen from "@shared/img/icon-open.svg?raw";
	import iconUpdate from "@shared/img/icon-update.svg?raw";
	import iconClear from "@shared/img/icon-clear.svg?raw";
	import iconRefresh from "@shared/img/icon-refresh.svg?raw";
	import { extensionPaths, openExtensionPage } from "@ext/utils.js";
	import { connectNative, sendNativeMessage } from "@ext/native.js";
	import * as settingsStorage from "@ext/settings.js";

	let errorNotification;
	let active = true;
Expand DownExpand Up@@ -657,7 +657,7 @@

	.header .buttons {
 align-items: center;
 border-bottom: 1px solid var(--color-black);
 border-bottom: 1px solid var(--border-color);
 display: flex;
 padding: 0.5rem 1rem calc(0.5rem - 1px);
	}
Expand DownExpand Up@@ -746,7 +746,7 @@
	}

	.footer {
 border-top: 1px solid var(--color-black);
 border-top: 1px solid var(--border-color);
 font-weight: 600;
 line-height: 1.5rem;
 padding: 0.5rem 0;
Expand Down

4 changes: 2 additions & 2 deletions
src/ext/action-popup/Components/PopupItem.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
<script>
	import Tag from "../../shared/Components/Tag.svelte";
	import Tag from "@shared/Components/Tag.svelte";

	export let background;
	export let enabled = false;
Expand DownExpand Up@@ -50,7 +50,7 @@
	span {
 align-items: center;
 background-color: var(--color-red);
 border: 1px solid var(--color-black);
 border: 1px solid var(--border-color);
 border-radius: 50%;
 display: flex;
 display: none;
Expand Down

8 changes: 4 additions & 4 deletions
src/ext/action-popup/Components/View.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
<script>
	import { quintInOut } from "svelte/easing";
	import IconButton from "../../shared/Components/IconButton.svelte";
	import Loader from "../../shared/Components/Loader.svelte";
	import iconArrowLeft from "../../shared/img/icon-arrow-left.svg?raw";
	import IconButton from "@shared/Components/IconButton.svelte";
	import Loader from "@shared/Components/Loader.svelte";
	import iconArrowLeft from "@shared/img/icon-arrow-left.svg?raw";

	export let loading = false;
	export let headerTitle = "View Header";
Expand DownExpand Up@@ -51,7 +51,7 @@

	.view__header {
 background-color: var(--color-bg-secondary);
 border-bottom: 1px solid var(--color-black);
 border-bottom: 1px solid var(--border-color);
 flex-shrink: 0;
 font-weight: 600;
 padding: 0.5rem 1rem calc(0.5rem - 1px);
Expand Down

8 changes: 4 additions & 4 deletions
src/ext/action-popup/Components/Views/InstallView.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
<script>
	import iconWarn from "../../../shared/img/icon-warn.svg?raw";
	import iconError from "../../../shared/img/icon-error.svg?raw";
	import iconWarn from "@shared/img/icon-warn.svg?raw";
	import iconError from "@shared/img/icon-error.svg?raw";

	export let userscript;
	export let installError;
Expand DownExpand Up@@ -129,7 +129,7 @@
	}

	.badge {
 background-color: var(--color-black);
 background-color: var(--color-bg-theme);
 border-radius: var(--border-radius);
 display: flex;
 font: var(--text-small);
Expand DownExpand Up@@ -158,7 +158,7 @@
	}

	button {
 background-color: #ffffffa6; /* -text-color-secondary */
 background-color: var(--text-color-secondary);
 border-radius: var(--border-radius);
 color: var(--color-bg-primary);
 flex-grow: 1;
Expand Down

4 changes: 2 additions & 2 deletions
src/ext/action-popup/Components/Views/UpdateView.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
<script>
	import iconUpdate from "../../../shared/img/icon-update.svg?raw";
	import iconUpdate from "@shared/img/icon-update.svg?raw";

	export let updates = [];
	export let updateClick;
Expand DownExpand Up@@ -35,7 +35,7 @@
<style>
	.item {
 align-items: center;
 border-bottom: 1px solid var(--color-black);
 border-bottom: 1px solid var(--border-color);
 display: flex;
 padding: 0.5rem 1rem;
 text-align: left;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: implement light theme#776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ACTCD
merged 21 commits into

from

Mar 24, 2025
 Merged


feat: implement light theme
#776
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
7424631

feat: implement light theme foundation


quoid Mar 2, 2025
7e3a557

refactor: migrate and rename shared resources


ACTCD Mar 2, 2025
0b5d601

refactor: use path alias in vite and ts


ACTCD Mar 2, 2025
7183324

refactor: some minor fixes of dev mode


ACTCD Mar 2, 2025
883786c

refactor: merge light and dark svg logo


ACTCD Mar 2, 2025
36d303e

feat: auto adapt to system color themes


ACTCD Mar 2, 2025
f2c0abc

fix: adjust red button text color


ACTCD Mar 2, 2025
d7217f0

feat: light theme logo text and ios launch screen


ACTCD Mar 3, 2025
ea317b8

fix: ios status bar color theme adaptive


ACTCD Mar 3, 2025
6a3a84d

chore: include light logo in sketch project


quoid Mar 3, 2025
c02f5d4

refactor: add light mode to indeterminate loader


quoid Mar 3, 2025
e066830

fix: use `var` for notification border


quoid Mar 3, 2025
2f0f337

refactor: split css var `--color-black`


ACTCD Mar 3, 2025
d416eb4

fix: add light theme text highlight colors


ACTCD Mar 3, 2025
6e55319

style: adjust light theme border color


ACTCD Mar 3, 2025
5809615

chore: popup dev page adapt light theme


ACTCD Mar 3, 2025
d23cb06

style: add light theme modal mask background color


ACTCD Mar 3, 2025
57feee7

style: add light theme box-shadow variable


ACTCD Mar 3, 2025
5dcd182

style: adjust font weight of settings ui


ACTCD Mar 4, 2025
122422f

style: fix light theme reset button color


ACTCD Mar 4, 2025
0c5ea39

fix: adjust icon shadows and sizes


ACTCD Mar 24, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
entry-app-webview.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
 name="viewport"
 content="width=device-width, initial-scale=1, user-scalable=no"
 />
 <meta name="color-scheme" content="dark" />
 <meta name="color-scheme" content="dark light" />
 <title>Userscripts App</title>
	</head>
	<body>
Expand Down

2 changes: 1 addition & 1 deletion
entry-ext-action-popup.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
	<head>
 <meta charset="UTF-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta name="color-scheme" content="dark" />
 <meta name="color-scheme" content="dark light" />
 <title>Userscripts popup</title>
	</head>
	<body>
Expand Down

2 changes: 1 addition & 1 deletion
entry-ext-extension-page.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
	<head>
 <meta charset="UTF-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta name="color-scheme" content="dark" />
 <meta name="color-scheme" content="dark light" />
 <title>Userscripts page</title>
	</head>
	<body>
Expand Down

4 changes: 2 additions & 2 deletions
eslint.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,15 +40,15 @@ export default [

	/** @see {@link https://eslint.org/docs/latest/use/configure/migration-guide#configuring-language-options} */
	{
 files: ["scripts/**/*.js"],
 files: ["*.js", "scripts/**/*.js"],
 languageOptions: {
 globals: {
 ...globals.node,
 },
 },
	},
	{
 files: ["src/{app,dev}/**/*.{js,svelte}"],
 files: ["src/{app,dev,shared}/**/*.{js,svelte}"],
 languageOptions: {
 globals: {
 ...globals.browser,
Expand Down
Binary file modifiedetc/uilayout.sketch

View file


Open in desktop


Binary file not shown.

Binary file modifiedpublic/ext/safari-15/images/icon-128.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-256.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-48.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-512.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedpublic/ext/safari-15/images/icon-64.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-96.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/toolbar-icon-16.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/toolbar-icon-32.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedpublic/ext/safari-15/images/toolbar-icon-48.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

4 changes: 3 additions & 1 deletion
public/ext/safari-15/manifest.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
	"version": "_VERSION_",
	"icons": {
 "48": "images/icon-48.png",
 "64": "images/icon-64.png",
 "96": "images/icon-96.png",
 "128": "images/icon-128.png",
 "256": "images/icon-256.png",
Expand All@@ -19,7 +20,8 @@
 "default_popup": "dist/entry-ext-action-popup.html",
 "default_icon": {
 "16": "images/toolbar-icon-16.png",
 "32": "images/toolbar-icon-32.png"
 "32": "images/toolbar-icon-32.png",
 "48": "images/toolbar-icon-48.png"
 }
	},
	"options_ui": {
Expand Down

7 changes: 7 additions & 0 deletions
scripts/utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,4 +191,11 @@ export const baseConfig = {
 "import.meta.env.GIT_TAG": JSON.stringify(gitTag),
 "import.meta.env.GIT_COMMIT": JSON.stringify(gitCommit),
 },
	resolve: {
 alias: {
 // NOTE: Don't forget to modify the `paths` in `jsconfig.json` also
 "@shared": fileURLToPath(new URL("../src/shared", import.meta.url)),
 "@ext": fileURLToPath(new URL("../src/ext/shared", import.meta.url)),
 },
	},
};

17 changes: 9 additions & 8 deletions
src/app/App.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
<svelte:options runes={true} />

<script>
	import icon from "./img/icon.png";
	import logo from "./img/logo.svg?raw";
	import IconDebug from "../ext/shared/img/icon-bug.svg?raw";
	import Dropdown from "../ext/shared/Components/Dropdown.svelte";
	import logoIcon from "@shared/img/logo-icon.png";
	import LogoText from "@shared/Components/LogoText.svelte";
	import IconDebug from "@shared/img/icon-bug.svg?raw";
	import Dropdown from "@shared/Components/Dropdown.svelte";
	import { i18nInit } from "./i18n.js";

	const baseUrl = "https://github.com/quoid/userscripts";
Expand DownExpand Up@@ -151,10 +151,11 @@
 alt="Userscripts App Icon"
 class="icon"
 draggable="false"
 src={icon}
 src={logoIcon}
 />
 <!-- eslint-disable-next-line svelte/no-at-html-tags -->
 <div class="logo">{@html logo}</div>
 <div class="logo">
 <LogoText />
 </div>
 <div class="version">
 {#if import.meta.env.GIT_TAG && import.meta.env.GIT_COMMIT}
 <a href="{baseUrl}/releases/tag/{import.meta.env.GIT_TAG}">
Expand DownExpand Up@@ -370,7 +371,7 @@

	button.red,
	button.red2:hover {
 color: var(--text-color-primary);
 color: var(--color-white);
 background-color: var(--color-red);
	}

Expand Down

2 changes: 1 addition & 1 deletion
src/app/i18n.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ export async function i18nInit() {
 md: (n, s) => getLangFrom(markdown, n, s),
 };
 } catch (error) {
 console.debug(error);
 console.debug("Will fall back to `en`", error);
 }
	}
	throw Error("I18n initialization failed");
Expand Down

1 change: 0 additions & 1 deletion
src/app/img/logo.svg

View file


Open in desktop


This file was deleted.


6 changes: 5 additions & 1 deletion
src/app/jsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,11 @@
 "esModuleInterop": true,
 "forceConsistentCasingInFileNames": true,
 "skipLibCheck": true,
 "sourceMap": true
 "sourceMap": true,

 "paths": {
 "@shared/*": ["../shared/*"]
 }
	},
	"include": ["**/*.d.ts", "**/*.js", "**/*.svelte"]
}

35 changes: 34 additions & 1 deletion
src/app/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,42 @@
import "./reset.css";
import "../shared/variables.css";
import "@shared/variables.css";
import "./app.css";
import { mount } from "svelte";
import App from "./App.svelte";

if (import.meta.env.MODE === "development") {
	// Simulation in non-WkWebView dev environment
	if (import.meta.env.SAFARI_PLATFORM === undefined) {
 console.warn("Simulation webkit...");
 window.webkit = {
 messageHandlers: {
 controller: {
 postMessage: async (message) => {
 switch (message) {
 case "INIT":
 return {
 build: "2",
 directory: "Userscripts App Documents",
 enableLogger: true,
 extStatus: "unknown",
 firstRunTime: 1,
 maxLogFileSize: 500_000_000,
 platform: "mac",
 promptLogger: true,
 useSettingsInsteadOfPreferences: true,
 version: "2.0.0",
 };
 default:
 console.debug("Simulation.webkit.messageHandler:", message);
 break;
 }
 },
 },
 },
 };
	}
}

const app = mount(App, { target: document.getElementById("app") });

export default app;

24 changes: 12 additions & 12 deletions
src/ext/action-popup/App.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
<script>
	import { onMount } from "svelte";
	import IconButton from "../shared/Components/IconButton.svelte";
	import Toggle from "../shared/Components/Toggle.svelte";
	import Loader from "../shared/Components/Loader.svelte";
	import IconButton from "@shared/Components/IconButton.svelte";
	import Toggle from "@shared/Components/Toggle.svelte";
	import Loader from "@shared/Components/Loader.svelte";
	import PopupItem from "./Components/PopupItem.svelte";
	import View from "./Components/View.svelte";
	import UpdateView from "./Components/Views/UpdateView.svelte";
	import InstallView from "./Components/Views/InstallView.svelte";
	import AllItemsView from "./Components/Views/AllItemsView.svelte";
	import iconOpen from "../shared/img/icon-open.svg?raw";
	import iconUpdate from "../shared/img/icon-update.svg?raw";
	import iconClear from "../shared/img/icon-clear.svg?raw";
	import iconRefresh from "../shared/img/icon-refresh.svg?raw";
	import { extensionPaths, openExtensionPage } from "../shared/utils.js";
	import { connectNative, sendNativeMessage } from "../shared/native.js";
	import * as settingsStorage from "../shared/settings.js";
	import iconOpen from "@shared/img/icon-open.svg?raw";
	import iconUpdate from "@shared/img/icon-update.svg?raw";
	import iconClear from "@shared/img/icon-clear.svg?raw";
	import iconRefresh from "@shared/img/icon-refresh.svg?raw";
	import { extensionPaths, openExtensionPage } from "@ext/utils.js";
	import { connectNative, sendNativeMessage } from "@ext/native.js";
	import * as settingsStorage from "@ext/settings.js";

	let errorNotification;
	let active = true;
Expand DownExpand Up@@ -657,7 +657,7 @@

	.header .buttons {
 align-items: center;
 border-bottom: 1px solid var(--color-black);
 border-bottom: 1px solid var(--border-color);
 display: flex;
 padding: 0.5rem 1rem calc(0.5rem - 1px);
	}
Expand DownExpand Up@@ -746,7 +746,7 @@
	}

	.footer {
 border-top: 1px solid var(--color-black);
 border-top: 1px solid var(--border-color);
 font-weight: 600;
 line-height: 1.5rem;
 padding: 0.5rem 0;
Expand Down

4 changes: 2 additions & 2 deletions
src/ext/action-popup/Components/PopupItem.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
<script>
	import Tag from "../../shared/Components/Tag.svelte";
	import Tag from "@shared/Components/Tag.svelte";

	export let background;
	export let enabled = false;
Expand DownExpand Up@@ -50,7 +50,7 @@
	span {
 align-items: center;
 background-color: var(--color-red);
 border: 1px solid var(--color-black);
 border: 1px solid var(--border-color);
 border-radius: 50%;
 display: flex;
 display: none;
Expand Down

8 changes: 4 additions & 4 deletions
src/ext/action-popup/Components/View.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
<script>
	import { quintInOut } from "svelte/easing";
	import IconButton from "../../shared/Components/IconButton.svelte";
	import Loader from "../../shared/Components/Loader.svelte";
	import iconArrowLeft from "../../shared/img/icon-arrow-left.svg?raw";
	import IconButton from "@shared/Components/IconButton.svelte";
	import Loader from "@shared/Components/Loader.svelte";
	import iconArrowLeft from "@shared/img/icon-arrow-left.svg?raw";

	export let loading = false;
	export let headerTitle = "View Header";
Expand DownExpand Up@@ -51,7 +51,7 @@

	.view__header {
 background-color: var(--color-bg-secondary);
 border-bottom: 1px solid var(--color-black);
 border-bottom: 1px solid var(--border-color);
 flex-shrink: 0;
 font-weight: 600;
 padding: 0.5rem 1rem calc(0.5rem - 1px);
Expand Down

8 changes: 4 additions & 4 deletions
src/ext/action-popup/Components/Views/InstallView.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
<script>
	import iconWarn from "../../../shared/img/icon-warn.svg?raw";
	import iconError from "../../../shared/img/icon-error.svg?raw";
	import iconWarn from "@shared/img/icon-warn.svg?raw";
	import iconError from "@shared/img/icon-error.svg?raw";

	export let userscript;
	export let installError;
Expand DownExpand Up@@ -129,7 +129,7 @@
	}

	.badge {
 background-color: var(--color-black);
 background-color: var(--color-bg-theme);
 border-radius: var(--border-radius);
 display: flex;
 font: var(--text-small);
Expand DownExpand Up@@ -158,7 +158,7 @@
	}

	button {
 background-color: #ffffffa6; /* -text-color-secondary */
 background-color: var(--text-color-secondary);
 border-radius: var(--border-radius);
 color: var(--color-bg-primary);
 flex-grow: 1;
Expand Down

4 changes: 2 additions & 2 deletions
src/ext/action-popup/Components/Views/UpdateView.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
<script>
	import iconUpdate from "../../../shared/img/icon-update.svg?raw";
	import iconUpdate from "@shared/img/icon-update.svg?raw";

	export let updates = [];
	export let updateClick;
Expand DownExpand Up@@ -35,7 +35,7 @@
<style>
	.item {
 align-items: center;
 border-bottom: 1px solid var(--color-black);
 border-bottom: 1px solid var(--border-color);
 display: flex;
 padding: 0.5rem 1rem;
 text-align: left;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: implement light theme#776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ACTCD
merged 21 commits into

from

Mar 24, 2025
 Merged


feat: implement light theme
#776
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
7424631

feat: implement light theme foundation


quoid Mar 2, 2025
7e3a557

refactor: migrate and rename shared resources


ACTCD Mar 2, 2025
0b5d601

refactor: use path alias in vite and ts


ACTCD Mar 2, 2025
7183324

refactor: some minor fixes of dev mode


ACTCD Mar 2, 2025
883786c

refactor: merge light and dark svg logo


ACTCD Mar 2, 2025
36d303e

feat: auto adapt to system color themes


ACTCD Mar 2, 2025
f2c0abc

fix: adjust red button text color


ACTCD Mar 2, 2025
d7217f0

feat: light theme logo text and ios launch screen


ACTCD Mar 3, 2025
ea317b8

fix: ios status bar color theme adaptive


ACTCD Mar 3, 2025
6a3a84d

chore: include light logo in sketch project


quoid Mar 3, 2025
c02f5d4

refactor: add light mode to indeterminate loader


quoid Mar 3, 2025
e066830

fix: use `var` for notification border


quoid Mar 3, 2025
2f0f337

refactor: split css var `--color-black`


ACTCD Mar 3, 2025
d416eb4

fix: add light theme text highlight colors


ACTCD Mar 3, 2025
6e55319

style: adjust light theme border color


ACTCD Mar 3, 2025
5809615

chore: popup dev page adapt light theme


ACTCD Mar 3, 2025
d23cb06

style: add light theme modal mask background color


ACTCD Mar 3, 2025
57feee7

style: add light theme box-shadow variable


ACTCD Mar 3, 2025
5dcd182

style: adjust font weight of settings ui


ACTCD Mar 4, 2025
122422f

style: fix light theme reset button color


ACTCD Mar 4, 2025
0c5ea39

fix: adjust icon shadows and sizes


ACTCD Mar 24, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
entry-app-webview.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
 name="viewport"
 content="width=device-width, initial-scale=1, user-scalable=no"
 />
 <meta name="color-scheme" content="dark" />
 <meta name="color-scheme" content="dark light" />
 <title>Userscripts App</title>
	</head>
	<body>
Expand Down

2 changes: 1 addition & 1 deletion
entry-ext-action-popup.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
	<head>
 <meta charset="UTF-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta name="color-scheme" content="dark" />
 <meta name="color-scheme" content="dark light" />
 <title>Userscripts popup</title>
	</head>
	<body>
Expand Down

2 changes: 1 addition & 1 deletion
entry-ext-extension-page.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
	<head>
 <meta charset="UTF-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta name="color-scheme" content="dark" />
 <meta name="color-scheme" content="dark light" />
 <title>Userscripts page</title>
	</head>
	<body>
Expand Down

4 changes: 2 additions & 2 deletions
eslint.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,15 +40,15 @@ export default [

	/** @see {@link https://eslint.org/docs/latest/use/configure/migration-guide#configuring-language-options} */
	{
 files: ["scripts/**/*.js"],
 files: ["*.js", "scripts/**/*.js"],
 languageOptions: {
 globals: {
 ...globals.node,
 },
 },
	},
	{
 files: ["src/{app,dev}/**/*.{js,svelte}"],
 files: ["src/{app,dev,shared}/**/*.{js,svelte}"],
 languageOptions: {
 globals: {
 ...globals.browser,
Expand Down
Binary file modifiedetc/uilayout.sketch

View file


Open in desktop


Binary file not shown.

Binary file modifiedpublic/ext/safari-15/images/icon-128.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-256.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-48.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-512.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedpublic/ext/safari-15/images/icon-64.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-96.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/toolbar-icon-16.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/toolbar-icon-32.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedpublic/ext/safari-15/images/toolbar-icon-48.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

4 changes: 3 additions & 1 deletion
public/ext/safari-15/manifest.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
	"version": "_VERSION_",
	"icons": {
 "48": "images/icon-48.png",
 "64": "images/icon-64.png",
 "96": "images/icon-96.png",
 "128": "images/icon-128.png",
 "256": "images/icon-256.png",
Expand All@@ -19,7 +20,8 @@
 "default_popup": "dist/entry-ext-action-popup.html",
 "default_icon": {
 "16": "images/toolbar-icon-16.png",
 "32": "images/toolbar-icon-32.png"
 "32": "images/toolbar-icon-32.png",
 "48": "images/toolbar-icon-48.png"
 }
	},
	"options_ui": {
Expand Down

7 changes: 7 additions & 0 deletions
scripts/utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,4 +191,11 @@ export const baseConfig = {
 "import.meta.env.GIT_TAG": JSON.stringify(gitTag),
 "import.meta.env.GIT_COMMIT": JSON.stringify(gitCommit),
 },
	resolve: {
 alias: {
 // NOTE: Don't forget to modify the `paths` in `jsconfig.json` also
 "@shared": fileURLToPath(new URL("../src/shared", import.meta.url)),
 "@ext": fileURLToPath(new URL("../src/ext/shared", import.meta.url)),
 },
	},
};

17 changes: 9 additions & 8 deletions
src/app/App.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
<svelte:options runes={true} />

<script>
	import icon from "./img/icon.png";
	import logo from "./img/logo.svg?raw";
	import IconDebug from "../ext/shared/img/icon-bug.svg?raw";
	import Dropdown from "../ext/shared/Components/Dropdown.svelte";
	import logoIcon from "@shared/img/logo-icon.png";
	import LogoText from "@shared/Components/LogoText.svelte";
	import IconDebug from "@shared/img/icon-bug.svg?raw";
	import Dropdown from "@shared/Components/Dropdown.svelte";
	import { i18nInit } from "./i18n.js";

	const baseUrl = "https://github.com/quoid/userscripts";
Expand DownExpand Up@@ -151,10 +151,11 @@
 alt="Userscripts App Icon"
 class="icon"
 draggable="false"
 src={icon}
 src={logoIcon}
 />
 <!-- eslint-disable-next-line svelte/no-at-html-tags -->
 <div class="logo">{@html logo}</div>
 <div class="logo">
 <LogoText />
 </div>
 <div class="version">
 {#if import.meta.env.GIT_TAG && import.meta.env.GIT_COMMIT}
 <a href="{baseUrl}/releases/tag/{import.meta.env.GIT_TAG}">
Expand DownExpand Up@@ -370,7 +371,7 @@

	button.red,
	button.red2:hover {
 color: var(--text-color-primary);
 color: var(--color-white);
 background-color: var(--color-red);
	}

Expand Down

2 changes: 1 addition & 1 deletion
src/app/i18n.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ export async function i18nInit() {
 md: (n, s) => getLangFrom(markdown, n, s),
 };
 } catch (error) {
 console.debug(error);
 console.debug("Will fall back to `en`", error);
 }
	}
	throw Error("I18n initialization failed");
Expand Down

1 change: 0 additions & 1 deletion
src/app/img/logo.svg

View file


Open in desktop


This file was deleted.


6 changes: 5 additions & 1 deletion
src/app/jsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,11 @@
 "esModuleInterop": true,
 "forceConsistentCasingInFileNames": true,
 "skipLibCheck": true,
 "sourceMap": true
 "sourceMap": true,

 "paths": {
 "@shared/*": ["../shared/*"]
 }
	},
	"include": ["**/*.d.ts", "**/*.js", "**/*.svelte"]
}

35 changes: 34 additions & 1 deletion
src/app/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,42 @@
import "./reset.css";
import "../shared/variables.css";
import "@shared/variables.css";
import "./app.css";
import { mount } from "svelte";
import App from "./App.svelte";

if (import.meta.env.MODE === "development") {
	// Simulation in non-WkWebView dev environment
	if (import.meta.env.SAFARI_PLATFORM === undefined) {
 console.warn("Simulation webkit...");
 window.webkit = {
 messageHandlers: {
 controller: {
 postMessage: async (message) => {
 switch (message) {
 case "INIT":
 return {
 build: "2",
 directory: "Userscripts App Documents",
 enableLogger: true,
 extStatus: "unknown",
 firstRunTime: 1,
 maxLogFileSize: 500_000_000,
 platform: "mac",
 promptLogger: true,
 useSettingsInsteadOfPreferences: true,
 version: "2.0.0",
 };
 default:
 console.debug("Simulation.webkit.messageHandler:", message);
 break;
 }
 },
 },
 },
 };
	}
}

const app = mount(App, { target: document.getElementById("app") });

export default app;

24 changes: 12 additions & 12 deletions
src/ext/action-popup/App.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
<script>
	import { onMount } from "svelte";
	import IconButton from "../shared/Components/IconButton.svelte";
	import Toggle from "../shared/Components/Toggle.svelte";
	import Loader from "../shared/Components/Loader.svelte";
	import IconButton from "@shared/Components/IconButton.svelte";
	import Toggle from "@shared/Components/Toggle.svelte";
	import Loader from "@shared/Components/Loader.svelte";
	import PopupItem from "./Components/PopupItem.svelte";
	import View from "./Components/View.svelte";
	import UpdateView from "./Components/Views/UpdateView.svelte";
	import InstallView from "./Components/Views/InstallView.svelte";
	import AllItemsView from "./Components/Views/AllItemsView.svelte";
	import iconOpen from "../shared/img/icon-open.svg?raw";
	import iconUpdate from "../shared/img/icon-update.svg?raw";
	import iconClear from "../shared/img/icon-clear.svg?raw";
	import iconRefresh from "../shared/img/icon-refresh.svg?raw";
	import { extensionPaths, openExtensionPage } from "../shared/utils.js";
	import { connectNative, sendNativeMessage } from "../shared/native.js";
	import * as settingsStorage from "../shared/settings.js";
	import iconOpen from "@shared/img/icon-open.svg?raw";
	import iconUpdate from "@shared/img/icon-update.svg?raw";
	import iconClear from "@shared/img/icon-clear.svg?raw";
	import iconRefresh from "@shared/img/icon-refresh.svg?raw";
	import { extensionPaths, openExtensionPage } from "@ext/utils.js";
	import { connectNative, sendNativeMessage } from "@ext/native.js";
	import * as settingsStorage from "@ext/settings.js";

	let errorNotification;
	let active = true;
Expand DownExpand Up@@ -657,7 +657,7 @@

	.header .buttons {
 align-items: center;
 border-bottom: 1px solid var(--color-black);
 border-bottom: 1px solid var(--border-color);
 display: flex;
 padding: 0.5rem 1rem calc(0.5rem - 1px);
	}
Expand DownExpand Up@@ -746,7 +746,7 @@
	}

	.footer {
 border-top: 1px solid var(--color-black);
 border-top: 1px solid var(--border-color);
 font-weight: 600;
 line-height: 1.5rem;
 padding: 0.5rem 0;
Expand Down

4 changes: 2 additions & 2 deletions
src/ext/action-popup/Components/PopupItem.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
<script>
	import Tag from "../../shared/Components/Tag.svelte";
	import Tag from "@shared/Components/Tag.svelte";

	export let background;
	export let enabled = false;
Expand DownExpand Up@@ -50,7 +50,7 @@
	span {
 align-items: center;
 background-color: var(--color-red);
 border: 1px solid var(--color-black);
 border: 1px solid var(--border-color);
 border-radius: 50%;
 display: flex;
 display: none;
Expand Down

8 changes: 4 additions & 4 deletions
src/ext/action-popup/Components/View.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
<script>
	import { quintInOut } from "svelte/easing";
	import IconButton from "../../shared/Components/IconButton.svelte";
	import Loader from "../../shared/Components/Loader.svelte";
	import iconArrowLeft from "../../shared/img/icon-arrow-left.svg?raw";
	import IconButton from "@shared/Components/IconButton.svelte";
	import Loader from "@shared/Components/Loader.svelte";
	import iconArrowLeft from "@shared/img/icon-arrow-left.svg?raw";

	export let loading = false;
	export let headerTitle = "View Header";
Expand DownExpand Up@@ -51,7 +51,7 @@

	.view__header {
 background-color: var(--color-bg-secondary);
 border-bottom: 1px solid var(--color-black);
 border-bottom: 1px solid var(--border-color);
 flex-shrink: 0;
 font-weight: 600;
 padding: 0.5rem 1rem calc(0.5rem - 1px);
Expand Down

8 changes: 4 additions & 4 deletions
src/ext/action-popup/Components/Views/InstallView.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
<script>
	import iconWarn from "../../../shared/img/icon-warn.svg?raw";
	import iconError from "../../../shared/img/icon-error.svg?raw";
	import iconWarn from "@shared/img/icon-warn.svg?raw";
	import iconError from "@shared/img/icon-error.svg?raw";

	export let userscript;
	export let installError;
Expand DownExpand Up@@ -129,7 +129,7 @@
	}

	.badge {
 background-color: var(--color-black);
 background-color: var(--color-bg-theme);
 border-radius: var(--border-radius);
 display: flex;
 font: var(--text-small);
Expand DownExpand Up@@ -158,7 +158,7 @@
	}

	button {
 background-color: #ffffffa6; /* -text-color-secondary */
 background-color: var(--text-color-secondary);
 border-radius: var(--border-radius);
 color: var(--color-bg-primary);
 flex-grow: 1;
Expand Down

4 changes: 2 additions & 2 deletions
src/ext/action-popup/Components/Views/UpdateView.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
<script>
	import iconUpdate from "../../../shared/img/icon-update.svg?raw";
	import iconUpdate from "@shared/img/icon-update.svg?raw";

	export let updates = [];
	export let updateClick;
Expand DownExpand Up@@ -35,7 +35,7 @@
<style>
	.item {
 align-items: center;
 border-bottom: 1px solid var(--color-black);
 border-bottom: 1px solid var(--border-color);
 display: flex;
 padding: 0.5rem 1rem;
 text-align: left;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
feat: implement light theme#776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ACTCD
merged 21 commits into

from

Mar 24, 2025
 Merged


feat: implement light theme
#776
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
7424631

feat: implement light theme foundation


quoid Mar 2, 2025
7e3a557

refactor: migrate and rename shared resources


ACTCD Mar 2, 2025
0b5d601

refactor: use path alias in vite and ts


ACTCD Mar 2, 2025
7183324

refactor: some minor fixes of dev mode


ACTCD Mar 2, 2025
883786c

refactor: merge light and dark svg logo


ACTCD Mar 2, 2025
36d303e

feat: auto adapt to system color themes


ACTCD Mar 2, 2025
f2c0abc

fix: adjust red button text color


ACTCD Mar 2, 2025
d7217f0

feat: light theme logo text and ios launch screen


ACTCD Mar 3, 2025
ea317b8

fix: ios status bar color theme adaptive


ACTCD Mar 3, 2025
6a3a84d

chore: include light logo in sketch project


quoid Mar 3, 2025
c02f5d4

refactor: add light mode to indeterminate loader


quoid Mar 3, 2025
e066830

fix: use `var` for notification border


quoid Mar 3, 2025
2f0f337

refactor: split css var `--color-black`


ACTCD Mar 3, 2025
d416eb4

fix: add light theme text highlight colors


ACTCD Mar 3, 2025
6e55319

style: adjust light theme border color


ACTCD Mar 3, 2025
5809615

chore: popup dev page adapt light theme


ACTCD Mar 3, 2025
d23cb06

style: add light theme modal mask background color


ACTCD Mar 3, 2025
57feee7

style: add light theme box-shadow variable


ACTCD Mar 3, 2025
5dcd182

style: adjust font weight of settings ui


ACTCD Mar 4, 2025
122422f

style: fix light theme reset button color


ACTCD Mar 4, 2025
0c5ea39

fix: adjust icon shadows and sizes


ACTCD Mar 24, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
entry-app-webview.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
 name="viewport"
 content="width=device-width, initial-scale=1, user-scalable=no"
 />
 <meta name="color-scheme" content="dark" />
 <meta name="color-scheme" content="dark light" />
 <title>Userscripts App</title>
	</head>
	<body>
Expand Down

2 changes: 1 addition & 1 deletion
entry-ext-action-popup.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
	<head>
 <meta charset="UTF-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta name="color-scheme" content="dark" />
 <meta name="color-scheme" content="dark light" />
 <title>Userscripts popup</title>
	</head>
	<body>
Expand Down

2 changes: 1 addition & 1 deletion
entry-ext-extension-page.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
	<head>
 <meta charset="UTF-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta name="color-scheme" content="dark" />
 <meta name="color-scheme" content="dark light" />
 <title>Userscripts page</title>
	</head>
	<body>
Expand Down

4 changes: 2 additions & 2 deletions
eslint.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,15 +40,15 @@ export default [

	/** @see {@link https://eslint.org/docs/latest/use/configure/migration-guide#configuring-language-options} */
	{
 files: ["scripts/**/*.js"],
 files: ["*.js", "scripts/**/*.js"],
 languageOptions: {
 globals: {
 ...globals.node,
 },
 },
	},
	{
 files: ["src/{app,dev}/**/*.{js,svelte}"],
 files: ["src/{app,dev,shared}/**/*.{js,svelte}"],
 languageOptions: {
 globals: {
 ...globals.browser,
Expand Down
Binary file modifiedetc/uilayout.sketch

View file


Open in desktop


Binary file not shown.

Binary file modifiedpublic/ext/safari-15/images/icon-128.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-256.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-48.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-512.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedpublic/ext/safari-15/images/icon-64.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-96.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/toolbar-icon-16.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/toolbar-icon-32.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedpublic/ext/safari-15/images/toolbar-icon-48.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

4 changes: 3 additions & 1 deletion
public/ext/safari-15/manifest.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
	"version": "_VERSION_",
	"icons": {
 "48": "images/icon-48.png",
 "64": "images/icon-64.png",
 "96": "images/icon-96.png",
 "128": "images/icon-128.png",
 "256": "images/icon-256.png",
Expand All@@ -19,7 +20,8 @@
 "default_popup": "dist/entry-ext-action-popup.html",
 "default_icon": {
 "16": "images/toolbar-icon-16.png",
 "32": "images/toolbar-icon-32.png"
 "32": "images/toolbar-icon-32.png",
 "48": "images/toolbar-icon-48.png"
 }
	},
	"options_ui": {
Expand Down

7 changes: 7 additions & 0 deletions
scripts/utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,4 +191,11 @@ export const baseConfig = {
 "import.meta.env.GIT_TAG": JSON.stringify(gitTag),
 "import.meta.env.GIT_COMMIT": JSON.stringify(gitCommit),
 },
	resolve: {
 alias: {
 // NOTE: Don't forget to modify the `paths` in `jsconfig.json` also
 "@shared": fileURLToPath(new URL("../src/shared", import.meta.url)),
 "@ext": fileURLToPath(new URL("../src/ext/shared", import.meta.url)),
 },
	},
};

17 changes: 9 additions & 8 deletions
src/app/App.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
<svelte:options runes={true} />

<script>
	import icon from "./img/icon.png";
	import logo from "./img/logo.svg?raw";
	import IconDebug from "../ext/shared/img/icon-bug.svg?raw";
	import Dropdown from "../ext/shared/Components/Dropdown.svelte";
	import logoIcon from "@shared/img/logo-icon.png";
	import LogoText from "@shared/Components/LogoText.svelte";
	import IconDebug from "@shared/img/icon-bug.svg?raw";
	import Dropdown from "@shared/Components/Dropdown.svelte";
	import { i18nInit } from "./i18n.js";

	const baseUrl = "https://github.com/quoid/userscripts";
Expand DownExpand Up@@ -151,10 +151,11 @@
 alt="Userscripts App Icon"
 class="icon"
 draggable="false"
 src={icon}
 src={logoIcon}
 />
 <!-- eslint-disable-next-line svelte/no-at-html-tags -->
 <div class="logo">{@html logo}</div>
 <div class="logo">
 <LogoText />
 </div>
 <div class="version">
 {#if import.meta.env.GIT_TAG && import.meta.env.GIT_COMMIT}
 <a href="{baseUrl}/releases/tag/{import.meta.env.GIT_TAG}">
Expand DownExpand Up@@ -370,7 +371,7 @@

	button.red,
	button.red2:hover {
 color: var(--text-color-primary);
 color: var(--color-white);
 background-color: var(--color-red);
	}

Expand Down

2 changes: 1 addition & 1 deletion
src/app/i18n.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ export async function i18nInit() {
 md: (n, s) => getLangFrom(markdown, n, s),
 };
 } catch (error) {
 console.debug(error);
 console.debug("Will fall back to `en`", error);
 }
	}
	throw Error("I18n initialization failed");
Expand Down

1 change: 0 additions & 1 deletion
src/app/img/logo.svg

View file


Open in desktop


This file was deleted.


6 changes: 5 additions & 1 deletion
src/app/jsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,11 @@
 "esModuleInterop": true,
 "forceConsistentCasingInFileNames": true,
 "skipLibCheck": true,
 "sourceMap": true
 "sourceMap": true,

 "paths": {
 "@shared/*": ["../shared/*"]
 }
	},
	"include": ["**/*.d.ts", "**/*.js", "**/*.svelte"]
}

35 changes: 34 additions & 1 deletion
src/app/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,42 @@
import "./reset.css";
import "../shared/variables.css";
import "@shared/variables.css";
import "./app.css";
import { mount } from "svelte";
import App from "./App.svelte";

if (import.meta.env.MODE === "development") {
	// Simulation in non-WkWebView dev environment
	if (import.meta.env.SAFARI_PLATFORM === undefined) {
 console.warn("Simulation webkit...");
 window.webkit = {
 messageHandlers: {
 controller: {
 postMessage: async (message) => {
 switch (message) {
 case "INIT":
 return {
 build: "2",
 directory: "Userscripts App Documents",
 enableLogger: true,
 extStatus: "unknown",
 firstRunTime: 1,
 maxLogFileSize: 500_000_000,
 platform: "mac",
 promptLogger: true,
 useSettingsInsteadOfPreferences: true,
 version: "2.0.0",
 };
 default:
 console.debug("Simulation.webkit.messageHandler:", message);
 break;
 }
 },
 },
 },
 };
	}
}

const app = mount(App, { target: document.getElementById("app") });

export default app;

24 changes: 12 additions & 12 deletions
src/ext/action-popup/App.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
<script>
	import { onMount } from "svelte";
	import IconButton from "../shared/Components/IconButton.svelte";
	import Toggle from "../shared/Components/Toggle.svelte";
	import Loader from "../shared/Components/Loader.svelte";
	import IconButton from "@shared/Components/IconButton.svelte";
	import Toggle from "@shared/Components/Toggle.svelte";
	import Loader from "@shared/Components/Loader.svelte";
	import PopupItem from "./Components/PopupItem.svelte";
	import View from "./Components/View.svelte";
	import UpdateView from "./Components/Views/UpdateView.svelte";
	import InstallView from "./Components/Views/InstallView.svelte";
	import AllItemsView from "./Components/Views/AllItemsView.svelte";
	import iconOpen from "../shared/img/icon-open.svg?raw";
	import iconUpdate from "../shared/img/icon-update.svg?raw";
	import iconClear from "../shared/img/icon-clear.svg?raw";
	import iconRefresh from "../shared/img/icon-refresh.svg?raw";
	import { extensionPaths, openExtensionPage } from "../shared/utils.js";
	import { connectNative, sendNativeMessage } from "../shared/native.js";
	import * as settingsStorage from "../shared/settings.js";
	import iconOpen from "@shared/img/icon-open.svg?raw";
	import iconUpdate from "@shared/img/icon-update.svg?raw";
	import iconClear from "@shared/img/icon-clear.svg?raw";
	import iconRefresh from "@shared/img/icon-refresh.svg?raw";
	import { extensionPaths, openExtensionPage } from "@ext/utils.js";
	import { connectNative, sendNativeMessage } from "@ext/native.js";
	import * as settingsStorage from "@ext/settings.js";

	let errorNotification;
	let active = true;
Expand DownExpand Up@@ -657,7 +657,7 @@

	.header .buttons {
 align-items: center;
 border-bottom: 1px solid var(--color-black);
 border-bottom: 1px solid var(--border-color);
 display: flex;
 padding: 0.5rem 1rem calc(0.5rem - 1px);
	}
Expand DownExpand Up@@ -746,7 +746,7 @@
	}

	.footer {
 border-top: 1px solid var(--color-black);
 border-top: 1px solid var(--border-color);
 font-weight: 600;
 line-height: 1.5rem;
 padding: 0.5rem 0;
Expand Down

4 changes: 2 additions & 2 deletions
src/ext/action-popup/Components/PopupItem.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
<script>
	import Tag from "../../shared/Components/Tag.svelte";
	import Tag from "@shared/Components/Tag.svelte";

	export let background;
	export let enabled = false;
Expand DownExpand Up@@ -50,7 +50,7 @@
	span {
 align-items: center;
 background-color: var(--color-red);
 border: 1px solid var(--color-black);
 border: 1px solid var(--border-color);
 border-radius: 50%;
 display: flex;
 display: none;
Expand Down

8 changes: 4 additions & 4 deletions
src/ext/action-popup/Components/View.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
<script>
	import { quintInOut } from "svelte/easing";
	import IconButton from "../../shared/Components/IconButton.svelte";
	import Loader from "../../shared/Components/Loader.svelte";
	import iconArrowLeft from "../../shared/img/icon-arrow-left.svg?raw";
	import IconButton from "@shared/Components/IconButton.svelte";
	import Loader from "@shared/Components/Loader.svelte";
	import iconArrowLeft from "@shared/img/icon-arrow-left.svg?raw";

	export let loading = false;
	export let headerTitle = "View Header";
Expand DownExpand Up@@ -51,7 +51,7 @@

	.view__header {
 background-color: var(--color-bg-secondary);
 border-bottom: 1px solid var(--color-black);
 border-bottom: 1px solid var(--border-color);
 flex-shrink: 0;
 font-weight: 600;
 padding: 0.5rem 1rem calc(0.5rem - 1px);
Expand Down

8 changes: 4 additions & 4 deletions
src/ext/action-popup/Components/Views/InstallView.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
<script>
	import iconWarn from "../../../shared/img/icon-warn.svg?raw";
	import iconError from "../../../shared/img/icon-error.svg?raw";
	import iconWarn from "@shared/img/icon-warn.svg?raw";
	import iconError from "@shared/img/icon-error.svg?raw";

	export let userscript;
	export let installError;
Expand DownExpand Up@@ -129,7 +129,7 @@
	}

	.badge {
 background-color: var(--color-black);
 background-color: var(--color-bg-theme);
 border-radius: var(--border-radius);
 display: flex;
 font: var(--text-small);
Expand DownExpand Up@@ -158,7 +158,7 @@
	}

	button {
 background-color: #ffffffa6; /* -text-color-secondary */
 background-color: var(--text-color-secondary);
 border-radius: var(--border-radius);
 color: var(--color-bg-primary);
 flex-grow: 1;
Expand Down

4 changes: 2 additions & 2 deletions
src/ext/action-popup/Components/Views/UpdateView.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
<script>
	import iconUpdate from "../../../shared/img/icon-update.svg?raw";
	import iconUpdate from "@shared/img/icon-update.svg?raw";

	export let updates = [];
	export let updateClick;
Expand DownExpand Up@@ -35,7 +35,7 @@
<style>
	.item {
 align-items: center;
 border-bottom: 1px solid var(--color-black);
 border-bottom: 1px solid var(--border-color);
 display: flex;
 padding: 0.5rem 1rem;
 text-align: left;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: implement light theme#776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ACTCD
merged 21 commits into

from

Mar 24, 2025
 Merged


feat: implement light theme
#776
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
7424631

feat: implement light theme foundation


quoid Mar 2, 2025
7e3a557

refactor: migrate and rename shared resources


ACTCD Mar 2, 2025
0b5d601

refactor: use path alias in vite and ts


ACTCD Mar 2, 2025
7183324

refactor: some minor fixes of dev mode


ACTCD Mar 2, 2025
883786c

refactor: merge light and dark svg logo


ACTCD Mar 2, 2025
36d303e

feat: auto adapt to system color themes


ACTCD Mar 2, 2025
f2c0abc

fix: adjust red button text color


ACTCD Mar 2, 2025
d7217f0

feat: light theme logo text and ios launch screen


ACTCD Mar 3, 2025
ea317b8

fix: ios status bar color theme adaptive


ACTCD Mar 3, 2025
6a3a84d

chore: include light logo in sketch project


quoid Mar 3, 2025
c02f5d4

refactor: add light mode to indeterminate loader


quoid Mar 3, 2025
e066830

fix: use `var` for notification border


quoid Mar 3, 2025
2f0f337

refactor: split css var `--color-black`


ACTCD Mar 3, 2025
d416eb4

fix: add light theme text highlight colors


ACTCD Mar 3, 2025
6e55319

style: adjust light theme border color


ACTCD Mar 3, 2025
5809615

chore: popup dev page adapt light theme


ACTCD Mar 3, 2025
d23cb06

style: add light theme modal mask background color


ACTCD Mar 3, 2025
57feee7

style: add light theme box-shadow variable


ACTCD Mar 3, 2025
5dcd182

style: adjust font weight of settings ui


ACTCD Mar 4, 2025
122422f

style: fix light theme reset button color


ACTCD Mar 4, 2025
0c5ea39

fix: adjust icon shadows and sizes


ACTCD Mar 24, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
entry-app-webview.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
 name="viewport"
 content="width=device-width, initial-scale=1, user-scalable=no"
 />
 <meta name="color-scheme" content="dark" />
 <meta name="color-scheme" content="dark light" />
 <title>Userscripts App</title>
	</head>
	<body>
Expand Down

2 changes: 1 addition & 1 deletion
entry-ext-action-popup.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
	<head>
 <meta charset="UTF-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta name="color-scheme" content="dark" />
 <meta name="color-scheme" content="dark light" />
 <title>Userscripts popup</title>
	</head>
	<body>
Expand Down

2 changes: 1 addition & 1 deletion
entry-ext-extension-page.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
	<head>
 <meta charset="UTF-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta name="color-scheme" content="dark" />
 <meta name="color-scheme" content="dark light" />
 <title>Userscripts page</title>
	</head>
	<body>
Expand Down

4 changes: 2 additions & 2 deletions
eslint.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,15 +40,15 @@ export default [

	/** @see {@link https://eslint.org/docs/latest/use/configure/migration-guide#configuring-language-options} */
	{
 files: ["scripts/**/*.js"],
 files: ["*.js", "scripts/**/*.js"],
 languageOptions: {
 globals: {
 ...globals.node,
 },
 },
	},
	{
 files: ["src/{app,dev}/**/*.{js,svelte}"],
 files: ["src/{app,dev,shared}/**/*.{js,svelte}"],
 languageOptions: {
 globals: {
 ...globals.browser,
Expand Down
Binary file modifiedetc/uilayout.sketch

View file


Open in desktop


Binary file not shown.

Binary file modifiedpublic/ext/safari-15/images/icon-128.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-256.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-48.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-512.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedpublic/ext/safari-15/images/icon-64.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-96.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/toolbar-icon-16.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/toolbar-icon-32.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedpublic/ext/safari-15/images/toolbar-icon-48.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

4 changes: 3 additions & 1 deletion
public/ext/safari-15/manifest.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
	"version": "_VERSION_",
	"icons": {
 "48": "images/icon-48.png",
 "64": "images/icon-64.png",
 "96": "images/icon-96.png",
 "128": "images/icon-128.png",
 "256": "images/icon-256.png",
Expand All@@ -19,7 +20,8 @@
 "default_popup": "dist/entry-ext-action-popup.html",
 "default_icon": {
 "16": "images/toolbar-icon-16.png",
 "32": "images/toolbar-icon-32.png"
 "32": "images/toolbar-icon-32.png",
 "48": "images/toolbar-icon-48.png"
 }
	},
	"options_ui": {
Expand Down

7 changes: 7 additions & 0 deletions
scripts/utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,4 +191,11 @@ export const baseConfig = {
 "import.meta.env.GIT_TAG": JSON.stringify(gitTag),
 "import.meta.env.GIT_COMMIT": JSON.stringify(gitCommit),
 },
	resolve: {
 alias: {
 // NOTE: Don't forget to modify the `paths` in `jsconfig.json` also
 "@shared": fileURLToPath(new URL("../src/shared", import.meta.url)),
 "@ext": fileURLToPath(new URL("../src/ext/shared", import.meta.url)),
 },
	},
};

17 changes: 9 additions & 8 deletions
src/app/App.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
<svelte:options runes={true} />

<script>
	import icon from "./img/icon.png";
	import logo from "./img/logo.svg?raw";
	import IconDebug from "../ext/shared/img/icon-bug.svg?raw";
	import Dropdown from "../ext/shared/Components/Dropdown.svelte";
	import logoIcon from "@shared/img/logo-icon.png";
	import LogoText from "@shared/Components/LogoText.svelte";
	import IconDebug from "@shared/img/icon-bug.svg?raw";
	import Dropdown from "@shared/Components/Dropdown.svelte";
	import { i18nInit } from "./i18n.js";

	const baseUrl = "https://github.com/quoid/userscripts";
Expand DownExpand Up@@ -151,10 +151,11 @@
 alt="Userscripts App Icon"
 class="icon"
 draggable="false"
 src={icon}
 src={logoIcon}
 />
 <!-- eslint-disable-next-line svelte/no-at-html-tags -->
 <div class="logo">{@html logo}</div>
 <div class="logo">
 <LogoText />
 </div>
 <div class="version">
 {#if import.meta.env.GIT_TAG && import.meta.env.GIT_COMMIT}
 <a href="{baseUrl}/releases/tag/{import.meta.env.GIT_TAG}">
Expand DownExpand Up@@ -370,7 +371,7 @@

	button.red,
	button.red2:hover {
 color: var(--text-color-primary);
 color: var(--color-white);
 background-color: var(--color-red);
	}

Expand Down

2 changes: 1 addition & 1 deletion
src/app/i18n.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ export async function i18nInit() {
 md: (n, s) => getLangFrom(markdown, n, s),
 };
 } catch (error) {
 console.debug(error);
 console.debug("Will fall back to `en`", error);
 }
	}
	throw Error("I18n initialization failed");
Expand Down

1 change: 0 additions & 1 deletion
src/app/img/logo.svg

View file


Open in desktop


This file was deleted.


6 changes: 5 additions & 1 deletion
src/app/jsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,11 @@
 "esModuleInterop": true,
 "forceConsistentCasingInFileNames": true,
 "skipLibCheck": true,
 "sourceMap": true
 "sourceMap": true,

 "paths": {
 "@shared/*": ["../shared/*"]
 }
	},
	"include": ["**/*.d.ts", "**/*.js", "**/*.svelte"]
}

35 changes: 34 additions & 1 deletion
src/app/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,42 @@
import "./reset.css";
import "../shared/variables.css";
import "@shared/variables.css";
import "./app.css";
import { mount } from "svelte";
import App from "./App.svelte";

if (import.meta.env.MODE === "development") {
	// Simulation in non-WkWebView dev environment
	if (import.meta.env.SAFARI_PLATFORM === undefined) {
 console.warn("Simulation webkit...");
 window.webkit = {
 messageHandlers: {
 controller: {
 postMessage: async (message) => {
 switch (message) {
 case "INIT":
 return {
 build: "2",
 directory: "Userscripts App Documents",
 enableLogger: true,
 extStatus: "unknown",
 firstRunTime: 1,
 maxLogFileSize: 500_000_000,
 platform: "mac",
 promptLogger: true,
 useSettingsInsteadOfPreferences: true,
 version: "2.0.0",
 };
 default:
 console.debug("Simulation.webkit.messageHandler:", message);
 break;
 }
 },
 },
 },
 };
	}
}

const app = mount(App, { target: document.getElementById("app") });

export default app;

24 changes: 12 additions & 12 deletions
src/ext/action-popup/App.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
<script>
	import { onMount } from "svelte";
	import IconButton from "../shared/Components/IconButton.svelte";
	import Toggle from "../shared/Components/Toggle.svelte";
	import Loader from "../shared/Components/Loader.svelte";
	import IconButton from "@shared/Components/IconButton.svelte";
	import Toggle from "@shared/Components/Toggle.svelte";
	import Loader from "@shared/Components/Loader.svelte";
	import PopupItem from "./Components/PopupItem.svelte";
	import View from "./Components/View.svelte";
	import UpdateView from "./Components/Views/UpdateView.svelte";
	import InstallView from "./Components/Views/InstallView.svelte";
	import AllItemsView from "./Components/Views/AllItemsView.svelte";
	import iconOpen from "../shared/img/icon-open.svg?raw";
	import iconUpdate from "../shared/img/icon-update.svg?raw";
	import iconClear from "../shared/img/icon-clear.svg?raw";
	import iconRefresh from "../shared/img/icon-refresh.svg?raw";
	import { extensionPaths, openExtensionPage } from "../shared/utils.js";
	import { connectNative, sendNativeMessage } from "../shared/native.js";
	import * as settingsStorage from "../shared/settings.js";
	import iconOpen from "@shared/img/icon-open.svg?raw";
	import iconUpdate from "@shared/img/icon-update.svg?raw";
	import iconClear from "@shared/img/icon-clear.svg?raw";
	import iconRefresh from "@shared/img/icon-refresh.svg?raw";
	import { extensionPaths, openExtensionPage } from "@ext/utils.js";
	import { connectNative, sendNativeMessage } from "@ext/native.js";
	import * as settingsStorage from "@ext/settings.js";

	let errorNotification;
	let active = true;
Expand DownExpand Up@@ -657,7 +657,7 @@

	.header .buttons {
 align-items: center;
 border-bottom: 1px solid var(--color-black);
 border-bottom: 1px solid var(--border-color);
 display: flex;
 padding: 0.5rem 1rem calc(0.5rem - 1px);
	}
Expand DownExpand Up@@ -746,7 +746,7 @@
	}

	.footer {
 border-top: 1px solid var(--color-black);
 border-top: 1px solid var(--border-color);
 font-weight: 600;
 line-height: 1.5rem;
 padding: 0.5rem 0;
Expand Down

4 changes: 2 additions & 2 deletions
src/ext/action-popup/Components/PopupItem.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
<script>
	import Tag from "../../shared/Components/Tag.svelte";
	import Tag from "@shared/Components/Tag.svelte";

	export let background;
	export let enabled = false;
Expand DownExpand Up@@ -50,7 +50,7 @@
	span {
 align-items: center;
 background-color: var(--color-red);
 border: 1px solid var(--color-black);
 border: 1px solid var(--border-color);
 border-radius: 50%;
 display: flex;
 display: none;
Expand Down

8 changes: 4 additions & 4 deletions
src/ext/action-popup/Components/View.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
<script>
	import { quintInOut } from "svelte/easing";
	import IconButton from "../../shared/Components/IconButton.svelte";
	import Loader from "../../shared/Components/Loader.svelte";
	import iconArrowLeft from "../../shared/img/icon-arrow-left.svg?raw";
	import IconButton from "@shared/Components/IconButton.svelte";
	import Loader from "@shared/Components/Loader.svelte";
	import iconArrowLeft from "@shared/img/icon-arrow-left.svg?raw";

	export let loading = false;
	export let headerTitle = "View Header";
Expand DownExpand Up@@ -51,7 +51,7 @@

	.view__header {
 background-color: var(--color-bg-secondary);
 border-bottom: 1px solid var(--color-black);
 border-bottom: 1px solid var(--border-color);
 flex-shrink: 0;
 font-weight: 600;
 padding: 0.5rem 1rem calc(0.5rem - 1px);
Expand Down

8 changes: 4 additions & 4 deletions
src/ext/action-popup/Components/Views/InstallView.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
<script>
	import iconWarn from "../../../shared/img/icon-warn.svg?raw";
	import iconError from "../../../shared/img/icon-error.svg?raw";
	import iconWarn from "@shared/img/icon-warn.svg?raw";
	import iconError from "@shared/img/icon-error.svg?raw";

	export let userscript;
	export let installError;
Expand DownExpand Up@@ -129,7 +129,7 @@
	}

	.badge {
 background-color: var(--color-black);
 background-color: var(--color-bg-theme);
 border-radius: var(--border-radius);
 display: flex;
 font: var(--text-small);
Expand DownExpand Up@@ -158,7 +158,7 @@
	}

	button {
 background-color: #ffffffa6; /* -text-color-secondary */
 background-color: var(--text-color-secondary);
 border-radius: var(--border-radius);
 color: var(--color-bg-primary);
 flex-grow: 1;
Expand Down

4 changes: 2 additions & 2 deletions
src/ext/action-popup/Components/Views/UpdateView.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
<script>
	import iconUpdate from "../../../shared/img/icon-update.svg?raw";
	import iconUpdate from "@shared/img/icon-update.svg?raw";

	export let updates = [];
	export let updateClick;
Expand DownExpand Up@@ -35,7 +35,7 @@
<style>
	.item {
 align-items: center;
 border-bottom: 1px solid var(--color-black);
 border-bottom: 1px solid var(--border-color);
 display: flex;
 padding: 0.5rem 1rem;
 text-align: left;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: implement light theme#776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ACTCD
merged 21 commits into

from

Mar 24, 2025
 Merged


feat: implement light theme
#776
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
7424631

feat: implement light theme foundation


quoid Mar 2, 2025
7e3a557

refactor: migrate and rename shared resources


ACTCD Mar 2, 2025
0b5d601

refactor: use path alias in vite and ts


ACTCD Mar 2, 2025
7183324

refactor: some minor fixes of dev mode


ACTCD Mar 2, 2025
883786c

refactor: merge light and dark svg logo


ACTCD Mar 2, 2025
36d303e

feat: auto adapt to system color themes


ACTCD Mar 2, 2025
f2c0abc

fix: adjust red button text color


ACTCD Mar 2, 2025
d7217f0

feat: light theme logo text and ios launch screen


ACTCD Mar 3, 2025
ea317b8

fix: ios status bar color theme adaptive


ACTCD Mar 3, 2025
6a3a84d

chore: include light logo in sketch project


quoid Mar 3, 2025
c02f5d4

refactor: add light mode to indeterminate loader


quoid Mar 3, 2025
e066830

fix: use `var` for notification border


quoid Mar 3, 2025
2f0f337

refactor: split css var `--color-black`


ACTCD Mar 3, 2025
d416eb4

fix: add light theme text highlight colors


ACTCD Mar 3, 2025
6e55319

style: adjust light theme border color


ACTCD Mar 3, 2025
5809615

chore: popup dev page adapt light theme


ACTCD Mar 3, 2025
d23cb06

style: add light theme modal mask background color


ACTCD Mar 3, 2025
57feee7

style: add light theme box-shadow variable


ACTCD Mar 3, 2025
5dcd182

style: adjust font weight of settings ui


ACTCD Mar 4, 2025
122422f

style: fix light theme reset button color


ACTCD Mar 4, 2025
0c5ea39

fix: adjust icon shadows and sizes


ACTCD Mar 24, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
entry-app-webview.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
 name="viewport"
 content="width=device-width, initial-scale=1, user-scalable=no"
 />
 <meta name="color-scheme" content="dark" />
 <meta name="color-scheme" content="dark light" />
 <title>Userscripts App</title>
	</head>
	<body>
Expand Down

2 changes: 1 addition & 1 deletion
entry-ext-action-popup.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
	<head>
 <meta charset="UTF-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta name="color-scheme" content="dark" />
 <meta name="color-scheme" content="dark light" />
 <title>Userscripts popup</title>
	</head>
	<body>
Expand Down

2 changes: 1 addition & 1 deletion
entry-ext-extension-page.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
	<head>
 <meta charset="UTF-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta name="color-scheme" content="dark" />
 <meta name="color-scheme" content="dark light" />
 <title>Userscripts page</title>
	</head>
	<body>
Expand Down

4 changes: 2 additions & 2 deletions
eslint.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,15 +40,15 @@ export default [

	/** @see {@link https://eslint.org/docs/latest/use/configure/migration-guide#configuring-language-options} */
	{
 files: ["scripts/**/*.js"],
 files: ["*.js", "scripts/**/*.js"],
 languageOptions: {
 globals: {
 ...globals.node,
 },
 },
	},
	{
 files: ["src/{app,dev}/**/*.{js,svelte}"],
 files: ["src/{app,dev,shared}/**/*.{js,svelte}"],
 languageOptions: {
 globals: {
 ...globals.browser,
Expand Down
Binary file modifiedetc/uilayout.sketch

View file


Open in desktop


Binary file not shown.

Binary file modifiedpublic/ext/safari-15/images/icon-128.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-256.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-48.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-512.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedpublic/ext/safari-15/images/icon-64.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-96.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/toolbar-icon-16.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/toolbar-icon-32.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedpublic/ext/safari-15/images/toolbar-icon-48.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

4 changes: 3 additions & 1 deletion
public/ext/safari-15/manifest.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
	"version": "_VERSION_",
	"icons": {
 "48": "images/icon-48.png",
 "64": "images/icon-64.png",
 "96": "images/icon-96.png",
 "128": "images/icon-128.png",
 "256": "images/icon-256.png",
Expand All@@ -19,7 +20,8 @@
 "default_popup": "dist/entry-ext-action-popup.html",
 "default_icon": {
 "16": "images/toolbar-icon-16.png",
 "32": "images/toolbar-icon-32.png"
 "32": "images/toolbar-icon-32.png",
 "48": "images/toolbar-icon-48.png"
 }
	},
	"options_ui": {
Expand Down

7 changes: 7 additions & 0 deletions
scripts/utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,4 +191,11 @@ export const baseConfig = {
 "import.meta.env.GIT_TAG": JSON.stringify(gitTag),
 "import.meta.env.GIT_COMMIT": JSON.stringify(gitCommit),
 },
	resolve: {
 alias: {
 // NOTE: Don't forget to modify the `paths` in `jsconfig.json` also
 "@shared": fileURLToPath(new URL("../src/shared", import.meta.url)),
 "@ext": fileURLToPath(new URL("../src/ext/shared", import.meta.url)),
 },
	},
};

17 changes: 9 additions & 8 deletions
src/app/App.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
<svelte:options runes={true} />

<script>
	import icon from "./img/icon.png";
	import logo from "./img/logo.svg?raw";
	import IconDebug from "../ext/shared/img/icon-bug.svg?raw";
	import Dropdown from "../ext/shared/Components/Dropdown.svelte";
	import logoIcon from "@shared/img/logo-icon.png";
	import LogoText from "@shared/Components/LogoText.svelte";
	import IconDebug from "@shared/img/icon-bug.svg?raw";
	import Dropdown from "@shared/Components/Dropdown.svelte";
	import { i18nInit } from "./i18n.js";

	const baseUrl = "https://github.com/quoid/userscripts";
Expand DownExpand Up@@ -151,10 +151,11 @@
 alt="Userscripts App Icon"
 class="icon"
 draggable="false"
 src={icon}
 src={logoIcon}
 />
 <!-- eslint-disable-next-line svelte/no-at-html-tags -->
 <div class="logo">{@html logo}</div>
 <div class="logo">
 <LogoText />
 </div>
 <div class="version">
 {#if import.meta.env.GIT_TAG && import.meta.env.GIT_COMMIT}
 <a href="{baseUrl}/releases/tag/{import.meta.env.GIT_TAG}">
Expand DownExpand Up@@ -370,7 +371,7 @@

	button.red,
	button.red2:hover {
 color: var(--text-color-primary);
 color: var(--color-white);
 background-color: var(--color-red);
	}

Expand Down

2 changes: 1 addition & 1 deletion
src/app/i18n.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ export async function i18nInit() {
 md: (n, s) => getLangFrom(markdown, n, s),
 };
 } catch (error) {
 console.debug(error);
 console.debug("Will fall back to `en`", error);
 }
	}
	throw Error("I18n initialization failed");
Expand Down

1 change: 0 additions & 1 deletion
src/app/img/logo.svg

View file


Open in desktop


This file was deleted.


6 changes: 5 additions & 1 deletion
src/app/jsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,11 @@
 "esModuleInterop": true,
 "forceConsistentCasingInFileNames": true,
 "skipLibCheck": true,
 "sourceMap": true
 "sourceMap": true,

 "paths": {
 "@shared/*": ["../shared/*"]
 }
	},
	"include": ["**/*.d.ts", "**/*.js", "**/*.svelte"]
}

35 changes: 34 additions & 1 deletion
src/app/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,42 @@
import "./reset.css";
import "../shared/variables.css";
import "@shared/variables.css";
import "./app.css";
import { mount } from "svelte";
import App from "./App.svelte";

if (import.meta.env.MODE === "development") {
	// Simulation in non-WkWebView dev environment
	if (import.meta.env.SAFARI_PLATFORM === undefined) {
 console.warn("Simulation webkit...");
 window.webkit = {
 messageHandlers: {
 controller: {
 postMessage: async (message) => {
 switch (message) {
 case "INIT":
 return {
 build: "2",
 directory: "Userscripts App Documents",
 enableLogger: true,
 extStatus: "unknown",
 firstRunTime: 1,
 maxLogFileSize: 500_000_000,
 platform: "mac",
 promptLogger: true,
 useSettingsInsteadOfPreferences: true,
 version: "2.0.0",
 };
 default:
 console.debug("Simulation.webkit.messageHandler:", message);
 break;
 }
 },
 },
 },
 };
	}
}

const app = mount(App, { target: document.getElementById("app") });

export default app;

24 changes: 12 additions & 12 deletions
src/ext/action-popup/App.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
<script>
	import { onMount } from "svelte";
	import IconButton from "../shared/Components/IconButton.svelte";
	import Toggle from "../shared/Components/Toggle.svelte";
	import Loader from "../shared/Components/Loader.svelte";
	import IconButton from "@shared/Components/IconButton.svelte";
	import Toggle from "@shared/Components/Toggle.svelte";
	import Loader from "@shared/Components/Loader.svelte";
	import PopupItem from "./Components/PopupItem.svelte";
	import View from "./Components/View.svelte";
	import UpdateView from "./Components/Views/UpdateView.svelte";
	import InstallView from "./Components/Views/InstallView.svelte";
	import AllItemsView from "./Components/Views/AllItemsView.svelte";
	import iconOpen from "../shared/img/icon-open.svg?raw";
	import iconUpdate from "../shared/img/icon-update.svg?raw";
	import iconClear from "../shared/img/icon-clear.svg?raw";
	import iconRefresh from "../shared/img/icon-refresh.svg?raw";
	import { extensionPaths, openExtensionPage } from "../shared/utils.js";
	import { connectNative, sendNativeMessage } from "../shared/native.js";
	import * as settingsStorage from "../shared/settings.js";
	import iconOpen from "@shared/img/icon-open.svg?raw";
	import iconUpdate from "@shared/img/icon-update.svg?raw";
	import iconClear from "@shared/img/icon-clear.svg?raw";
	import iconRefresh from "@shared/img/icon-refresh.svg?raw";
	import { extensionPaths, openExtensionPage } from "@ext/utils.js";
	import { connectNative, sendNativeMessage } from "@ext/native.js";
	import * as settingsStorage from "@ext/settings.js";

	let errorNotification;
	let active = true;
Expand DownExpand Up@@ -657,7 +657,7 @@

	.header .buttons {
 align-items: center;
 border-bottom: 1px solid var(--color-black);
 border-bottom: 1px solid var(--border-color);
 display: flex;
 padding: 0.5rem 1rem calc(0.5rem - 1px);
	}
Expand DownExpand Up@@ -746,7 +746,7 @@
	}

	.footer {
 border-top: 1px solid var(--color-black);
 border-top: 1px solid var(--border-color);
 font-weight: 600;
 line-height: 1.5rem;
 padding: 0.5rem 0;
Expand Down

4 changes: 2 additions & 2 deletions
src/ext/action-popup/Components/PopupItem.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
<script>
	import Tag from "../../shared/Components/Tag.svelte";
	import Tag from "@shared/Components/Tag.svelte";

	export let background;
	export let enabled = false;
Expand DownExpand Up@@ -50,7 +50,7 @@
	span {
 align-items: center;
 background-color: var(--color-red);
 border: 1px solid var(--color-black);
 border: 1px solid var(--border-color);
 border-radius: 50%;
 display: flex;
 display: none;
Expand Down

8 changes: 4 additions & 4 deletions
src/ext/action-popup/Components/View.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
<script>
	import { quintInOut } from "svelte/easing";
	import IconButton from "../../shared/Components/IconButton.svelte";
	import Loader from "../../shared/Components/Loader.svelte";
	import iconArrowLeft from "../../shared/img/icon-arrow-left.svg?raw";
	import IconButton from "@shared/Components/IconButton.svelte";
	import Loader from "@shared/Components/Loader.svelte";
	import iconArrowLeft from "@shared/img/icon-arrow-left.svg?raw";

	export let loading = false;
	export let headerTitle = "View Header";
Expand DownExpand Up@@ -51,7 +51,7 @@

	.view__header {
 background-color: var(--color-bg-secondary);
 border-bottom: 1px solid var(--color-black);
 border-bottom: 1px solid var(--border-color);
 flex-shrink: 0;
 font-weight: 600;
 padding: 0.5rem 1rem calc(0.5rem - 1px);
Expand Down

8 changes: 4 additions & 4 deletions
src/ext/action-popup/Components/Views/InstallView.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
<script>
	import iconWarn from "../../../shared/img/icon-warn.svg?raw";
	import iconError from "../../../shared/img/icon-error.svg?raw";
	import iconWarn from "@shared/img/icon-warn.svg?raw";
	import iconError from "@shared/img/icon-error.svg?raw";

	export let userscript;
	export let installError;
Expand DownExpand Up@@ -129,7 +129,7 @@
	}

	.badge {
 background-color: var(--color-black);
 background-color: var(--color-bg-theme);
 border-radius: var(--border-radius);
 display: flex;
 font: var(--text-small);
Expand DownExpand Up@@ -158,7 +158,7 @@
	}

	button {
 background-color: #ffffffa6; /* -text-color-secondary */
 background-color: var(--text-color-secondary);
 border-radius: var(--border-radius);
 color: var(--color-bg-primary);
 flex-grow: 1;
Expand Down

4 changes: 2 additions & 2 deletions
src/ext/action-popup/Components/Views/UpdateView.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
<script>
	import iconUpdate from "../../../shared/img/icon-update.svg?raw";
	import iconUpdate from "@shared/img/icon-update.svg?raw";

	export let updates = [];
	export let updateClick;
Expand DownExpand Up@@ -35,7 +35,7 @@
<style>
	.item {
 align-items: center;
 border-bottom: 1px solid var(--color-black);
 border-bottom: 1px solid var(--border-color);
 display: flex;
 padding: 0.5rem 1rem;
 text-align: left;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
feat: implement light theme#776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ACTCD
merged 21 commits into

from

Mar 24, 2025
 Merged


feat: implement light theme
#776
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
7424631

feat: implement light theme foundation


quoid Mar 2, 2025
7e3a557

refactor: migrate and rename shared resources


ACTCD Mar 2, 2025
0b5d601

refactor: use path alias in vite and ts


ACTCD Mar 2, 2025
7183324

refactor: some minor fixes of dev mode


ACTCD Mar 2, 2025
883786c

refactor: merge light and dark svg logo


ACTCD Mar 2, 2025
36d303e

feat: auto adapt to system color themes


ACTCD Mar 2, 2025
f2c0abc

fix: adjust red button text color


ACTCD Mar 2, 2025
d7217f0

feat: light theme logo text and ios launch screen


ACTCD Mar 3, 2025
ea317b8

fix: ios status bar color theme adaptive


ACTCD Mar 3, 2025
6a3a84d

chore: include light logo in sketch project


quoid Mar 3, 2025
c02f5d4

refactor: add light mode to indeterminate loader


quoid Mar 3, 2025
e066830

fix: use `var` for notification border


quoid Mar 3, 2025
2f0f337

refactor: split css var `--color-black`


ACTCD Mar 3, 2025
d416eb4

fix: add light theme text highlight colors


ACTCD Mar 3, 2025
6e55319

style: adjust light theme border color


ACTCD Mar 3, 2025
5809615

chore: popup dev page adapt light theme


ACTCD Mar 3, 2025
d23cb06

style: add light theme modal mask background color


ACTCD Mar 3, 2025
57feee7

style: add light theme box-shadow variable


ACTCD Mar 3, 2025
5dcd182

style: adjust font weight of settings ui


ACTCD Mar 4, 2025
122422f

style: fix light theme reset button color


ACTCD Mar 4, 2025
0c5ea39

fix: adjust icon shadows and sizes


ACTCD Mar 24, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
entry-app-webview.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
 name="viewport"
 content="width=device-width, initial-scale=1, user-scalable=no"
 />
 <meta name="color-scheme" content="dark" />
 <meta name="color-scheme" content="dark light" />
 <title>Userscripts App</title>
	</head>
	<body>
Expand Down

2 changes: 1 addition & 1 deletion
entry-ext-action-popup.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
	<head>
 <meta charset="UTF-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta name="color-scheme" content="dark" />
 <meta name="color-scheme" content="dark light" />
 <title>Userscripts popup</title>
	</head>
	<body>
Expand Down

2 changes: 1 addition & 1 deletion
entry-ext-extension-page.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
	<head>
 <meta charset="UTF-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta name="color-scheme" content="dark" />
 <meta name="color-scheme" content="dark light" />
 <title>Userscripts page</title>
	</head>
	<body>
Expand Down

4 changes: 2 additions & 2 deletions
eslint.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,15 +40,15 @@ export default [

	/** @see {@link https://eslint.org/docs/latest/use/configure/migration-guide#configuring-language-options} */
	{
 files: ["scripts/**/*.js"],
 files: ["*.js", "scripts/**/*.js"],
 languageOptions: {
 globals: {
 ...globals.node,
 },
 },
	},
	{
 files: ["src/{app,dev}/**/*.{js,svelte}"],
 files: ["src/{app,dev,shared}/**/*.{js,svelte}"],
 languageOptions: {
 globals: {
 ...globals.browser,
Expand Down
Binary file modifiedetc/uilayout.sketch

View file


Open in desktop


Binary file not shown.

Binary file modifiedpublic/ext/safari-15/images/icon-128.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-256.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-48.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-512.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedpublic/ext/safari-15/images/icon-64.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/icon-96.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/toolbar-icon-16.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedpublic/ext/safari-15/images/toolbar-icon-32.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedpublic/ext/safari-15/images/toolbar-icon-48.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

4 changes: 3 additions & 1 deletion
public/ext/safari-15/manifest.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
	"version": "_VERSION_",
	"icons": {
 "48": "images/icon-48.png",
 "64": "images/icon-64.png",
 "96": "images/icon-96.png",
 "128": "images/icon-128.png",
 "256": "images/icon-256.png",
Expand All@@ -19,7 +20,8 @@
 "default_popup": "dist/entry-ext-action-popup.html",
 "default_icon": {
 "16": "images/toolbar-icon-16.png",
 "32": "images/toolbar-icon-32.png"
 "32": "images/toolbar-icon-32.png",
 "48": "images/toolbar-icon-48.png"
 }
	},
	"options_ui": {
Expand Down

7 changes: 7 additions & 0 deletions
scripts/utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,4 +191,11 @@ export const baseConfig = {
 "import.meta.env.GIT_TAG": JSON.stringify(gitTag),
 "import.meta.env.GIT_COMMIT": JSON.stringify(gitCommit),
 },
	resolve: {
 alias: {
 // NOTE: Don't forget to modify the `paths` in `jsconfig.json` also
 "@shared": fileURLToPath(new URL("../src/shared", import.meta.url)),
 "@ext": fileURLToPath(new URL("../src/ext/shared", import.meta.url)),
 },
	},
};

17 changes: 9 additions & 8 deletions
src/app/App.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
<svelte:options runes={true} />

<script>
	import icon from "./img/icon.png";
	import logo from "./img/logo.svg?raw";
	import IconDebug from "../ext/shared/img/icon-bug.svg?raw";
	import Dropdown from "../ext/shared/Components/Dropdown.svelte";
	import logoIcon from "@shared/img/logo-icon.png";
	import LogoText from "@shared/Components/LogoText.svelte";
	import IconDebug from "@shared/img/icon-bug.svg?raw";
	import Dropdown from "@shared/Components/Dropdown.svelte";
	import { i18nInit } from "./i18n.js";

	const baseUrl = "https://github.com/quoid/userscripts";
Expand DownExpand Up@@ -151,10 +151,11 @@
 alt="Userscripts App Icon"
 class="icon"
 draggable="false"
 src={icon}
 src={logoIcon}
 />
 <!-- eslint-disable-next-line svelte/no-at-html-tags -->
 <div class="logo">{@html logo}</div>
 <div class="logo">
 <LogoText />
 </div>
 <div class="version">
 {#if import.meta.env.GIT_TAG && import.meta.env.GIT_COMMIT}
 <a href="{baseUrl}/releases/tag/{import.meta.env.GIT_TAG}">
Expand DownExpand Up@@ -370,7 +371,7 @@

	button.red,
	button.red2:hover {
 color: var(--text-color-primary);
 color: var(--color-white);
 background-color: var(--color-red);
	}

Expand Down

2 changes: 1 addition & 1 deletion
src/app/i18n.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ export async function i18nInit() {
 md: (n, s) => getLangFrom(markdown, n, s),
 };
 } catch (error) {
 console.debug(error);
 console.debug("Will fall back to `en`", error);
 }
	}
	throw Error("I18n initialization failed");
Expand Down

1 change: 0 additions & 1 deletion
src/app/img/logo.svg

View file


Open in desktop


This file was deleted.


6 changes: 5 additions & 1 deletion
src/app/jsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,11 @@
 "esModuleInterop": true,
 "forceConsistentCasingInFileNames": true,
 "skipLibCheck": true,
 "sourceMap": true
 "sourceMap": true,

 "paths": {
 "@shared/*": ["../shared/*"]
 }
	},
	"include": ["**/*.d.ts", "**/*.js", "**/*.svelte"]
}

35 changes: 34 additions & 1 deletion
src/app/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,42 @@
import "./reset.css";
import "../shared/variables.css";
import "@shared/variables.css";
import "./app.css";
import { mount } from "svelte";
import App from "./App.svelte";

if (import.meta.env.MODE === "development") {
	// Simulation in non-WkWebView dev environment
	if (import.meta.env.SAFARI_PLATFORM === undefined) {
 console.warn("Simulation webkit...");
 window.webkit = {
 messageHandlers: {
 controller: {
 postMessage: async (message) => {
 switch (message) {
 case "INIT":
 return {
 build: "2",
 directory: "Userscripts App Documents",
 enableLogger: true,
 extStatus: "unknown",
 firstRunTime: 1,
 maxLogFileSize: 500_000_000,
 platform: "mac",
 promptLogger: true,
 useSettingsInsteadOfPreferences: true,
 version: "2.0.0",
 };
 default:
 console.debug("Simulation.webkit.messageHandler:", message);
 break;
 }
 },
 },
 },
 };
	}
}

const app = mount(App, { target: document.getElementById("app") });

export default app;

24 changes: 12 additions & 12 deletions
src/ext/action-popup/App.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
<script>
	import { onMount } from "svelte";
	import IconButton from "../shared/Components/IconButton.svelte";
	import Toggle from "../shared/Components/Toggle.svelte";
	import Loader from "../shared/Components/Loader.svelte";
	import IconButton from "@shared/Components/IconButton.svelte";
	import Toggle from "@shared/Components/Toggle.svelte";
	import Loader from "@shared/Components/Loader.svelte";
	import PopupItem from "./Components/PopupItem.svelte";
	import View from "./Components/View.svelte";
	import UpdateView from "./Components/Views/UpdateView.svelte";
	import InstallView from "./Components/Views/InstallView.svelte";
	import AllItemsView from "./Components/Views/AllItemsView.svelte";
	import iconOpen from "../shared/img/icon-open.svg?raw";
	import iconUpdate from "../shared/img/icon-update.svg?raw";
	import iconClear from "../shared/img/icon-clear.svg?raw";
	import iconRefresh from "../shared/img/icon-refresh.svg?raw";
	import { extensionPaths, openExtensionPage } from "../shared/utils.js";
	import { connectNative, sendNativeMessage } from "../shared/native.js";
	import * as settingsStorage from "../shared/settings.js";
	import iconOpen from "@shared/img/icon-open.svg?raw";
	import iconUpdate from "@shared/img/icon-update.svg?raw";
	import iconClear from "@shared/img/icon-clear.svg?raw";
	import iconRefresh from "@shared/img/icon-refresh.svg?raw";
	import { extensionPaths, openExtensionPage } from "@ext/utils.js";
	import { connectNative, sendNativeMessage } from "@ext/native.js";
	import * as settingsStorage from "@ext/settings.js";

	let errorNotification;
	let active = true;
Expand DownExpand Up@@ -657,7 +657,7 @@

	.header .buttons {
 align-items: center;
 border-bottom: 1px solid var(--color-black);
 border-bottom: 1px solid var(--border-color);
 display: flex;
 padding: 0.5rem 1rem calc(0.5rem - 1px);
	}
Expand DownExpand Up@@ -746,7 +746,7 @@
	}

	.footer {
 border-top: 1px solid var(--color-black);
 border-top: 1px solid var(--border-color);
 font-weight: 600;
 line-height: 1.5rem;
 padding: 0.5rem 0;
Expand Down

4 changes: 2 additions & 2 deletions
src/ext/action-popup/Components/PopupItem.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
<script>
	import Tag from "../../shared/Components/Tag.svelte";
	import Tag from "@shared/Components/Tag.svelte";

	export let background;
	export let enabled = false;
Expand DownExpand Up@@ -50,7 +50,7 @@
	span {
 align-items: center;
 background-color: var(--color-red);
 border: 1px solid var(--color-black);
 border: 1px solid var(--border-color);
 border-radius: 50%;
 display: flex;
 display: none;
Expand Down

8 changes: 4 additions & 4 deletions
src/ext/action-popup/Components/View.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
<script>
	import { quintInOut } from "svelte/easing";
	import IconButton from "../../shared/Components/IconButton.svelte";
	import Loader from "../../shared/Components/Loader.svelte";
	import iconArrowLeft from "../../shared/img/icon-arrow-left.svg?raw";
	import IconButton from "@shared/Components/IconButton.svelte";
	import Loader from "@shared/Components/Loader.svelte";
	import iconArrowLeft from "@shared/img/icon-arrow-left.svg?raw";

	export let loading = false;
	export let headerTitle = "View Header";
Expand DownExpand Up@@ -51,7 +51,7 @@

	.view__header {
 background-color: var(--color-bg-secondary);
 border-bottom: 1px solid var(--color-black);
 border-bottom: 1px solid var(--border-color);
 flex-shrink: 0;
 font-weight: 600;
 padding: 0.5rem 1rem calc(0.5rem - 1px);
Expand Down

8 changes: 4 additions & 4 deletions
src/ext/action-popup/Components/Views/InstallView.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
<script>
	import iconWarn from "../../../shared/img/icon-warn.svg?raw";
	import iconError from "../../../shared/img/icon-error.svg?raw";
	import iconWarn from "@shared/img/icon-warn.svg?raw";
	import iconError from "@shared/img/icon-error.svg?raw";

	export let userscript;
	export let installError;
Expand DownExpand Up@@ -129,7 +129,7 @@
	}

	.badge {
 background-color: var(--color-black);
 background-color: var(--color-bg-theme);
 border-radius: var(--border-radius);
 display: flex;
 font: var(--text-small);
Expand DownExpand Up@@ -158,7 +158,7 @@
	}

	button {
 background-color: #ffffffa6; /* -text-color-secondary */
 background-color: var(--text-color-secondary);
 border-radius: var(--border-radius);
 color: var(--color-bg-primary);
 flex-grow: 1;
Expand Down

4 changes: 2 additions & 2 deletions
src/ext/action-popup/Components/Views/UpdateView.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
<script>
	import iconUpdate from "../../../shared/img/icon-update.svg?raw";
	import iconUpdate from "@shared/img/icon-update.svg?raw";

	export let updates = [];
	export let updateClick;
Expand DownExpand Up@@ -35,7 +35,7 @@
<style>
	.item {
 align-items: center;
 border-bottom: 1px solid var(--color-black);
 border-bottom: 1px solid var(--border-color);
 display: flex;
 padding: 0.5rem 1rem;
 text-align: left;
Expand Down
Loading