Skip to content

brand logo shortcode: don't add class if variant specified #13445

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
merged 1 commit into from
Sep 26, 2025
Merged

brand logo shortcode: don't add class if variant specified #13445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/resources/filters/quarto-pre/shortcodes-handlers.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,12 +174,14 @@ function initShortcodeHandlers()
end
local images = {}
if lightLogo then
local classes = brandMode == 'both' and {"light-content"} or {}
table.insert(images, pandoc.Image(pandoc.Inlines {}, add_leading_slash(lightLogo.path), "",
pandoc.Attr("", {"light-content"}, {alt = lightLogo.alt})))
pandoc.Attr("", classes, {alt = lightLogo.alt})))
end
if darkLogo then
local classes = brandMode == 'both' and {"dark-content"} or {}
table.insert(images, pandoc.Image(pandoc.Inlines {}, add_leading_slash(darkLogo.path), "",
pandoc.Attr("", {"dark-content"}, {alt = darkLogo.alt})))
pandoc.Attr("", classes, {alt = darkLogo.alt})))
end
if context == "block" then
return pandoc.Blocks(images)
Expand Down
2 changes: 1 addition & 1 deletion tests/docs/smoke-all/shortcodes/brand-logo-dark.qmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ _quarto:
html:
ensureFileRegexMatches:
-
- '<img src="\.(/|\\)moon\.png" class="dark-content.*>'
- '<img src="\.(/|\\)moon\.png" class="img-fluid.*>'
- []
---

Expand Down
18 changes: 6 additions & 12 deletions tests/docs/smoke-all/shortcodes/brand-logo-fallback-light.qmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,20 @@ brand:
logo:
small: dark-logo.png
medium: dark-medium-logo.png
# No light logo specified
large: dark-large-logo.png
_quarto:
tests:
html:
ensureFileRegexMatches:
-
# When requesting dark mode explicitly, should get dark logo
- '<img src="\.(/|\\)dark-logo\.png" class="dark-content.*>'
# When requesting light mode explicitly (which doesn't exist), should fall back to dark logo but with light-content class
- '<img src="\.(/|\\)dark-logo\.png" class="light-content.*>'
# When requesting medium size with light mode (doesn't exist), should fall back to dark-medium with light-content class
- '<img src="\.(/|\\)dark-medium-logo\.png" class="light-content.*>'
- '<img src="\.(/|\\)dark-logo\.png" class="img-fluid.*>'
- '<img src="\.(/|\\)dark-medium-logo\.png" class="img-fluid.*>'
- '<img src="\.(/|\\)dark-large-logo\.png" class="img-fluid.*>'
- []
---

### Dark Logo (Dark Mode)
{{< brand logo small dark >}}

### Dark Logo (Light Mode - should fall back)
{{< brand logo small light >}}
{{< brand logo medium light >}}

### Medium Logo (Light Mode - should fall back)
{{< brand logo medium light >}}
{{< brand logo large light >}}
18 changes: 6 additions & 12 deletions tests/docs/smoke-all/shortcodes/brand-logo-fallback.qmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,20 @@ brand:
logo:
small: light-logo.png
medium: light-medium-logo.png
# No dark logo specified
large: light-large-logo.png
_quarto:
tests:
html:
ensureFileRegexMatches:
-
# When requesting light mode explicitly, should get light logo
- '<img src="\.(/|\\)light-logo\.png" class="light-content.*>'
# When requesting dark mode explicitly (which doesn't exist), should fall back to light logo but with dark-content class
- '<img src="\.(/|\\)light-logo\.png" class="dark-content.*>'
# When requesting medium size with dark mode (doesn't exist), should fall back to light-medium with dark-content class
- '<img src="\.(/|\\)light-medium-logo\.png" class="dark-content.*>'
- '<img src="\.(/|\\)light-logo\.png" class="img-fluid.*>'
- '<img src="\.(/|\\)light-medium-logo\.png" class="img-fluid.*>'
- '<img src="\.(/|\\)light-large-logo\.png" class="img-fluid.*>'
- []
---

### Light Logo (Light Mode)
{{< brand logo small light >}}

### Light Logo (Dark Mode - should fall back)
{{< brand logo small dark >}}
{{< brand logo medium dark >}}

### Medium Logo (Dark Mode - should fall back)
{{< brand logo medium dark >}}
{{< brand logo large dark >}}
2 changes: 1 addition & 1 deletion tests/docs/smoke-all/shortcodes/brand-logo-light.qmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ _quarto:
html:
ensureFileRegexMatches:
-
- '<img src="\.(/|\\)sun\.png" class="light-content.*>'
- '<img src="\.(/|\\)sun\.png" class="img-fluid.*>'
- []
---

Expand Down
Loading