From e8d6451f17f9105fa6fa93db6c5361bd30a0cf10 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 21 Jul 2026 14:54:43 -0500 Subject: [PATCH 1/3] fix(ui): use selected favicon on the login page instead of missing gitea logo (#819) The login page hard-coded {{AssetUrlPrefix}}/img/login-logo.png, which 404s (broken image above the sign-in card). Point it at the configured favicon (/img/favicon.svg) with a png fallback then hide, so the login page shows the actual selected site icon/branding. Adds an alt of {{AppName}}. Authored-by: Moko Consulting Claude-Session: https://claude.ai/code/session_01D5Zxu4xRRGoh9etzgShP4P --- templates/user/auth/signin_inner.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/user/auth/signin_inner.tmpl b/templates/user/auth/signin_inner.tmpl index 3c6ea78f78..62211fccfb 100644 --- a/templates/user/auth/signin_inner.tmpl +++ b/templates/user/auth/signin_inner.tmpl @@ -1,6 +1,6 @@
- + {{AppName}}
{{if or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn)}} {{template "base/alert" .}} -- 2.52.0 From 65019dd5ad74b3f14ab6d9173100bf1db46ac23c Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 21 Jul 2026 15:03:03 -0500 Subject: [PATCH 2/3] fix(ui): navbar brand uses selected favicon instead of gitea logo (#819) The navbar brand (top-left, shown on the dashboard you land on after login) rendered the default gitea logo.svg. Point it at the admin-selected favicon (/img/favicon.svg, png fallback) so post-login pages carry the configured site icon. Authored-by: Moko Consulting Claude-Session: https://claude.ai/code/session_01D5Zxu4xRRGoh9etzgShP4P --- templates/base/head_navbar.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 59b10c9771..99dbf371d4 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -2,7 +2,7 @@
-- 2.52.0 From 5afbf005ed6b2647bea80d66e3ce27c9271aa7db Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 21 Jul 2026 15:08:37 -0500 Subject: [PATCH 3/3] fix(ui): stop Bootstrap clobbering Fomantic via (#719) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The earlier noConflict shim (f5bf232) didn't work: Bootstrap 5 registers its jQuery plugins inside an onDOMContentLoaded callback, so the shim (running at module-eval, before DOMContentLoaded) restored Fomantic's $.fn.* BEFORE Bootstrap overwrote them — then Bootstrap clobbered again. Verified still broken on dev (fullTextSearch TypeError persisted in the redeployed bundle). Correct fix: add `data-bs-no-jquery` to . Bootstrap's getjQuery() then returns null and it registers NO jQuery plugins, so Fomantic's dropdown/modal/tab/... are never touched. Bootstrap's data-bs-* data-API is bound independently and keeps working (mobile collapse drawers). Removes the now-unnecessary noconflict.ts. Authored-by: Moko Consulting Claude-Session: https://claude.ai/code/session_01D5Zxu4xRRGoh9etzgShP4P --- templates/base/head.tmpl | 2 +- web_src/js/index.ts | 7 +++-- web_src/js/vendor/bootstrap/noconflict.ts | 33 ----------------------- 3 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 web_src/js/vendor/bootstrap/noconflict.ts diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index b3ee13ad96..1a2d878e9f 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -36,7 +36,7 @@ } - + {{template "custom/body_outer_pre" .}}
diff --git a/web_src/js/index.ts b/web_src/js/index.ts index a042432f14..ff495be82e 100644 --- a/web_src/js/index.ts +++ b/web_src/js/index.ts @@ -1,11 +1,10 @@ import '../fomantic/build/fomantic.js'; import '../css/index.css'; // MokoGIT: vendored Bootstrap 5.3.3 JS bundle (incl. Popper; registers the data-bs-* API). +// `` (templates/base/head.tmpl) makes Bootstrap's getjQuery() return +// null, so it never registers jQuery plugins and never clobbers Fomantic's $.fn.{dropdown, +// modal,tab,...}. Bootstrap's data-bs-* data-API keeps working (it's bound independently). import './vendor/bootstrap/bootstrap.bundle.min.js'; -// Hand Fomantic's jQuery plugin names back after Bootstrap's defineJQueryPlugin clobbers -// them (dropdown/modal/tab/…); keeps Bootstrap's data-bs-* API working. MUST stay right -// after the bundle import above. -import './vendor/bootstrap/noconflict.ts'; import {initDashboardRepoList} from './features/dashboard.ts'; import {initGlobalCopyToClipboardListener} from './features/clipboard.ts'; diff --git a/web_src/js/vendor/bootstrap/noconflict.ts b/web_src/js/vendor/bootstrap/noconflict.ts deleted file mode 100644 index 7e9497fccc..0000000000 --- a/web_src/js/vendor/bootstrap/noconflict.ts +++ /dev/null @@ -1,33 +0,0 @@ -// MokoGIT: Bootstrap 5 / Fomantic-UI jQuery-plugin no-conflict shim. -// -// Bootstrap 5 dropped its own jQuery dependency but still registers jQuery plugins -// (via `defineJQueryPlugin`) when it detects jQuery on the page. Those plugin names -// — dropdown, modal, tab, collapse, tooltip, popover, toast, button, … — collide with -// Fomantic-UI, which Gitea drives through the very same `$.fn.*` names. The clobber -// makes `$.fn.dropdown.settings` undefined, so Gitea's Fomantic init throws -// (`Cannot set properties of undefined (setting 'fullTextSearch')`) and aborts the -// whole client init pipeline. -// -// Bootstrap keeps the previous implementation on each plugin's `.noConflict()`. Calling -// it hands the name back to Fomantic. We do NOT lose Bootstrap behavior: the mobile -// rewrite drives Bootstrap purely through the `data-bs-*` data-API (collapse drawers, -// table-responsive is CSS-only), which is bound to document-level event handlers at -// bundle load and does not depend on the jQuery interface. -// -// This module MUST be imported immediately AFTER the Bootstrap bundle in index.ts so it -// runs after `defineJQueryPlugin` has clobbered the names. -import $ from 'jquery'; - -const collidingPlugins = [ - 'alert', 'button', 'carousel', 'collapse', 'dropdown', 'modal', - 'offcanvas', 'popover', 'scrollspy', 'tab', 'toast', 'tooltip', -]; - -for (const name of collidingPlugins) { - const plugin = ($.fn as Record)[name]; - if (plugin && typeof plugin.noConflict === 'function') { - // Restores the pre-Bootstrap implementation (Fomantic's, or undefined if Fomantic - // never defined it — harmless, since nothing uses the jQuery interface for it). - plugin.noConflict(); - } -} -- 2.52.0