205hlab-mirrors/authentik
2
0
Fork 0
mirror of https://github.com/goauthentik/authentik.git synced 2026-06-17 19:09:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

revert: web: Font fixes (#15581) (#15789)

Browse Source 
Revert "web: Font fixes (#15581)"

This reverts commit f00772faf1.
This commit is contained in:
Jens L.
2025-07-25 13:54:15 +02:00
committed by GitHub
parent b541f0fa1d
commit c0e62d14cb
9 changed files with 44 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
authentik/brands/utils.py
+1 -1
View File
@@ -43,6 +43,6 @@ def context_processor(request: HttpRequest) -> dict[str, Any]:
"brand": brand,
"brand_css": brand_css,
"footer_links": tenant.footer_links,
"html_meta": get_http_meta(),
"html_meta": {**get_http_meta()},
"version": get_full_version(),
}
authentik/core/templates/base/skeleton.html
-1
View File
@@ -10,7 +10,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
{# Darkreader breaks the site regardless of theme as its not compatible with webcomponents, and we default to a dark theme based on preferred colour-scheme #}
<meta name="darkreader-lock">
<base href="{{ base_url_rel }}" />
<title>{% block title %}{% trans title|default:brand.branding_title %}{% endblock %}</title>
<link rel="icon" href="{{ brand.branding_favicon_url }}">
<link rel="shortcut icon" href="{{ brand.branding_favicon_url }}">
internal/web/static.go
+23
View File
@@ -1,9 +1,11 @@
package web
import (
"fmt"
"net/http"
"github.com/go-http-utils/etag"
"github.com/gorilla/mux"
"goauthentik.io/internal/config"
"goauthentik.io/internal/constants"
@@ -40,6 +42,27 @@ func (ws *WebServer) configureStatic() {
config.Get().Web.Path,
))
indexLessRouter.PathPrefix(config.Get().Web.Path).PathPrefix("/if/flow/{flow_slug}/assets").HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r)
pathStripper(
distFs,
"if/flow/"+vars["flow_slug"],
config.Get().Web.Path,
).ServeHTTP(rw, r)
})
indexLessRouter.PathPrefix(config.Get().Web.Path).PathPrefix("/if/admin/assets").Handler(http.StripPrefix(fmt.Sprintf("%sif/admin", config.Get().Web.Path), distFs))
indexLessRouter.PathPrefix(config.Get().Web.Path).PathPrefix("/if/user/assets").Handler(http.StripPrefix(fmt.Sprintf("%sif/user", config.Get().Web.Path), distFs))
indexLessRouter.PathPrefix(config.Get().Web.Path).PathPrefix("/if/rac/{app_slug}/assets").HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r)
pathStripper(
distFs,
"if/rac/"+vars["app_slug"],
config.Get().Web.Path,
).ServeHTTP(rw, r)
})
// Media files, if backend is file
if config.Get().Storage.Media.Backend == "file" {
fsMedia := http.FileServer(http.Dir(config.Get().Storage.Media.File.Path))
web/bundler/css-assets-plugin/node.js
-30
View File
@@ -1,30 +0,0 @@
/**
* @file CSS asset rewrite plugin for ESBuild.
*
* @import { Plugin } from "esbuild"
*/
import * as fs from "node:fs/promises";
/**
* Rewrite `url()` calls in CSS files to point to the static directory.
*
* @returns {Plugin}
*/
export function cssAssetPlugin() {
return {
name: "css-text-loader",
setup: (build) => {
const URLPattern = /url\(\s*['"]?(?:[./]*)(assets\/[^)'"']*)['"]?\s*\)/g;
build.onLoad({ filter: /\.css$/ }, async (args) => {
const contents = await fs.readFile(args.path, "utf8");
return {
loader: "text",
contents: contents.replaceAll(URLPattern, "url(./static/dist/$1)"),
};
});
},
};
}
web/bundler/mdx-plugin/node.js
+3 -4
View File
@@ -1,3 +1,6 @@
import * as fs from "node:fs/promises";
import * as path from "node:path";
/**
* @file MDX plugin for ESBuild.
*
@@ -10,10 +13,6 @@
* PluginBuild
* } from "esbuild"
*/
import * as fs from "node:fs/promises";
import * as path from "node:path";
import { MonoRepoRoot } from "@goauthentik/core/paths/node";
/**
web/scripts/build-web.mjs
+7 -7
View File
@@ -1,13 +1,11 @@
import * as fs from "node:fs/promises";
import * as path from "node:path";
/**
* @file ESBuild script for building the authentik web UI.
*
* @import { BuildOptions } from "esbuild";
*/
import * as fs from "node:fs/promises";
import * as path from "node:path";
import { cssAssetPlugin } from "#bundler/css-assets-plugin/node";
import { mdxPlugin } from "#bundler/mdx-plugin/node";
import { createBundleDefinitions } from "#bundler/utils/node";
import { DistDirectory, EntryPoint, PackageRoot } from "#paths/node";
@@ -42,8 +40,11 @@ const BASE_ESBUILD_OPTIONS = {
legalComments: "external",
splitting: true,
treeShaking: true,
external: ["*.woff", "*.woff2"],
tsconfig: path.resolve(PackageRoot, "tsconfig.build.json"),
loader: {
".css": "text",
},
plugins: [
copy({
assets: [
@@ -74,7 +75,6 @@ const BASE_ESBUILD_OPTIONS = {
path: true,
},
}),
cssAssetPlugin(),
mdxPlugin({
root: MonoRepoRoot,
}),
web/src/common/styles/authentik.css
-25
View File
@@ -35,31 +35,6 @@
--ak-navbar--height: 7rem;
}
/* #region Fonts */
body {
--pf-global--FontFamily--sans-serif:
RedHatVF, "RedHatText", "Overpass", overpass, helvetica, arial, sans-serif;
--pf-global--FontFamily--heading--sans-serif:
RedHatDisplayVF, "RedHatDisplay", "Overpass", overpass, helvetica, arial, sans-serif;
--pf-global--FontFamily--monospace:
RedHatMonoVF, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New",
monospace;
}
code,
pre {
/*
The variable weight is a bit too thin compared to the fixed weight.
So we'll use a slightly larger value here to compensate.
*/
font-weight: 500;
}
/* #endregion */
.pf-c-form__group {
--pf-c-form--m-horizontal__group-label--md--GridColumnWidth: minmax(max-content, 9.375rem);
column-gap: var(--pf-global--spacer--md);
web/src/elements/router/RouteMatch.ts
+5 -19
View File
@@ -41,14 +41,6 @@ export class RouteMatch {
}
}
export function createPathnameHash(
hashRoute?: string | null,
basePath = location.pathname,
): string {
if (!hashRoute) return basePath;
return `${basePath}#${hashRoute}`;
}
export function getURLParam<T>(key: string, fallback: T): T {
const params = getURLParams();
if (key in params) {
@@ -72,18 +64,13 @@ export function getURLParams(): { [key: string]: unknown } {
}
export function setURLParams(params: { [key: string]: unknown }, replace = true): void {
const serializedParams = JSON.stringify(params);
const [currentRoute] = window.location.hash.slice(1).split(ROUTE_SEPARATOR);
const nextPathname = createPathnameHash(
`${currentRoute};${encodeURIComponent(serializedParams)}`,
);
const paramsString = JSON.stringify(params);
const currentUrl = window.location.hash.slice(1, Infinity).split(ROUTE_SEPARATOR)[0];
const newUrl = `#${currentUrl};${encodeURIComponent(paramsString)}`;
if (replace) {
history.replaceState(undefined, "", nextPathname);
history.replaceState(undefined, "", newUrl);
} else {
history.pushState(undefined, "", nextPathname);
history.pushState(undefined, "", newUrl);
}
}
@@ -92,6 +79,5 @@ export function updateURLParams(params: { [key: string]: unknown }, replace = tr
for (const key in params) {
currentParams[key] = params[key] as string;
}
setURLParams(currentParams, replace);
}
web/src/elements/sidebar/SidebarItem.ts
+5 -3
View File
@@ -1,7 +1,6 @@
import { ROUTE_SEPARATOR } from "#common/constants";
import { AKElement } from "#elements/Base";
import { createPathnameHash } from "#elements/router/RouteMatch";
import { msg, str } from "@lit/localize";
import { css, CSSResult, html, nothing, TemplateResult } from "lit";
@@ -90,7 +89,10 @@ export class SidebarItem extends AKElement {
public current?: boolean;
@property({ type: Boolean })
public highlight = false;
public isAbsoluteLink = false;
@property({ type: Boolean })
public highlight?: boolean;
public parent?: SidebarItem;
@@ -215,8 +217,8 @@ export class SidebarItem extends AKElement {
renderWithPath() {
return html`
<a
href=${createPathnameHash(this.path)}
id="sidebar-nav-link-${this.path}"
href="${this.isAbsoluteLink ? "" : "#"}${this.path}"
class="pf-c-nav__link ${this.current ? "pf-m-current" : ""}"
aria-current=${ifDefined(this.current ? "page" : undefined)}
>