Skip to content

Commit

Permalink
Check that spaze/sri-macros concatenated resources use spaces around …
Browse files Browse the repository at this point in the history
…the plus sign

This is needed because in Latte 3.0.17, unquoted strings can contain "+" but if it's specified as " + ", with spaces, then the previous behavior works too.
https://github.com/nette/latte/releases/tag/v3.0.17

I've added tests to spaze/sri-macros, otherwise no change wasn't needed in that package.
spaze/sri-macros#26
  • Loading branch information
spaze committed Jul 21, 2024
1 parent 4f6ae76 commit 2d04968
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion site/app/Admin/Presenters/templates/@layout.latte
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
{var $robots = 'noindex, nofollow'}
{define #feeds}{/define}
{define #scriptsReplace}
{script app+admin async, defer}
{script app + admin async, defer}
{script netteForms async, defer}
{/define}
4 changes: 2 additions & 2 deletions site/app/Pulse/Presenters/templates/@layout.latte
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{if isset($pageTitle)}{$pageTitle} | {/if}Pulse</title>
{control criticalCss}
{styleSheet screen-pulse+rating}
{script app+pulse async, defer}
{styleSheet screen-pulse + rating}
{script app + pulse async, defer}
{script remove-fbclid async, defer}
{ifset #metas}{include #metas}{/ifset}
{ifset $canonicalLink}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>UPC Wi-Fi Keys{if isset($ssid)} for {$ssid}{/if}</title>
{styleSheet screen-upc}
{script app+upckeys async, defer}
{script app + upckeys async, defer}
{script remove-fbclid async, defer}
<meta property="og:image" content="{='upc/screenshot.jpg'|staticImageUrl}">
<meta property="og:title" content="UPC Wi-Fi Keys{if isset($ssid)} for {$ssid}{/if}">
Expand Down
6 changes: 3 additions & 3 deletions site/app/Www/Presenters/templates/@layout.latte
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@
<title>{if isset($pageTitle)}{$pageTitle} | {/if}Michal Špaček</title>
{control criticalCss}
{if $darkMode === null}
{styleSheet screen-main+'@media (prefers-color-scheme: dark) {'+screen-main-dark+'}'}
{styleSheet screen-main + '@media (prefers-color-scheme: dark) {' + screen-main-dark + '}'}
{elseif $darkMode}
{styleSheet screen-main+screen-main-dark}
{styleSheet screen-main + screen-main-dark}
{else}
{styleSheet screen-main}
{/if}
{ifset #preload}{include #preload}{/ifset}
{ifset #scriptsReplace}
{include #scriptsReplace}
{else}
{script app+scripts async, defer}
{script app + scripts async, defer}
{script netteForms async, defer}
{script remove-fbclid async, defer}
{/ifset}
Expand Down
2 changes: 1 addition & 1 deletion site/app/Www/Presenters/templates/Pgp/default.latte
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
{/define}

{define #footerScripts}
{script openpgp+encryption id => "encryption-js"}
{script openpgp + encryption id => "encryption-js"}
{/define}

0 comments on commit 2d04968

Please sign in to comment.