Skip to content

Commit 77a82a6

Browse files
Revert "brand processData: pass logo urls unchanged"
This reverts commit 47611e3.
1 parent 47611e3 commit 77a82a6

File tree

4 files changed

+3
-56
lines changed

4 files changed

+3
-56
lines changed

news/changelog-1.8.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ All changes included in 1.8:
2323
- ([#10983](https://github.com/quarto-dev/quarto-cli/issues/10983)): Fix spacing inconsistency between paras and first section headings.
2424
- ([#12259](https://github.com/quarto-dev/quarto-cli/issues/12259)): Fix conflict between `html-math-method: katex` and crossref popups (author: @benkeks).
2525
- ([#12341](https://github.com/quarto-dev/quarto-cli/issues/12341)): Enable light and dark logos for html formats (sidebar, navbar, dashboard).
26-
- ([#12643](https://github.com/quarto-dev/quarto-cli/issues/12643)): Ensure brand.yml logos using urls are rendered correctly by passing them through when resolving brand `processedData`, and not processing them as paths.
2726
- ([#12734](https://github.com/quarto-dev/quarto-cli/issues/12734)): `highlight-style` now correctly supports setting a different `light` and `dark`.
2827
- ([#12747](https://github.com/quarto-dev/quarto-cli/issues/12747)): Ensure `th` elements are properly restored when Quarto's HTML table processing is happening.
2928
- ([#12766](https://github.com/quarto-dev/quarto-cli/issues/12766)): Use consistent equation numbering display for `html-math-method` and `html-math-method.method` for MathJax and KaTeX (author: @mcanouil)

src/core/brand/brand.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import {
3939
LogoSpecifier,
4040
LogoSpecifierPathOptional,
4141
} from "../../resources/types/schema-types.ts";
42-
import { isExternalPath } from "../../project/types/website/website-navigation.ts";
4342

4443
type ProcessedBrandData = {
4544
color: Record<string, string>;
@@ -247,13 +246,11 @@ export class Brand {
247246
resolvePath(entry: BrandLogoResource) {
248247
const pathPrefix = relative(this.projectDir, this.brandDir);
249248
if (typeof entry === "string") {
250-
return { path: isExternalPath(entry) ? entry : join(pathPrefix, entry) };
249+
return { path: join(pathPrefix, entry) };
251250
}
252251
return {
253252
...entry,
254-
path: isExternalPath(entry.path)
255-
? entry.path
256-
: join(pathPrefix, entry.path),
253+
path: join(pathPrefix, entry.path),
257254
};
258255
}
259256

src/project/types/website/website-navigation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1567,7 +1567,7 @@ function navigationDependency(resource: string) {
15671567
};
15681568
}
15691569

1570-
export function isExternalPath(path: string) {
1570+
function isExternalPath(path: string) {
15711571
return /^\w+:/.test(path);
15721572
}
15731573

tests/docs/smoke-all/brand/logo/url-logo.qmd

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)