tonyair/cms-niceties
1
0
Fork 0
mirror of https://github.com/a2nt/cms-niceties.git synced 2024-10-22 11:05:46 +02:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: tonyair:efa97aaaf30e739be6228c39bef15af42af2f251
Branches Tags
tonyair:main
tonyair:v4
tonyair:v5
..
compare: tonyair:df6889416d85964ca9b185b1bae928b8ac3359ce
Branches Tags
tonyair:main
tonyair:v4
tonyair:v5

No commits in common. "efa97aaaf30e739be6228c39bef15af42af2f251" and "df6889416d85964ca9b185b1bae928b8ac3359ce" have entirely different histories.
efa97aaaf3 ... df6889416d

2 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

2
src/Templates/DeferredRequirements.php
View File

@ -165,7 +165,7 @@ class DeferredRequirements implements TemplateGlobalProvider
{ {
$external = (mb_strpos($css, '//') === 0 || mb_strpos($css, 'http') === 0); $external = (mb_strpos($css, '//') === 0 || mb_strpos($css, 'http') === 0);
//if (self::getDeferred() && !self::webpackActive()) { //if (self::getDeferred() && !self::webpackActive()) {
if ((self::getDeferred() && !self::webpackActive()) || $external) { if ($external) {
self::$css[] = $css; self::$css[] = $css;
} else { } else {
WebpackTemplateProvider::loadCSS(self::get_url($css)); WebpackTemplateProvider::loadCSS(self::get_url($css));

4
templates/Page.ss
View File

@ -16,12 +16,12 @@
<% include Header %> <% include Header %>
</header> </header>
<div id="MainContent" class="page-content" data-ajax-region="LayoutAjax"> <main id="MainContent" class="page-content" data-ajax-region="LayoutAjax">
<% if $isFormResponse %> <% if $isFormResponse %>
<%-- Legacy code compatibility --%> <%-- Legacy code compatibility --%>
<% include MainContent Layout=$Layout %> <% include MainContent Layout=$Layout %>
<% end_if %> <% end_if %>
</div> </main>
</div> </div>
<footer id="Footer" class="site-footer footer"> <footer id="Footer" class="site-footer footer">